]> git.proxmox.com Git - mirror_edk2.git/blobdiff - IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
Update for IntelFrameworkModulePkg.
[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / DeviceMngr / DeviceManager.c
index 1d4b0f525653dc74d6c9be8caf1753f8b2ba2daf..6cb9d6b7ab07de5da771e4f26c430822a03a860e 100644 (file)
@@ -1,8 +1,8 @@
 /** @file\r
   The platform device manager reference implementation\r
 \r
-Copyright (c) 2004 - 2009, Intel Corporation. <BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2004 - 2011, 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
 http://opensource.org/licenses/bsd-license.php\r
@@ -32,8 +32,23 @@ DEVICE_MANAGER_CALLBACK_DATA  gDeviceManagerPrivate = {
   }\r
 };\r
 \r
-EFI_GUID mDeviceManagerGuid = DEVICE_MANAGER_FORMSET_GUID;\r
-EFI_GUID mDriverHealthGuid = DRIVER_HEALTH_FORMSET_GUID;\r
+#define  MAX_MAC_ADDRESS_NODE_LIST_LEN    10\r
+\r
+//\r
+// Which Mac Address string is select\r
+// it will decide what menu need to show in the NETWORK_DEVICE_FORM_ID form.\r
+//\r
+EFI_STRING  mSelectedMacAddrString;\r
+\r
+//\r
+// Which form Id need to be show.\r
+//\r
+EFI_FORM_ID      mNextShowFormId = DEVICE_MANAGER_FORM_ID;  \r
+\r
+//\r
+// The Mac Address show in the NETWORK_DEVICE_LIST_FORM_ID\r
+//\r
+MAC_ADDRESS_NODE_LIST  mMacDeviceList;\r
 \r
 DEVICE_MANAGER_MENU_ITEM  mDeviceManagerMenuItemTable[] = {\r
   { STRING_TOKEN (STR_DISK_DEVICE),     EFI_DISK_DEVICE_CLASS },\r
@@ -54,10 +69,7 @@ HII_VENDOR_DEVICE_PATH  mDeviceManagerHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    //\r
-    // {102579A0-3686-466e-ACD8-80C087044F4A}\r
-    //\r
-    { 0x102579a0, 0x3686, 0x466e, { 0xac, 0xd8, 0x80, 0xc0, 0x87, 0x4, 0x4f, 0x4a } }\r
+    DEVICE_MANAGER_FORMSET_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -69,6 +81,28 @@ HII_VENDOR_DEVICE_PATH  mDeviceManagerHiiVendorDevicePath = {
   }\r
 };\r
 \r
+HII_VENDOR_DEVICE_PATH  mDriverHealthHiiVendorDevicePath = {\r
+  {\r
+    {\r
+      HARDWARE_DEVICE_PATH,\r
+        HW_VENDOR_DP,\r
+      {\r
+        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+          (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+      }\r
+    },\r
+    DRIVER_HEALTH_FORMSET_GUID\r
+  },\r
+  {\r
+    END_DEVICE_PATH_TYPE,\r
+      END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
+    { \r
+      (UINT8) (END_DEVICE_PATH_LENGTH),\r
+        (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
+    }\r
+  }\r
+};\r
+\r
 /**\r
   This function is invoked if user selected a interactive opcode from Device Manager's\r
   Formset. The decision by user is saved to gCallbackKey for later processing. If\r
@@ -97,16 +131,30 @@ DeviceManagerCallback (
   OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
   )\r
 {\r
-  if ((Value == NULL) || (ActionRequest == NULL)) {\r
+  UINTN CurIndex;\r
+\r
+  if (Action != EFI_BROWSER_ACTION_CHANGING) {\r
+    //\r
+    // All other action return unsupported.\r
+    //\r
+    return EFI_UNSUPPORTED;\r
+  }\r
+\r
+  if (Value == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   gCallbackKey = QuestionId;\r
-\r
-  //\r
-  // Request to exit SendForm(), so as to switch to selected form\r
-  //\r
-  *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
+  if ((QuestionId < MAX_KEY_SECTION_LEN + NETWORK_DEVICE_LIST_KEY_OFFSET) && (QuestionId >= NETWORK_DEVICE_LIST_KEY_OFFSET)) {\r
+    //\r
+    // If user select the mac address, need to record mac address string to support next form show.\r
+    //\r
+    for (CurIndex = 0; CurIndex < mMacDeviceList.CurListLen; CurIndex ++) {\r
+      if (mMacDeviceList.NodeList[CurIndex].QuestionId == QuestionId) {\r
+         mSelectedMacAddrString = HiiGetString (gDeviceManagerPrivate.HiiHandle, mMacDeviceList.NodeList[CurIndex].PromptId, NULL);\r
+      }\r
+    }\r
+  }\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -141,43 +189,16 @@ InitializeDeviceManager (
 \r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &gDeviceManagerPrivate.DriverHealthHandle,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  &mDriverHealthHiiVendorDevicePath,\r
                   &gEfiHiiConfigAccessProtocolGuid,\r
                   &gDeviceManagerPrivate.DriverHealthConfigAccess,\r
                   NULL\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  //\r
-  // Publish our HII data\r
-  //\r
-  gDeviceManagerPrivate.HiiHandle = HiiAddPackages (\r
-                                      &mDeviceManagerGuid,\r
-                                      gDeviceManagerPrivate.DriverHandle,\r
-                                      DeviceManagerVfrBin,\r
-                                      BdsDxeStrings,\r
-                                      NULL\r
-                                      );\r
-  if (gDeviceManagerPrivate.HiiHandle == NULL) {\r
-    return EFI_OUT_OF_RESOURCES;\r
-  } else {\r
-    Status = EFI_SUCCESS;\r
-  }\r
-  \r
-  //\r
-  // Publish Driver Health HII data\r
-  //\r
-  gDeviceManagerPrivate.DriverHealthHiiHandle = HiiAddPackages (\r
-                                                  &mDeviceManagerGuid,\r
-                                                  gDeviceManagerPrivate.DriverHealthHandle,\r
-                                                  DriverHealthVfrBin,\r
-                                                  BdsDxeStrings,\r
-                                                  NULL\r
-                                                  );\r
-  if (gDeviceManagerPrivate.DriverHealthHiiHandle == NULL) {\r
-    Status = EFI_OUT_OF_RESOURCES;\r
-  } else {\r
-    Status = EFI_SUCCESS;\r
-  }\r
+  mMacDeviceList.CurListLen = 0;\r
+  mMacDeviceList.MaxListLen = 0;\r
 \r
   return Status;\r
 }\r
@@ -267,18 +288,26 @@ ExtractDisplayedHiiFormFromHiiHandle (
         OpCodeData = Package + Offset2;\r
 \r
         if (((EFI_IFR_OP_HEADER *) OpCodeData)->OpCode == EFI_IFR_FORM_SET_OP) {\r
-          //\r
-          // Find FormSet OpCode\r
-          //\r
-          ClassGuidNum = ((EFI_IFR_FORM_SET *) OpCodeData)->Flags;\r
-          ClassGuid = (EFI_GUID *) (VOID *)(OpCodeData + sizeof (EFI_IFR_FORM_SET));\r
-          while (ClassGuidNum-- > 0) {\r
-            if (CompareGuid (SetupClassGuid, ClassGuid)) {\r
-              CopyMem (FormSetTitle, &((EFI_IFR_FORM_SET *) OpCodeData)->FormSetTitle, sizeof (EFI_STRING_ID));\r
-              CopyMem (FormSetHelp, &((EFI_IFR_FORM_SET *) OpCodeData)->Help, sizeof (EFI_STRING_ID));\r
-              FreePool (HiiPackageList);\r
-              return TRUE;\r
+          if (((EFI_IFR_OP_HEADER *) OpCodeData)->Length > OFFSET_OF (EFI_IFR_FORM_SET, Flags)) {\r
+            //\r
+            // Find FormSet OpCode\r
+            //\r
+            ClassGuidNum = (UINT8) (((EFI_IFR_FORM_SET *) OpCodeData)->Flags & 0x3);\r
+            ClassGuid = (EFI_GUID *) (VOID *)(OpCodeData + sizeof (EFI_IFR_FORM_SET));\r
+            while (ClassGuidNum-- > 0) {\r
+              if (CompareGuid (SetupClassGuid, ClassGuid)) {\r
+                CopyMem (FormSetTitle, &((EFI_IFR_FORM_SET *) OpCodeData)->FormSetTitle, sizeof (EFI_STRING_ID));\r
+                CopyMem (FormSetHelp, &((EFI_IFR_FORM_SET *) OpCodeData)->Help, sizeof (EFI_STRING_ID));\r
+                FreePool (HiiPackageList);\r
+                return TRUE;\r
+              }\r
+              ClassGuid ++;\r
             }\r
+           } else {\r
+             CopyMem (FormSetTitle, &((EFI_IFR_FORM_SET *) OpCodeData)->FormSetTitle, sizeof (EFI_STRING_ID));\r
+             CopyMem (FormSetHelp, &((EFI_IFR_FORM_SET *) OpCodeData)->Help, sizeof (EFI_STRING_ID));\r
+             FreePool (HiiPackageList);\r
+             return TRUE;\r
           }\r
         }\r
         \r
@@ -300,6 +329,376 @@ ExtractDisplayedHiiFormFromHiiHandle (
   return FALSE;\r
 }\r
 \r
+/**\r
+  Get the mac address string from the device path.\r
+  if the device path has the vlan, get the vanid also.\r
+  \r
+  @param MacAddressNode              Device path begin with mac address \r
+  @param PBuffer                     Output string buffer contain mac address.\r
+\r
+**/\r
+BOOLEAN \r
+GetMacAddressString(\r
+  IN  MAC_ADDR_DEVICE_PATH   *MacAddressNode,\r
+  OUT CHAR16                 **PBuffer\r
+  )\r
+{\r
+  UINTN                 HwAddressSize;\r
+  UINTN                 Index;\r
+  UINT8                 *HwAddress;\r
+  EFI_DEVICE_PATH_PROTOCOL  *Node;\r
+  UINT16                VlanId;\r
+  CHAR16                *String;\r
+  UINTN                 BufferLen;\r
+\r
+  VlanId = 0;\r
+  String = NULL;\r
+  ASSERT(MacAddressNode != NULL);\r
+\r
+  HwAddressSize = sizeof (EFI_MAC_ADDRESS);\r
+  if (MacAddressNode->IfType == 0x01 || MacAddressNode->IfType == 0x00) {\r
+    HwAddressSize = 6;\r
+  }\r
+\r
+  //\r
+  // The output format is MAC:XX:XX:XX:...\XXXX\r
+  // The size is the Number size + ":" size + Vlan size(\XXXX) + End\r
+  //\r
+  BufferLen = (4 + 2 * HwAddressSize + (HwAddressSize - 1) + 5 + 1) * sizeof (CHAR16);\r
+  String = AllocateZeroPool (BufferLen);\r
+  if (String == NULL) {\r
+    return FALSE;\r
+  }\r
+\r
+  *PBuffer = String;\r
+  StrCpy(String, L"MAC:");\r
+  String += 4;\r
+  \r
+  //\r
+  // Convert the MAC address into a unicode string.\r
+  //\r
+  HwAddress = &MacAddressNode->MacAddress.Addr[0];\r
+  for (Index = 0; Index < HwAddressSize; Index++) {\r
+    String += UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *(HwAddress++), 2);\r
+    if (Index < HwAddressSize - 1) {\r
+      *String++ = L':';\r
+    }\r
+  }\r
+  \r
+  //\r
+  // If VLAN is configured, it will need extra 5 characters like "\0005".\r
+  // Plus one unicode character for the null-terminator.\r
+  //\r
+  Node = (EFI_DEVICE_PATH_PROTOCOL  *)MacAddressNode;\r
+  while (!IsDevicePathEnd (Node)) {\r
+    if (Node->Type == MESSAGING_DEVICE_PATH && Node->SubType == MSG_VLAN_DP) {\r
+      VlanId = ((VLAN_DEVICE_PATH *) Node)->VlanId;\r
+    }\r
+    Node = NextDevicePathNode (Node);\r
+  }\r
+\r
+  if (VlanId != 0) {\r
+    *String++ = L'\\';\r
+    String += UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, VlanId, 4);\r
+  }\r
+\r
+  //\r
+  // Null terminate the Unicode string\r
+  //\r
+  *String = L'\0';\r
+\r
+  return TRUE;\r
+}\r
+\r
+/**\r
+  Save question id and prompt id to the mac device list.\r
+  If the same mac address has saved yet, no need to add more.\r
+\r
+  @param MacAddrString               Mac address string.\r
+\r
+  @retval  EFI_SUCCESS               Add the item is successful.\r
+  @return  Other values if failed to Add the item.\r
+**/\r
+BOOLEAN \r
+AddIdToMacDeviceList (\r
+  IN  EFI_STRING        MacAddrString\r
+  )\r
+{\r
+  MENU_INFO_ITEM *TempDeviceList;\r
+  UINTN          Index;\r
+  EFI_STRING     StoredString;\r
+  EFI_STRING_ID  PromptId;\r
+  EFI_HII_HANDLE HiiHandle;\r
+\r
+  HiiHandle =   gDeviceManagerPrivate.HiiHandle;\r
+  TempDeviceList = NULL;\r
+\r
+  for (Index = 0; Index < mMacDeviceList.CurListLen; Index ++) {\r
+    StoredString = HiiGetString (HiiHandle, mMacDeviceList.NodeList[Index].PromptId, NULL);\r
+    if (StoredString == NULL) {\r
+      return FALSE;\r
+    }\r
+\r
+    //\r
+    // Already has save the same mac address to the list.\r
+    //\r
+    if (StrCmp (MacAddrString, StoredString) == 0) {\r
+      return FALSE;\r
+    }\r
+  }\r
+\r
+  PromptId = HiiSetString(HiiHandle, 0, MacAddrString, NULL);\r
+  //\r
+  // If not in the list, save it.\r
+  //\r
+  if (mMacDeviceList.MaxListLen > mMacDeviceList.CurListLen + 1) {\r
+    mMacDeviceList.NodeList[mMacDeviceList.CurListLen].PromptId = PromptId;\r
+    mMacDeviceList.NodeList[mMacDeviceList.CurListLen].QuestionId = (EFI_QUESTION_ID) (mMacDeviceList.CurListLen + NETWORK_DEVICE_LIST_KEY_OFFSET);\r
+  } else {\r
+    mMacDeviceList.MaxListLen += MAX_MAC_ADDRESS_NODE_LIST_LEN;\r
+    if (mMacDeviceList.CurListLen != 0) {\r
+      TempDeviceList = (MENU_INFO_ITEM *)AllocateCopyPool (sizeof (MENU_INFO_ITEM) * mMacDeviceList.MaxListLen, (VOID *)mMacDeviceList.NodeList);\r
+    } else {\r
+      TempDeviceList = (MENU_INFO_ITEM *)AllocatePool (sizeof (MENU_INFO_ITEM) * mMacDeviceList.MaxListLen);\r
+    }\r
+    \r
+    if (TempDeviceList == NULL) {\r
+      return FALSE;\r
+    }\r
+    TempDeviceList[mMacDeviceList.CurListLen].PromptId = PromptId;  \r
+    TempDeviceList[mMacDeviceList.CurListLen].QuestionId = (EFI_QUESTION_ID) (mMacDeviceList.CurListLen + NETWORK_DEVICE_LIST_KEY_OFFSET);\r
+    \r
+    if (mMacDeviceList.CurListLen > 0) {\r
+      FreePool(mMacDeviceList.NodeList);\r
+    }\r
+    \r
+    mMacDeviceList.NodeList = TempDeviceList;\r
+  }\r
+  mMacDeviceList.CurListLen ++;\r
+\r
+  return TRUE;\r
+}\r
+\r
+/**\r
+  Check the devcie path, try to find whether it has mac address path.\r
+\r
+  In this function, first need to check whether this path has mac address path.\r
+  second, when the mac address device path has find, also need to deicide whether\r
+  need to add this mac address relate info to the menu.\r
+\r
+  @param    *Node           Input device which need to be check.\r
+  @param    *NeedAddItem    Whether need to add the menu in the network device list.\r
+  \r
+  @retval  TRUE             Has mac address device path.\r
+  @retval  FALSE            NOT Has mac address device path.  \r
+\r
+**/\r
+BOOLEAN\r
+IsMacAddressDevicePath (\r
+  IN  VOID    *Node,\r
+  OUT BOOLEAN *NeedAddItem\r
+  )\r
+{\r
+  EFI_DEVICE_PATH_PROTOCOL   *DevicePath;\r
+  CHAR16                     *Buffer;\r
+  BOOLEAN                    ReturnVal;\r
+  \r
+  ASSERT (Node != NULL);\r
+  *NeedAddItem = FALSE;\r
+  ReturnVal    = FALSE;\r
+  Buffer    = NULL;\r
+\r
+  DevicePath = (EFI_DEVICE_PATH_PROTOCOL *) Node;\r
+\r
+  //\r
+  // find the partition device path node\r
+  //\r
+  while (!IsDevicePathEnd (DevicePath)) {\r
+    if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) &&\r
+       (DevicePathSubType (DevicePath) == MSG_MAC_ADDR_DP)) {\r
+      ReturnVal = TRUE;\r
+      \r
+      if (DEVICE_MANAGER_FORM_ID == mNextShowFormId) {\r
+        *NeedAddItem = TRUE;\r
+        break;\r
+      } \r
+      \r
+      if (!GetMacAddressString((MAC_ADDR_DEVICE_PATH*)DevicePath, &Buffer)) {\r
+        break;\r
+      }\r
+\r
+      if (NETWORK_DEVICE_FORM_ID == mNextShowFormId) {\r
+        if (StrCmp (Buffer, mSelectedMacAddrString) == 0) {\r
+          *NeedAddItem = TRUE;\r
+        }\r
+        break;\r
+      }\r
+\r
+      if (NETWORK_DEVICE_LIST_FORM_ID == mNextShowFormId) {\r
+        //\r
+        // Same handle may has two network child handle, so the questionid \r
+        // has the offset of SAME_HANDLE_KEY_OFFSET.\r
+        //\r
+        if (AddIdToMacDeviceList (Buffer)) {\r
+          *NeedAddItem = TRUE;\r
+        }\r
+        break;\r
+      }\r
+    } \r
+    DevicePath = NextDevicePathNode (DevicePath);\r
+  }\r
+\r
+  if (Buffer != NULL) {\r
+    FreePool (Buffer);\r
+  }\r
+\r
+  return ReturnVal;\r
+}\r
+\r
+/**\r
+  Check to see if the device path is for the network device.\r
+\r
+  @param Handle          The HII handle which include the mac address device path.\r
+  @param ItemCount       The new add Mac address item count.\r
+\r
+  @retval  TRUE          Need to add new item in the menu.\r
+  @return  FALSE         Do not need to add the menu about the network.\r
+\r
+**/\r
+BOOLEAN \r
+IsNeedAddNetworkMenu (\r
+  IN      EFI_HII_HANDLE      Handle,\r
+  OUT     UINTN               *ItemCount\r
+  )\r
+{\r
+  EFI_STATUS     Status;\r
+  UINTN          EntryCount;\r
+  UINTN          Index;  \r
+  EFI_HANDLE     DriverHandle;\r
+  EFI_HANDLE     ControllerHandle;\r
+  EFI_DEVICE_PATH_PROTOCOL   *DevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL   *TmpDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL   *ChildDevicePath;\r
+  EFI_OPEN_PROTOCOL_INFORMATION_ENTRY   *OpenInfoBuffer;\r
+  BOOLEAN        IsNeedAdd;\r
+\r
+  IsNeedAdd  = FALSE;\r
+  OpenInfoBuffer = NULL;\r
+  if ((Handle == NULL) || (ItemCount == NULL)) {\r
+    return FALSE;\r
+  }\r
+  *ItemCount = 0;\r
+\r
+  Status = gHiiDatabase->GetPackageListHandle (gHiiDatabase, Handle, &DriverHandle);\r
+  if (EFI_ERROR (Status)) {\r
+    return FALSE;\r
+  }\r
+  //\r
+  // Get the device path by the got Driver handle .\r
+  //\r
+  Status = gBS->HandleProtocol (DriverHandle, &gEfiDevicePathProtocolGuid, (VOID **) &DevicePath);\r
+  if (EFI_ERROR (Status)) {\r
+    return FALSE;\r
+  }\r
+  TmpDevicePath = DevicePath;\r
+\r
+  // \r
+  // Check whether this device path include mac address device path.\r
+  // If this path has mac address path, get the value whether need \r
+  // add this info to the menu and return.\r
+  // Else check more about the child handle devcie path.\r
+  //\r
+  if (IsMacAddressDevicePath(TmpDevicePath, &IsNeedAdd)) {\r
+    if ((NETWORK_DEVICE_LIST_FORM_ID == mNextShowFormId) && IsNeedAdd) {\r
+      (*ItemCount) = 1;\r
+    }\r
+    return IsNeedAdd;\r
+  }\r
+\r
+  //\r
+  // Search whether this path is the controller path, not he child handle path.\r
+  // And the child handle has the network devcie connected.\r
+  //\r
+  TmpDevicePath = DevicePath;\r
+  Status = gBS->LocateDevicePath(&gEfiDevicePathProtocolGuid, &TmpDevicePath, &ControllerHandle);\r
+  if (EFI_ERROR (Status)) {\r
+    return FALSE;\r
+  }\r
+\r
+  if (!IsDevicePathEnd (TmpDevicePath)) {\r
+    return FALSE;    \r
+  }\r
+\r
+  //\r
+  // Retrieve the list of agents that are consuming the specific protocol\r
+  // on ControllerHandle.\r
+  // The buffer point by OpenInfoBuffer need be free at this function.\r
+  //\r
+  Status = gBS->OpenProtocolInformation (\r
+                  ControllerHandle,\r
+                  &gEfiPciIoProtocolGuid,\r
+                  &OpenInfoBuffer,\r
+                  &EntryCount\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    return FALSE;\r
+  }\r
+\r
+  //\r
+  // Inspect if ChildHandle is one of the agents.\r
+  //\r
+  Status = EFI_UNSUPPORTED;\r
+  for (Index = 0; Index < EntryCount; Index++) {\r
+    //\r
+    // Query all the children created by the controller handle's driver\r
+    //\r
+    if ((OpenInfoBuffer[Index].Attributes & EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER) != 0) {\r
+      Status = gBS->OpenProtocol (\r
+                      OpenInfoBuffer[Index].ControllerHandle,\r
+                      &gEfiDevicePathProtocolGuid,\r
+                      (VOID **) &ChildDevicePath,\r
+                      NULL,\r
+                      NULL,\r
+                      EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                      );\r
+      if (EFI_ERROR (Status)) {\r
+        continue;\r
+      }\r
+\r
+      // \r
+      // Check whether this device path include mac address device path.\r
+      //\r
+      if (!IsMacAddressDevicePath(ChildDevicePath, &IsNeedAdd)) {\r
+        //\r
+        // If this path not has mac address path, check the other.\r
+        //\r
+        continue;\r
+      } else {\r
+        //\r
+        // If need to update the NETWORK_DEVICE_LIST_FORM, try to get more.\r
+        //\r
+        if ((NETWORK_DEVICE_LIST_FORM_ID == mNextShowFormId)) {\r
+          if (IsNeedAdd) {\r
+            (*ItemCount) += 1;\r
+          }\r
+          continue;\r
+        } else {\r
+          //\r
+          // If need to update other form, return whether need to add to the menu.\r
+          //          \r
+          goto Done;\r
+        }\r
+      }\r
+    }\r
+  }\r
+\r
+Done:\r
+  if (OpenInfoBuffer != NULL) {\r
+    FreePool (OpenInfoBuffer);  \r
+  }\r
+  return IsNeedAdd; \r
+}\r
+\r
 /**\r
   Call the browser and display the device manager to allow user\r
   to configure the platform.\r
@@ -333,12 +732,18 @@ CallDeviceManager (
   EFI_IFR_GUID_LABEL          *EndLabel;\r
   UINTN                       NumHandles;\r
   EFI_HANDLE                  *DriverHealthHandles;\r
+  BOOLEAN                     AddNetworkMenu;\r
+  UINTN                       AddItemCount;\r
+  UINTN                       NewStringLen;\r
+  EFI_STRING                  NewStringTitle;\r
 \r
   HiiHandles    = NULL;\r
   Status        = EFI_SUCCESS;\r
   gCallbackKey  = 0;\r
   NumHandles    = 0;\r
   DriverHealthHandles = NULL;\r
+  AddNetworkMenu = FALSE;\r
+  AddItemCount   = 0;\r
 \r
   //\r
   // Connect all prior to entering the platform setup menu.\r
@@ -347,9 +752,47 @@ CallDeviceManager (
     BdsLibConnectAllDriversToAllControllers ();\r
     gConnectAllHappened = TRUE;\r
   }\r
+\r
+  HiiHandle = gDeviceManagerPrivate.HiiHandle;\r
+  if (HiiHandle == NULL) {\r
+    //\r
+    // Publish our HII data.\r
+    //\r
+    HiiHandle = HiiAddPackages (\r
+                  &gDeviceManagerFormSetGuid,\r
+                  gDeviceManagerPrivate.DriverHandle,\r
+                  DeviceManagerVfrBin,\r
+                  BdsDxeStrings,\r
+                  NULL\r
+                  );\r
+    if (HiiHandle == NULL) {\r
+      return EFI_OUT_OF_RESOURCES;\r
+    }\r
+\r
+    gDeviceManagerPrivate.HiiHandle = HiiHandle;\r
+  }\r
+\r
+  //\r
+  // If need show the Network device list form, clear the old save list first.\r
+  //\r
+  if ((mNextShowFormId == NETWORK_DEVICE_LIST_FORM_ID) && (mMacDeviceList.CurListLen > 0)) {\r
+    mMacDeviceList.CurListLen = 0;\r
+  }\r
+\r
   //\r
-  // Create Subtitle OpCodes\r
+  // Update the network device form titile.\r
   //\r
+  if (mNextShowFormId == NETWORK_DEVICE_FORM_ID) {\r
+    String = HiiGetString (HiiHandle, STRING_TOKEN (STR_FORM_NETWORK_DEVICE_TITLE), NULL);\r
+    NewStringLen = StrLen(mSelectedMacAddrString) * 2;\r
+    NewStringLen += (StrLen(String) + 2) * 2;\r
+    NewStringTitle = AllocatePool (NewStringLen);\r
+    UnicodeSPrint (NewStringTitle, NewStringLen, L"%s %s", String, mSelectedMacAddrString);\r
+    HiiSetString (HiiHandle, STRING_TOKEN (STR_FORM_NETWORK_DEVICE_TITLE), NewStringTitle, NULL);    \r
+    FreePool (String);\r
+    FreePool (NewStringTitle);\r
+  }\r
+\r
   //\r
   // Allocate space for creation of UpdateData Buffer\r
   //\r
@@ -364,7 +807,10 @@ CallDeviceManager (
   //\r
   StartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (StartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));\r
   StartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
-  StartLabel->Number       = LABEL_DEVICES_LIST;\r
+  //\r
+  // According to the next show Form id(mNextShowFormId) to decide which form need to update.\r
+  //\r
+  StartLabel->Number       = (UINT16) (LABEL_FORM_ID_OFFSET + mNextShowFormId);\r
 \r
   //\r
   // Create Hii Extend Label OpCode as the end opcode\r
@@ -373,20 +819,23 @@ CallDeviceManager (
   EndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
   EndLabel->Number       = LABEL_END;\r
 \r
-  HiiCreateSubTitleOpCode (StartOpCodeHandle, STRING_TOKEN (STR_DEVICES_LIST), 0, 0, 1);\r
-\r
   //\r
   // Get all the Hii handles\r
   //\r
   HiiHandles = HiiGetHiiHandles (NULL);\r
   ASSERT (HiiHandles != NULL);\r
 \r
-  HiiHandle = gDeviceManagerPrivate.HiiHandle;\r
-\r
   //\r
   // Search for formset of each class type\r
   //\r
   for (Index = 0; HiiHandles[Index] != NULL; Index++) {\r
+    //\r
+    //  The QuestionId in the form which will call the driver form has this asssumption.\r
+    //  QuestionId = Handle Index + NETWORK_DEVICE_LIST_KEY_OFFSET;\r
+    //  Different QuestionId at least has the section of NETWORK_DEVICE_LIST_KEY_OFFSET.\r
+    //\r
+    ASSERT(Index < MAX_KEY_SECTION_LEN);\r
+\r
     if (!ExtractDisplayedHiiFormFromHiiHandle (HiiHandles[Index], &gEfiHiiPlatformSetupFormsetGuid, &FormSetTitle, &FormSetHelp)) {\r
       continue;\r
     }\r
@@ -407,21 +856,71 @@ CallDeviceManager (
     TokenHelp = HiiSetString (HiiHandle, 0, String, NULL);\r
     FreePool (String);\r
 \r
-    HiiCreateActionOpCode (\r
-      StartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (Index + DEVICE_KEY_OFFSET),\r
-      Token,\r
-      TokenHelp,\r
-      EFI_IFR_FLAG_CALLBACK,\r
-      0\r
-      );\r
+    //\r
+    // Network device process\r
+    // \r
+    if (IsNeedAddNetworkMenu (HiiHandles[Index], &AddItemCount)) {\r
+      if (mNextShowFormId == DEVICE_MANAGER_FORM_ID) {\r
+        //\r
+        // Only show one menu item "Network Config" in the device manger form.\r
+        //\r
+        if (!AddNetworkMenu) {\r
+          AddNetworkMenu = TRUE;\r
+          HiiCreateGotoOpCode (\r
+            StartOpCodeHandle,\r
+            INVALID_FORM_ID,\r
+            STRING_TOKEN (STR_FORM_NETWORK_DEVICE_LIST_TITLE),\r
+            STRING_TOKEN (STR_FORM_NETWORK_DEVICE_LIST_HELP),\r
+            EFI_IFR_FLAG_CALLBACK,\r
+            (EFI_QUESTION_ID) QUESTION_NETWORK_DEVICE_ID\r
+            );\r
+        }\r
+      } else if (mNextShowFormId == NETWORK_DEVICE_LIST_FORM_ID) {\r
+        //\r
+        // In network device list form, same mac address device only show one menu.\r
+        //\r
+        while (AddItemCount > 0) {\r
+            HiiCreateGotoOpCode (\r
+              StartOpCodeHandle,\r
+              INVALID_FORM_ID,\r
+              mMacDeviceList.NodeList[mMacDeviceList.CurListLen - AddItemCount].PromptId,\r
+              STRING_TOKEN (STR_NETWORK_DEVICE_HELP),\r
+              EFI_IFR_FLAG_CALLBACK,\r
+              mMacDeviceList.NodeList[mMacDeviceList.CurListLen - AddItemCount].QuestionId\r
+              );\r
+            AddItemCount -= 1;\r
+          }\r
+      } else if (mNextShowFormId == NETWORK_DEVICE_FORM_ID) {\r
+        //\r
+        // In network device form, only the selected mac address device need to be show.\r
+        //\r
+        HiiCreateGotoOpCode (\r
+          StartOpCodeHandle,\r
+          INVALID_FORM_ID,\r
+          Token,\r
+          TokenHelp,\r
+          EFI_IFR_FLAG_CALLBACK,\r
+          (EFI_QUESTION_ID) (Index + DEVICE_KEY_OFFSET)\r
+          );\r
+      }\r
+    } else {\r
+      //\r
+      // \r
+      // Not network device process, only need to show at device manger form.\r
+      //\r
+      if (mNextShowFormId == DEVICE_MANAGER_FORM_ID) {\r
+        HiiCreateGotoOpCode (\r
+          StartOpCodeHandle,\r
+          INVALID_FORM_ID,\r
+          Token,\r
+          TokenHelp,\r
+          EFI_IFR_FLAG_CALLBACK,\r
+          (EFI_QUESTION_ID) (Index + DEVICE_KEY_OFFSET)\r
+          );\r
+      }\r
+    }\r
   }\r
 \r
-  //\r
-  // Add End Opcode for Subtitle\r
-  //\r
-  HiiCreateEndOpCode (StartOpCodeHandle);\r
-\r
   Status = gBS->LocateHandleBuffer (\r
                 ByProtocol,\r
                 &gEfiDriverHealthProtocolGuid,\r
@@ -429,13 +928,24 @@ CallDeviceManager (
                 &NumHandles,\r
                 &DriverHealthHandles\r
                 );\r
+\r
   //\r
-  // If there are no drivers installed driver health protocol\r
+  // If there are no drivers installed driver health protocol, do not create driver health entry in UI\r
   //\r
-  if (NumHandles == 0) {\r
-    HiiSetString (HiiHandle, STRING_TOKEN (STR_DM_DRIVER_HEALTH_TITLE), GetStringById (STRING_TOKEN (STR_EMPTY_STRING)), NULL);\r
-    HiiSetString (HiiHandle, STRING_TOKEN (STR_DRIVER_HEALTH_ALL_HEALTHY), GetStringById (STRING_TOKEN (STR_EMPTY_STRING)), NULL);\r
-  } else {\r
+  if (NumHandles != 0) {\r
+    //\r
+    // If driver health protocol is installed, create Driver Health subtitle and entry\r
+    //\r
+    HiiCreateSubTitleOpCode (StartOpCodeHandle, STRING_TOKEN (STR_DM_DRIVER_HEALTH_TITLE), 0, 0, 0);\r
+    HiiCreateGotoOpCode (\r
+      StartOpCodeHandle,\r
+      DRIVER_HEALTH_FORM_ID,\r
+      STRING_TOKEN(STR_DRIVER_HEALTH_ALL_HEALTHY),      // Prompt text\r
+      STRING_TOKEN(STR_DRIVER_HEALTH_STATUS_HELP),      // Help text\r
+      EFI_IFR_FLAG_CALLBACK,\r
+      DEVICE_MANAGER_KEY_DRIVER_HEALTH                  // Question ID\r
+      );\r
+\r
     //\r
     // Check All Driver health status\r
     //\r
@@ -454,8 +964,8 @@ CallDeviceManager (
 \r
   HiiUpdateForm (\r
     HiiHandle,\r
-    &mDeviceManagerGuid,\r
-    DEVICE_MANAGER_FORM_ID,\r
+    &gDeviceManagerFormSetGuid,\r
+    mNextShowFormId,\r
     StartOpCodeHandle,\r
     EndOpCodeHandle\r
     );\r
@@ -465,8 +975,8 @@ CallDeviceManager (
                            gFormBrowser2,\r
                            &HiiHandle,\r
                            1,\r
-                           &mDeviceManagerGuid,\r
-                           0,\r
+                           &gDeviceManagerFormSetGuid,\r
+                           mNextShowFormId,\r
                            NULL,\r
                            &ActionRequest\r
                            );\r
@@ -475,10 +985,10 @@ CallDeviceManager (
   }\r
 \r
   //\r
-  // We will have returned from processing a callback - user either hit ESC to exit, or selected\r
+  // We will have returned from processing a callback, selected\r
   // a target to display\r
   //\r
-  if ((gCallbackKey != 0) && (gCallbackKey != DEVICE_MANAGER_KEY_DRIVER_HEALTH)) {\r
+  if ((gCallbackKey >= DEVICE_KEY_OFFSET)) {\r
     ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r
     Status = gFormBrowser2->SendForm (\r
                              gFormBrowser2,\r
@@ -498,6 +1008,7 @@ CallDeviceManager (
     // Force return to Device Manager\r
     //\r
     gCallbackKey = FRONT_PAGE_KEY_DEVICE_MANAGER;\r
+    goto Done;\r
   }\r
 \r
   //\r
@@ -505,26 +1016,48 @@ CallDeviceManager (
   //\r
   if (gCallbackKey == DEVICE_MANAGER_KEY_DRIVER_HEALTH) {\r
     CallDriverHealth ();\r
+    //\r
+    // Force return to Device Manager\r
+    //\r
+    gCallbackKey = FRONT_PAGE_KEY_DEVICE_MANAGER;\r
+    goto Done;\r
   }\r
 \r
   //\r
-  // Cleanup dynamic created strings in HII database by reinstall the packagelist\r
+  // Enter from device manager and into the network device list.\r
   //\r
-  HiiRemovePackages (HiiHandle);\r
+  if (gCallbackKey == QUESTION_NETWORK_DEVICE_ID) {\r
+    mNextShowFormId = NETWORK_DEVICE_LIST_FORM_ID;\r
+    gCallbackKey = FRONT_PAGE_KEY_DEVICE_MANAGER;\r
+    goto Done;\r
+  }\r
+\r
+  //\r
+  // In this case, go from the network device list to the specify device.\r
+  //\r
+  if ((gCallbackKey < MAX_KEY_SECTION_LEN + NETWORK_DEVICE_LIST_KEY_OFFSET ) && (gCallbackKey >= NETWORK_DEVICE_LIST_KEY_OFFSET)) {\r
+         mNextShowFormId = NETWORK_DEVICE_FORM_ID;\r
+    gCallbackKey = FRONT_PAGE_KEY_DEVICE_MANAGER;\r
+    goto Done;\r
+  }\r
 \r
-  gDeviceManagerPrivate.HiiHandle = HiiAddPackages (\r
-                                      &mDeviceManagerGuid,\r
-                                      gDeviceManagerPrivate.DriverHandle,\r
-                                      DeviceManagerVfrBin,\r
-                                      BdsDxeStrings,\r
-                                      NULL\r
-                                      );\r
-  if (gDeviceManagerPrivate.HiiHandle == NULL) {\r
-    Status = EFI_OUT_OF_RESOURCES;\r
+  //\r
+  // Select the ESC, the gCallbackKey == 0.\r
+  //\r
+  if(mNextShowFormId - 1 < DEVICE_MANAGER_FORM_ID) {\r
+    mNextShowFormId = DEVICE_MANAGER_FORM_ID;\r
   } else {\r
-    Status = EFI_SUCCESS;\r
+    mNextShowFormId = (UINT16) (mNextShowFormId - 1);\r
+    gCallbackKey = FRONT_PAGE_KEY_DEVICE_MANAGER;\r
   }\r
 \r
+Done:\r
+  //\r
+  // Remove our packagelist from HII database.\r
+  //\r
+  HiiRemovePackages (HiiHandle);\r
+  gDeviceManagerPrivate.HiiHandle = NULL;\r
+\r
   HiiFreeOpCodeHandle (StartOpCodeHandle);\r
   HiiFreeOpCodeHandle (EndOpCodeHandle);\r
   FreePool (HiiHandles);\r
@@ -559,18 +1092,25 @@ DriverHealthCallback (
   OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
   )\r
 {\r
-  if ((Value == NULL) || (ActionRequest == NULL)) {\r
-    return EFI_INVALID_PARAMETER;\r
-  }\r
+  if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
+    if ((Value == NULL) || (ActionRequest == NULL)) {\r
+      return EFI_INVALID_PARAMETER;\r
+    }\r
 \r
-  gCallbackKey = QuestionId;\r
+    gCallbackKey = QuestionId;\r
+\r
+    //\r
+    // Request to exit SendForm(), so as to switch to selected form\r
+    //\r
+    *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
+\r
+    return EFI_SUCCESS;\r
+  }\r
 \r
   //\r
-  // Request to exit SendForm(), so as to switch to selected form\r
+  // All other action return unsupported.\r
   //\r
-  *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
-\r
-  return EFI_SUCCESS;\r
+  return EFI_UNSUPPORTED;\r
 }\r
 \r
 /**\r
@@ -610,15 +1150,32 @@ CallDriverHealth (
   DRIVER_HEALTH_INFO          *DriverHealthInfo;\r
   LIST_ENTRY                  *Link;\r
   EFI_DEVICE_PATH_PROTOCOL    *DriverDevicePath;\r
-  UINTN                       Length;\r
+  BOOLEAN                     RebootRequired;\r
 \r
-  HiiHandle           = gDeviceManagerPrivate.DriverHealthHiiHandle;\r
   Index               = 0;\r
-  Length              = 0;\r
   DriverHealthInfo    = NULL;  \r
   DriverDevicePath    = NULL;\r
   InitializeListHead (&DriverHealthList);\r
 \r
+  HiiHandle = gDeviceManagerPrivate.DriverHealthHiiHandle;\r
+  if (HiiHandle == NULL) {\r
+    //\r
+    // Publish Driver Health HII data.\r
+    //\r
+    HiiHandle = HiiAddPackages (\r
+                  &gDeviceManagerFormSetGuid,\r
+                  gDeviceManagerPrivate.DriverHealthHandle,\r
+                  DriverHealthVfrBin,\r
+                  BdsDxeStrings,\r
+                  NULL\r
+                  );\r
+    if (HiiHandle == NULL) {\r
+      return;\r
+    }\r
+\r
+    gDeviceManagerPrivate.DriverHealthHiiHandle = HiiHandle;\r
+  }\r
+\r
   //\r
   // Allocate space for creation of UpdateData Buffer\r
   //\r
@@ -717,44 +1274,36 @@ CallDriverHealth (
                      DriverHealthInfo->MessageList->StringId, \r
                      NULL\r
                      );\r
-       //\r
-       // Assert if can not retrieve the message string\r
-       //\r
-       ASSERT (TmpString != NULL);\r
-       StrnCat (String, TmpString, StrLen (TmpString));\r
-       FreePool (TmpString);\r
     } else {\r
       //\r
       // Update the string will be displayed base on the driver's health status\r
       //\r
       switch(DriverHealthInfo->HealthStatus) {\r
       case EfiDriverHealthStatusRepairRequired:\r
-        Length = StrLen (GetStringById (STRING_TOKEN (STR_REPAIR_REQUIRED)));\r
-        StrnCat (String, GetStringById (STRING_TOKEN (STR_REPAIR_REQUIRED)), Length);\r
+        TmpString = GetStringById (STRING_TOKEN (STR_REPAIR_REQUIRED));\r
         break;\r
       case EfiDriverHealthStatusConfigurationRequired:\r
-        Length = StrLen (GetStringById (STRING_TOKEN (STR_CONFIGURATION_REQUIRED)));\r
-        StrnCat (String, GetStringById (STRING_TOKEN (STR_CONFIGURATION_REQUIRED)), Length);\r
+        TmpString = GetStringById (STRING_TOKEN (STR_CONFIGURATION_REQUIRED));\r
         break;\r
       case EfiDriverHealthStatusFailed:\r
-        Length = StrLen (GetStringById (STRING_TOKEN (STR_OPERATION_FAILED)));\r
-        StrnCat (String, GetStringById (STRING_TOKEN (STR_OPERATION_FAILED)), Length);\r
+        TmpString = GetStringById (STRING_TOKEN (STR_OPERATION_FAILED));\r
         break;\r
       case EfiDriverHealthStatusReconnectRequired:\r
-        Length = StrLen (GetStringById (STRING_TOKEN (STR_RECONNECT_REQUIRED)));\r
-        StrnCat (String, GetStringById (STRING_TOKEN (STR_RECONNECT_REQUIRED)), Length);\r
+        TmpString = GetStringById (STRING_TOKEN (STR_RECONNECT_REQUIRED));\r
         break;\r
       case EfiDriverHealthStatusRebootRequired:\r
-        Length = StrLen (GetStringById (STRING_TOKEN (STR_REBOOT_REQUIRED)));\r
-        StrnCat (String, GetStringById (STRING_TOKEN (STR_REBOOT_REQUIRED)), Length);\r
+        TmpString = GetStringById (STRING_TOKEN (STR_REBOOT_REQUIRED));\r
         break;\r
       default:\r
-        Length = StrLen (GetStringById (STRING_TOKEN (STR_DRIVER_HEALTH_HEALTHY)));\r
-        StrnCat (String, GetStringById (STRING_TOKEN (STR_DRIVER_HEALTH_HEALTHY)), Length);\r
+        TmpString = GetStringById (STRING_TOKEN (STR_DRIVER_HEALTH_HEALTHY));\r
         break;\r
       }\r
     }\r
 \r
+    ASSERT (TmpString != NULL);\r
+    StrCat (String, TmpString);\r
+    FreePool (TmpString);\r
+\r
     Token = HiiSetString (HiiHandle, 0, String, NULL);\r
     FreePool (String);\r
 \r
@@ -812,7 +1361,7 @@ CallDriverHealth (
 \r
   Status = HiiUpdateForm (\r
              HiiHandle,\r
-             &mDriverHealthGuid,\r
+             &gDriverHealthFormSetGuid,\r
              DRIVER_HEALTH_FORM_ID,\r
              StartOpCodeHandle,\r
              EndOpCodeHandle\r
@@ -822,7 +1371,7 @@ CallDriverHealth (
 \r
   Status = HiiUpdateForm (\r
             HiiHandle,\r
-            &mDriverHealthGuid,\r
+            &gDriverHealthFormSetGuid,\r
             DRIVER_HEALTH_FORM_ID,\r
             StartOpCodeHandleRepair,\r
             EndOpCodeHandleRepair\r
@@ -835,7 +1384,7 @@ CallDriverHealth (
                            gFormBrowser2,\r
                            &HiiHandle,\r
                            1,\r
-                           &mDriverHealthGuid,\r
+                           &gDriverHealthFormSetGuid,\r
                            DRIVER_HEALTH_FORM_ID,\r
                            NULL,\r
                            &ActionRequest\r
@@ -849,7 +1398,7 @@ CallDriverHealth (
   // a target to display.\r
   // Process the diver health status states here.\r
   // \r
-  if (gCallbackKey >= DRIVER_HEALTH_KEY_OFFSET && gCallbackKey != DRIVER_HEALTH_REPAIR_ALL_KEY && gCallbackKey != FRONT_PAGE_KEY_DEVICE_MANAGER) {\r
+  if (gCallbackKey >= DRIVER_HEALTH_KEY_OFFSET && gCallbackKey != DRIVER_HEALTH_REPAIR_ALL_KEY) {\r
     ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r
 \r
     Link = GetFirstNode (&DriverHealthList);\r
@@ -864,15 +1413,20 @@ CallDriverHealth (
         //\r
         // Process the driver's healthy status for the specify module\r
         //\r
+        RebootRequired = FALSE;\r
         ProcessSingleControllerHealth (\r
           DriverHealthInfo->DriverHealth,\r
           DriverHealthInfo->ControllerHandle,      \r
           DriverHealthInfo->ChildHandle,\r
           DriverHealthInfo->HealthStatus,\r
           &(DriverHealthInfo->MessageList),\r
-          DriverHealthInfo->HiiHandle\r
-       );  \r
-       break;\r
+          DriverHealthInfo->HiiHandle,\r
+          &RebootRequired\r
+          );\r
+        if (RebootRequired) {\r
+          gRT->ResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);\r
+        }\r
+        break;\r
       }\r
       Index++;\r
       Link = GetNextNode (&DriverHealthList, Link);\r
@@ -900,23 +1454,11 @@ CallDriverHealth (
   }\r
    \r
   //\r
-  // Cleanup dynamic created strings in HII database by reinstall the packagelist\r
+  // Remove driver health packagelist from HII database.\r
   //\r
-  \r
   HiiRemovePackages (HiiHandle);\r
+  gDeviceManagerPrivate.DriverHealthHiiHandle = NULL;\r
 \r
-  gDeviceManagerPrivate.DriverHealthHiiHandle = HiiAddPackages (\r
-                                                  &mDriverHealthGuid,\r
-                                                  gDeviceManagerPrivate.DriverHealthHandle,\r
-                                                  DriverHealthVfrBin,\r
-                                                  BdsDxeStrings,\r
-                                                  NULL\r
-                                                  );\r
-  if (gDeviceManagerPrivate.DriverHealthHiiHandle == NULL) {\r
-    Status = EFI_OUT_OF_RESOURCES;\r
-  } else {\r
-    Status = EFI_SUCCESS;\r
-  }\r
   //\r
   // Free driver health info list\r
   //\r
@@ -938,31 +1480,28 @@ CallDriverHealth (
   HiiFreeOpCodeHandle (EndOpCodeHandleRepair); \r
 \r
   if (gCallbackKey == DRIVER_HEALTH_RETURN_KEY) {\r
+    //\r
+    // Force return to Driver Health Form\r
+    //\r
     gCallbackKey = DEVICE_MANAGER_KEY_DRIVER_HEALTH;\r
     CallDriverHealth ();\r
   }\r
-  if (gCallbackKey == DEVICE_MANAGER_KEY_DRIVER_HEALTH) {\r
-    CallDeviceManager();\r
-  }\r
 }\r
 \r
 \r
-/*\r
+/**\r
   Check the Driver Health status of a single controller and try to process it if not healthy.\r
 \r
   This function called by CheckAllControllersHealthStatus () function in order to process a specify\r
   contoller's health state.\r
 \r
-  @param DriverHealth       A pointer to the EFI_DRIVER_HEALTH_PROTOCOL instance.\r
+  @param DriverHealthList   A Pointer to the list contain all of the platform driver health information. \r
+  @param DriverHandle       The handle of driver.\r
   @param ControllerHandle   The class guid specifies which form set will be displayed.\r
   @param ChildHandle        The handle of the child controller to retrieve the health \r
-                           status on.  This is an optional parameter that may be NULL. \r
+                            status on.  This is an optional parameter that may be NULL. \r
+  @param DriverHealth       A pointer to the EFI_DRIVER_HEALTH_PROTOCOL instance.\r
   @param HealthStatus       The health status of the controller.\r
-  @param MessageList        An array of warning or error messages associated \r
-                           with the controller specified by ControllerHandle and \r
-                           ChildHandle.  This is an optional parameter that may be NULL.\r
-  @param FormHiiHandle      The HII handle for an HII form associated with the \r
-                           controller specified by ControllerHandle and ChildHandle.\r
 \r
   @retval EFI_INVALID_PARAMETER   HealthStatus or DriverHealth is NULL.\r
   @retval HealthStatus            The Health status of specify controller.\r
@@ -970,7 +1509,7 @@ CallDriverHealth (
   @retval EFI_NOT_FOUND           No controller in the platform install Driver Health Protocol.\r
   @retval EFI_SUCCESS             The Health related operation has been taken successfully.\r
 \r
-*/\r
+**/\r
 EFI_STATUS\r
 EFIAPI\r
 GetSingleControllerHealthStatus (\r
@@ -1275,14 +1814,14 @@ Done:
 }\r
 \r
 \r
