]> git.proxmox.com Git - mirror_edk2.git/blobdiff - NetworkPkg/IScsiDxe/IScsiDriver.c
Open default Tcp child via BY_CHILD_CONTROLLER.
[mirror_edk2.git] / NetworkPkg / IScsiDxe / IScsiDriver.c
index 6d6f9a13ed8b8f33059872bc1f1dd3b7b27682ca..5e5d700e47870d7a5f04f2ff8139475a97978511 100644 (file)
@@ -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
@@ -290,7 +290,7 @@ IScsiStart (
   }\r
 \r
   Status = gBS->OpenProtocol (\r
-                  Private->ChildHandle,\r
+                  Private->ChildHandle, /// Default Tcp child\r
                   ProtocolGuid,\r
                   &Interface,\r
                   Image,\r
@@ -651,7 +651,9 @@ IScsiStart (
                            &gIScsiConfigGuid,\r
                            &AttemptConfigOrderSize\r
                            );\r
-    ASSERT (AttemptConfigOrder != NULL);\r
+    if (AttemptConfigOrder == NULL) {\r
+      goto ON_ERROR;\r
+    }\r
     for (Index = 0; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {\r
       if (AttemptConfigOrder[Index] == mPrivate->BootSelectedIndex ||\r
           AttemptConfigOrder[Index] == BootSelected) {\r
@@ -689,7 +691,9 @@ IScsiStart (
 \r
         goto ON_EXIT;\r
       } else {\r
-        ASSERT (AttemptConfigOrder[Index] == BootSelected);\r
+        if (AttemptConfigOrder[Index] != BootSelected) {\r
+          goto ON_ERROR;\r
+        }\r
         mPrivate->BootSelectedIndex = BootSelected;\r
         //\r
         // Clear the resource in ExistPrivate.\r
@@ -746,6 +750,30 @@ IScsiStart (
     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
+                  ProtocolGuid,\r
+                  &Interface,\r
+                  Image,\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
 ON_EXIT:\r
 \r
   //\r
@@ -834,6 +862,13 @@ IScsiStop (
       ProtocolGuid = &gEfiTcp6ProtocolGuid;\r
     }\r
 \r
+    gBS->CloseProtocol (\r
+           Private->ChildHandle,\r
+           ProtocolGuid,\r
+           Private->Image,\r
+           Private->ExtScsiPassThruHandle\r
+           );\r
+    \r
     gBS->CloseProtocol (\r
            Conn->TcpIo.Handle,\r
            ProtocolGuid,\r
@@ -843,6 +878,7 @@ IScsiStop (
 \r
     return EFI_SUCCESS;\r
   }\r
+  \r
   //\r
   // Get the handle of the controller we are controling.\r
   //\r
@@ -1245,10 +1281,12 @@ IScsiUnload (
   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
@@ -1264,64 +1302,184 @@ IScsiUnload (
     return Status;\r
   }\r
 \r
+  //\r
+  // Disconnect the iSCSI4 driver from the controlled device.\r
+  //\r
+  for (Index = 0; Index < DeviceHandleCount; Index++) {\r
+    Status = IScsiTestManagedDevice (\r
+               DeviceHandleBuffer[Index],\r
+               gIScsiIp4DriverBinding.DriverBindingHandle,\r
+               &gEfiTcp4ProtocolGuid)\r
+               ;\r
+    if (EFI_ERROR (Status)) {\r
+      continue;\r
+    }\r
+    Status = gBS->DisconnectController (\r
+                    DeviceHandleBuffer[Index],\r
+                    gIScsiIp4DriverBinding.DriverBindingHandle,\r
+                    NULL\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      goto ON_EXIT;\r
+    }\r
+  }\r
+\r
+  //\r
+  // Disconnect the iSCSI6 driver from the controlled device.\r
+  //\r
   for (Index = 0; Index < DeviceHandleCount; Index++) {\r
-    gBS->DisconnectController (\r
-           DeviceHandleBuffer[Index],\r
+    Status = IScsiTestManagedDevice (\r
+               DeviceHandleBuffer[Index],\r
+               gIScsiIp6DriverBinding.DriverBindingHandle,\r
+               &gEfiTcp6ProtocolGuid\r
+               );\r
+    if (EFI_ERROR (Status)) {\r
+      continue;\r
+    }\r
+    Status = gBS->DisconnectController (\r
+                    DeviceHandleBuffer[Index],\r
+                    gIScsiIp6DriverBinding.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
+  Status = IScsiConfigFormUnload (gIScsiIp4DriverBinding.DriverBindingHandle);\r
+  if (EFI_ERROR (Status)) {\r
+    goto ON_EXIT;\r
+  }\r
+  \r
+  //\r
+  // Uninstall the protocols installed by iSCSI driver.\r
+  //\r
+  Status = gBS->UninstallMultipleProtocolInterfaces (\r
+                  ImageHandle,\r
+                  &gEfiAuthenticationInfoProtocolGuid,\r
+                  &gIScsiAuthenticationInfo,\r
+                  NULL\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    goto ON_EXIT;\r
+  }\r
+  \r
+  if (gIScsiControllerNameTable!= NULL) {\r
+    Status = FreeUnicodeStringTable (gIScsiControllerNameTable);\r
+    if (EFI_ERROR (Status)) {\r
+      goto ON_EXIT;\r
+    }\r
+    gIScsiControllerNameTable = NULL;\r
+  }\r
+\r
+  //\r
+  // Uninstall the ComponentName and ComponentName2 protocol from iSCSI4 driver binding handle\r
+  // if it has been installed.\r
+  //\r
+  Status = gBS->HandleProtocol (\r
+                  gIScsiIp4DriverBinding.DriverBindingHandle,\r
+                  &gEfiComponentNameProtocolGuid,\r
+                  (VOID **) &ComponentName\r
+                  );\r
+  if (!EFI_ERROR (Status)) {\r
+    Status = gBS->UninstallMultipleProtocolInterfaces (\r
            gIScsiIp4DriverBinding.DriverBindingHandle,\r
+           &gEfiComponentNameProtocolGuid,\r
+           ComponentName,\r
            NULL\r
            );\r
-    gBS->DisconnectController (\r
-           DeviceHandleBuffer[Index],\r
-           gIScsiIp6DriverBinding.DriverBindingHandle,\r
+    if (EFI_ERROR (Status)) {\r
+      goto ON_EXIT;\r
+    }\r
+  }\r
+  \r
+  Status = gBS->HandleProtocol (\r
+                  gIScsiIp4DriverBinding.DriverBindingHandle,\r
+                  &gEfiComponentName2ProtocolGuid,\r
+                  (VOID **) &ComponentName2\r
+                  );\r
+  if (!EFI_ERROR (Status)) {\r
+    gBS->UninstallMultipleProtocolInterfaces (\r
+           gIScsiIp4DriverBinding.DriverBindingHandle,\r
+           &gEfiComponentName2ProtocolGuid,\r
+           ComponentName2,\r
            NULL\r
            );\r
+    if (EFI_ERROR (Status)) {\r
+      goto ON_EXIT;\r
+    }\r
   }\r
 \r
   //\r
-  // Unload the iSCSI configuration form.\r
+  // Uninstall the ComponentName and ComponentName2 protocol from iSCSI6 driver binding handle\r
+  // if it has been installed.\r
   //\r
-  IScsiConfigFormUnload (gIScsiIp4DriverBinding.DriverBindingHandle);\r
+  Status = gBS->HandleProtocol (\r
+                  gIScsiIp6DriverBinding.DriverBindingHandle,\r
+                  &gEfiComponentNameProtocolGuid,\r
+                  (VOID **) &ComponentName\r
+                  );\r
+  if (!EFI_ERROR (Status)) {\r
+    Status = gBS->UninstallMultipleProtocolInterfaces (\r
+           gIScsiIp6DriverBinding.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
+                  gIScsiIp6DriverBinding.DriverBindingHandle,\r
+                  &gEfiComponentName2ProtocolGuid,\r
+                  (VOID **) &ComponentName2\r
+                  );\r
+  if (!EFI_ERROR (Status)) {\r
+    gBS->UninstallMultipleProtocolInterfaces (\r
+           gIScsiIp6DriverBinding.DriverBindingHandle,\r
+           &gEfiComponentName2ProtocolGuid,\r
+           ComponentName2,\r
+           NULL\r
+           );\r
+    if (EFI_ERROR (Status)) {\r
+      goto ON_EXIT;\r
+    }\r
+  }\r
 \r
   //\r
-  // Uninstall the protocols installed by iSCSI driver.\r
+  // Uninstall the IScsiInitiatorNameProtocol and all the driver binding protocols.\r
   //\r
-  gBS->UninstallMultipleProtocolInterfaces (\r
-         ImageHandle,\r
-         &gEfiAuthenticationInfoProtocolGuid,\r
-         &gIScsiAuthenticationInfo,\r
-         NULL\r
-         );\r
-\r
-  if (gIScsiControllerNameTable!= NULL) {\r
-    FreeUnicodeStringTable (gIScsiControllerNameTable);\r
-    gIScsiControllerNameTable = NULL;\r
+  Status = gBS->UninstallMultipleProtocolInterfaces (\r
+                  gIScsiIp4DriverBinding.DriverBindingHandle,\r
+                  &gEfiDriverBindingProtocolGuid,\r
+                  &gIScsiIp4DriverBinding,\r
+                  &gEfiIScsiInitiatorNameProtocolGuid,\r
+                  &gIScsiInitiatorName,\r
+                  NULL\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    goto ON_EXIT;\r
   }\r
-  \r
-  gBS->UninstallMultipleProtocolInterfaces (\r
-         gIScsiIp4DriverBinding.DriverBindingHandle,\r
-         &gEfiDriverBindingProtocolGuid,\r
-         &gIScsiIp4DriverBinding,\r
-         &gEfiComponentName2ProtocolGuid,\r
-         &gIScsiComponentName2,\r
-         &gEfiComponentNameProtocolGuid,\r
-         &gIScsiComponentName,\r
-         &gEfiIScsiInitiatorNameProtocolGuid,\r
-         &gIScsiInitiatorName,\r
-         NULL\r
-         );\r
 \r
-  gBS->UninstallMultipleProtocolInterfaces (\r
-         gIScsiIp6DriverBinding.DriverBindingHandle,\r
-         &gEfiDriverBindingProtocolGuid,\r
-         &gIScsiIp6DriverBinding,\r
-         &gEfiComponentName2ProtocolGuid,\r
-         &gIScsiComponentName2,\r
-         &gEfiComponentNameProtocolGuid,\r
-         &gIScsiComponentName,\r
-         NULL\r
-         );\r
+  Status = gBS->UninstallMultipleProtocolInterfaces (\r
+                  gIScsiIp6DriverBinding.DriverBindingHandle,\r
+                  &gEfiDriverBindingProtocolGuid,\r
+                  &gIScsiIp6DriverBinding,\r
+                  NULL\r
+                  );\r
 \r
-  return EFI_SUCCESS;\r
+ON_EXIT:\r
+\r
+  if (DeviceHandleBuffer != NULL) {\r
+    FreePool (DeviceHandleBuffer);\r
+  }\r
+  \r
+  return Status;\r
 }\r
 \r
 /**\r