Open default Tcp child via BY_CHILD_CONTROLLER.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / IScsiDxe / IScsiDriver.c

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
index f4663d9f59c1837328ad45864f35a634cead7f23..e55bee8af94d0e25d399f3dd42e8303da8e291c0 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
@@ -1,7 +1,7 @@
 /** @file\r
   The entry point of IScsi driver.\r
 \r
-Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2015, 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
@@ -276,6 +276,30 @@ IScsiDriverBindingStart (
     goto ON_ERROR;\r
   }\r
 \r
+  //\r
+  // ISCSI children should share the default Tcp child, just open the default Tcp child via BY_CHILD_CONTROLLER.\r
+  //\r
+  Status = gBS->OpenProtocol (\r
+                  Private->ChildHandle, /// Default Tcp child\r
+                  &gEfiTcp4ProtocolGuid,\r
+                  &Interface,\r
+                  This->DriverBindingHandle,\r
+                  Private->ExtScsiPassThruHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+                  );              \r
+  if (EFI_ERROR (Status)) {\r
+    gBS->UninstallMultipleProtocolInterfaces (\r
+           Private->ExtScsiPassThruHandle,\r
+           &gEfiExtScsiPassThruProtocolGuid,\r
+           &Private->IScsiExtScsiPassThru,\r
+           &gEfiDevicePathProtocolGuid,\r
+           Private->DevicePath,\r
+           NULL\r
+           );\r
+    \r
+    goto ON_ERROR;\r
+  }\r
+\r
   //\r
   // Update/Publish the iSCSI Boot Firmware Table.\r
   //\r
@@ -356,6 +380,13 @@ IScsiDriverBindingStop (
     // the protocol here but not uninstall the device path protocol and\r
     // EXT SCSI PASS THRU protocol installed on ExtScsiPassThruHandle.\r
     //\r
+    gBS->CloseProtocol (\r
+           Private->ChildHandle,\r
+           &gEfiTcp4ProtocolGuid,\r
+           Private->Image,\r
+           Private->ExtScsiPassThruHandle\r
+           );\r
+    \r
     gBS->CloseProtocol (\r
           Conn->Tcp4Io.Handle,\r
           &gEfiTcp4ProtocolGuid,\r
@@ -439,10 +470,12 @@ EfiIScsiUnload (
   IN EFI_HANDLE  ImageHandle\r
   )\r
 {\r
-  EFI_STATUS  Status;\r
-  UINTN       DeviceHandleCount;\r
-  EFI_HANDLE  *DeviceHandleBuffer;\r
-  UINTN       Index;\r
+  EFI_STATUS                        Status;\r
+  UINTN                             DeviceHandleCount;\r
+  EFI_HANDLE                        *DeviceHandleBuffer;\r
+  UINTN                             Index;\r
+  EFI_COMPONENT_NAME_PROTOCOL       *ComponentName;\r
+  EFI_COMPONENT_NAME2_PROTOCOL      *ComponentName2;\r
 \r
   //\r
   // Try to disonnect the driver from the devices it's controlling.\r
@@ -454,40 +487,89 @@ EfiIScsiUnload (
                   &DeviceHandleCount,\r
                   &DeviceHandleBuffer\r
                   );\r
-  if (!EFI_ERROR (Status)) {\r
-    for (Index = 0; Index < DeviceHandleCount; Index++) {\r
-      Status = gBS->DisconnectController (\r
-                      DeviceHandleBuffer[Index],\r
-                      ImageHandle,\r
-                      NULL\r
-                      );\r
-    }\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
 \r
-    if (DeviceHandleBuffer != NULL) {\r
-      FreePool (DeviceHandleBuffer);\r
+  for (Index = 0; Index < DeviceHandleCount; Index++) {\r
+    Status = IScsiTestManagedDevice (\r
+               DeviceHandleBuffer[Index],\r
+               gIScsiDriverBinding.DriverBindingHandle,\r
+               &gEfiTcp4ProtocolGuid\r
+               );\r
+    if (EFI_ERROR (Status)) {\r
+      continue;\r
     }\r
-  }\r
+    Status = gBS->DisconnectController (\r
+                    DeviceHandleBuffer[Index],\r
+                    gIScsiDriverBinding.DriverBindingHandle,\r
+                    NULL\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      goto ON_EXIT;\r
+    }\r
+  }  \r
+\r
   //\r
   // Unload the iSCSI configuration form.\r
   //\r
-  IScsiConfigFormUnload (gIScsiDriverBinding.DriverBindingHandle);\r
+  Status = IScsiConfigFormUnload (gIScsiDriverBinding.DriverBindingHandle);\r
+  if (EFI_ERROR (Status)) {\r
+    goto ON_EXIT;\r
+  }\r
 \r
   //\r
-  // Uninstall the protocols installed by iSCSI driver.\r
+  // Uninstall the ComponentName and ComponentName2 protocol from iSCSI4 driver binding handle\r
+  // if it has been installed.\r
   //\r
+  Status = gBS->HandleProtocol (\r
+                  gIScsiDriverBinding.DriverBindingHandle,\r
+                  &gEfiComponentNameProtocolGuid,\r
+                  (VOID **) &ComponentName\r
+                  );\r
+  if (!EFI_ERROR (Status)) {\r
+    Status = gBS->UninstallMultipleProtocolInterfaces (\r
+           gIScsiDriverBinding.DriverBindingHandle,\r
+           &gEfiComponentNameProtocolGuid,\r
+           ComponentName,\r
+           NULL\r
+           );\r
+    if (EFI_ERROR (Status)) {\r
+      goto ON_EXIT;\r
+    }\r
+  }\r
+  \r
+  Status = gBS->HandleProtocol (\r
+                  gIScsiDriverBinding.DriverBindingHandle,\r
+                  &gEfiComponentName2ProtocolGuid,\r
+                  (VOID **) &ComponentName2\r
+                  );\r
+  if (!EFI_ERROR (Status)) {\r
+    gBS->UninstallMultipleProtocolInterfaces (\r
+           gIScsiDriverBinding.DriverBindingHandle,\r
+           &gEfiComponentName2ProtocolGuid,\r
+           ComponentName2,\r
+           NULL\r
+           );\r
+    if (EFI_ERROR (Status)) {\r
+      goto ON_EXIT;\r
+    }\r
+  }\r
+\r
   Status = gBS->UninstallMultipleProtocolInterfaces (\r
                   ImageHandle,\r
                   &gEfiDriverBindingProtocolGuid,\r
                   &gIScsiDriverBinding,\r
-                  &gEfiComponentName2ProtocolGuid,\r
-                  &gIScsiComponentName2,\r
-                  &gEfiComponentNameProtocolGuid,\r
-                  &gIScsiComponentName,\r
                   &gEfiIScsiInitiatorNameProtocolGuid,\r
                   &gIScsiInitiatorName,\r
                   NULL\r
                   );\r
+ON_EXIT:\r
 \r
+  if (DeviceHandleBuffer != NULL) {\r
+    FreePool (DeviceHandleBuffer);\r
+  }\r
+  \r
   return Status;\r
 }\r
 \r