-/*\r
+/**\r
   Check the healthy status of the platform, this function will return immediately while found one driver \r
   in the platform are not healthy.\r
 \r
   @retval FALSE      at least one driver in the platform are not healthy.\r
   @retval TRUE       No controller install Driver Health Protocol,\r
                      or all controllers in the platform are in healthy status.\r
-*/\r
+**/\r
 BOOLEAN\r
 PlaformHealthStatusCheck (\r
   VOID\r
@@ -1374,15 +1913,17 @@ PlaformHealthStatusCheck (
                             ChildHandle.  This is an optional parameter that may be NULL.\r
   @param FormHiiHandle      The HII handle for an HII form associated with the \r
                             controller specified by ControllerHandle and ChildHandle.\r
+  @param RebootRequired     Indicate whether a reboot is required to repair the controller.\r
 **/\r
 VOID\r
 ProcessSingleControllerHealth (\r
-    IN  EFI_DRIVER_HEALTH_PROTOCOL         *DriverHealth,\r
-    IN  EFI_HANDLE                         ControllerHandle, OPTIONAL\r
-    IN  EFI_HANDLE                         ChildHandle,      OPTIONAL\r
-    IN  EFI_DRIVER_HEALTH_STATUS           HealthStatus,\r
-    IN  EFI_DRIVER_HEALTH_HII_MESSAGE      **MessageList,    OPTIONAL\r
-    IN  EFI_HII_HANDLE                     FormHiiHandle\r
+  IN  EFI_DRIVER_HEALTH_PROTOCOL         *DriverHealth,\r
+  IN  EFI_HANDLE                         ControllerHandle, OPTIONAL\r
+  IN  EFI_HANDLE                         ChildHandle,      OPTIONAL\r
+  IN  EFI_DRIVER_HEALTH_STATUS           HealthStatus,\r
+  IN  EFI_DRIVER_HEALTH_HII_MESSAGE      **MessageList,    OPTIONAL\r
+  IN  EFI_HII_HANDLE                     FormHiiHandle,\r
+  IN OUT BOOLEAN                         *RebootRequired\r
   )\r
 {\r
   EFI_STATUS                         Status;\r
@@ -1394,8 +1935,8 @@ ProcessSingleControllerHealth (
   // reach a terminal status. The status from EfiDriverHealthStatusRepairRequired after repair \r
   // will be in (Health, Failed, Configuration Required).\r
   //\r
-  while( LocalHealthStatus == EfiDriverHealthStatusConfigurationRequired ||\r
-         LocalHealthStatus == EfiDriverHealthStatusRepairRequired) {\r
+  while(LocalHealthStatus == EfiDriverHealthStatusConfigurationRequired ||\r
+        LocalHealthStatus == EfiDriverHealthStatusRepairRequired) {\r
 \r
     if (LocalHealthStatus == EfiDriverHealthStatusRepairRequired) {\r
       Status = DriverHealth->Repair (\r
@@ -1411,16 +1952,23 @@ ProcessSingleControllerHealth (
     // (Healthy, Reboot Required, Failed, Reconnect Required, Repair Required).   \r
     //\r
     if (LocalHealthStatus == EfiDriverHealthStatusConfigurationRequired) {\r
-      Status = gFormBrowser2->SendForm (\r
-                                gFormBrowser2,\r
-                                &FormHiiHandle,\r
-                                1,\r
-                                &gEfiHiiDriverHealthFormsetGuid,\r
-                                0,\r
-                                NULL,\r
-                                NULL\r
-                                );\r
-      ASSERT( !EFI_ERROR (Status));\r
+      if (FormHiiHandle != NULL) {\r
+        Status = gFormBrowser2->SendForm (\r
+                                  gFormBrowser2,\r
+                                  &FormHiiHandle,\r
+                                  1,\r
+                                  &gEfiHiiDriverHealthFormsetGuid,\r
+                                  0,\r
+                                  NULL,\r
+                                  NULL\r
+                                  );\r
+        ASSERT( !EFI_ERROR (Status));\r
+      } else {\r
+        //\r
+        // Exit the loop in case no FormHiiHandle is supplied to prevent dead-loop\r
+        //\r
+        break;\r
+      }\r
     }\r
 \r
     Status = DriverHealth->GetHealthStatus (\r
@@ -1431,11 +1979,11 @@ ProcessSingleControllerHealth (
                               NULL,\r
                               &FormHiiHandle\r
                               );\r
-   ASSERT_EFI_ERROR (Status);\r
+    ASSERT_EFI_ERROR (Status);\r
 \r
-   if (*MessageList != NULL) {\r
+    if (*MessageList != NULL) {\r
       ProcessMessages (*MessageList);\r
-   }  \r
+    }  \r
   }\r
   \r
   //\r
@@ -1450,7 +1998,7 @@ ProcessSingleControllerHealth (
   // Check for RebootRequired or ReconnectRequired\r
   //\r
   if (LocalHealthStatus == EfiDriverHealthStatusRebootRequired) {\r
-    gRT->ResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);\r
+    *RebootRequired = TRUE;\r
   }\r
   \r
   //\r
@@ -1459,12 +2007,13 @@ ProcessSingleControllerHealth (
   if (LocalHealthStatus == EfiDriverHealthStatusReconnectRequired) {\r
     Status = gBS->DisconnectController (ControllerHandle, NULL, NULL);\r
     if (EFI_ERROR (Status)) {\r
-        //\r
-        // Disconnect failed.  Need to promote reconnect to a reboot.\r
-        //\r
-        gRT->ResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);\r
+      //\r
+      // Disconnect failed.  Need to promote reconnect to a reboot.\r
+      //\r
+      *RebootRequired = TRUE;\r
+    } else {\r
+      gBS->ConnectController (ControllerHandle, NULL, NULL, TRUE);\r
     }\r
-    gBS->ConnectController (ControllerHandle, NULL, NULL, TRUE);\r
   }\r
 }\r
 \r
@@ -1539,7 +2088,7 @@ ProcessMessages (
 \r
 }\r
 \r
-/*\r
+/**\r
   Repair the whole platform.\r
 \r
   This function is the main entry for user choose "Repair All" in the front page.\r
@@ -1549,7 +2098,7 @@ ProcessMessages (
   @param DriverHealthList   A Pointer to the list contain all of the platform driver health\r
                             information.\r
 \r
-*/\r
+**/\r
 VOID\r
 PlatformRepairAll (\r
   IN LIST_ENTRY  *DriverHealthList\r
@@ -1557,12 +2106,16 @@ PlatformRepairAll (
 { \r
   DRIVER_HEALTH_INFO          *DriverHealthInfo;\r
   LIST_ENTRY                  *Link;\r
+  BOOLEAN                     RebootRequired;\r
 \r
   ASSERT (DriverHealthList != NULL);\r
 \r
-  Link = GetFirstNode (DriverHealthList);\r
+  RebootRequired = FALSE;\r
 \r
-  while (!IsNull (DriverHealthList, Link)) {   \r
+  for ( Link = GetFirstNode (DriverHealthList)\r
+      ; !IsNull (DriverHealthList, Link)\r
+      ; Link = GetNextNode (DriverHealthList, Link)\r
+      ) {\r
     DriverHealthInfo = DEVICE_MANAGER_HEALTH_INFO_FROM_LINK (Link);\r
     //\r
     // Do driver health status operation by each link node\r
@@ -1570,15 +2123,18 @@ PlatformRepairAll (
     ASSERT (DriverHealthInfo != NULL);\r
 \r
     ProcessSingleControllerHealth ( \r
-        DriverHealthInfo->DriverHealth,\r
-        DriverHealthInfo->ControllerHandle,\r
-        DriverHealthInfo->ChildHandle,\r
-        DriverHealthInfo->HealthStatus,\r
-        &(DriverHealthInfo->MessageList),\r
-        DriverHealthInfo->HiiHandle\r
-        );\r
+      DriverHealthInfo->DriverHealth,\r
+      DriverHealthInfo->ControllerHandle,\r
+      DriverHealthInfo->ChildHandle,\r
+      DriverHealthInfo->HealthStatus,\r
+      &(DriverHealthInfo->MessageList),\r
+      DriverHealthInfo->HiiHandle,\r
+      &RebootRequired\r
+      );\r
+  }\r
 \r
-    Link = GetNextNode (DriverHealthList, Link);\r
+  if (RebootRequired) {\r
+    gRT->ResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);\r
   }\r
 }\r
 \r
@@ -1640,10 +2196,10 @@ DriverHealthSelectBestLanguage (
   @param  SupportedLanguage    The best suitable language that matches the SupportedLangues interface for the \r
                                located Component Name (2) instance.\r
 \r
-  @param  EFI_SUCCESS          The Component Name (2) protocol instance is successfully located and we find\r
+  @retval EFI_SUCCESS          The Component Name (2) protocol instance is successfully located and we find\r
                                the best matching language it support.\r
-  @param  EFI_UNSUPPORTED      The input Language is not supported by the Component Name (2) protocol.\r
-  @param  Other                Some error occurs when locating Component Name (2) protocol instance or finding\r
+  @retval EFI_UNSUPPORTED      The input Language is not supported by the Component Name (2) protocol.\r
+  @retval Other                Some error occurs when locating Component Name (2) protocol instance or finding\r
                                the supported language.\r
 \r
 **/\r
@@ -1862,7 +2418,6 @@ GetControllerNameWorker (
                                It will also be NULL for bus drivers that attempt to retrieve the name\r
                                of the bus controller. It will not be NULL for a bus driver that attempts\r
                                to retrieve the name of a child controller.\r
-  @param  Language             An ASCII string that represents the language command line option.\r
   @param  ControllerName       A pointer to the Unicode string to return. This Unicode string\r
                                is the name of the controller specified by ControllerHandle and ChildHandle.\r
 \r