]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
Fix a bug about the iSCSI DHCP dependency issue.
[mirror_edk2.git] / MdeModulePkg / Universal / Network / IScsiDxe / IScsiDriver.c
index 1d4aaed05230565cdbfb84c2e98677f218b99892..f4663d9f59c1837328ad45864f35a634cead7f23 100644 (file)
@@ -1,8 +1,8 @@
 /** @file\r
   The entry point of IScsi driver.\r
 \r
-Copyright (c) 2004 - 2008, Intel Corporation.<BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2004 - 2013, 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
@@ -23,8 +23,43 @@ EFI_DRIVER_BINDING_PROTOCOL gIScsiDriverBinding = {
   NULL\r
 };\r
 \r
-EFI_GUID                    gIScsiPrivateGuid   = ISCSI_PRIVATE_GUID;\r
+/**\r
+  Tests to see if this driver supports the RemainingDevicePath. \r
+\r
+  @param[in]  RemainingDevicePath  A pointer to the remaining portion of a device path.  This \r
+                                   parameter is ignored by device drivers, and is optional for bus \r
+                                   drivers. For bus drivers, if this parameter is not NULL, then \r
+                                   the bus driver must determine if the bus controller specified \r
+                                   by ControllerHandle and the child controller specified \r
+                                   by RemainingDevicePath are both supported by this \r
+                                   bus driver.\r
 \r
+  @retval EFI_SUCCESS              The RemainingDevicePath is supported or NULL.\r
+  @retval EFI_UNSUPPORTED          The device specified by ControllerHandle and\r
+                                   RemainingDevicePath is not supported by the driver specified by This.\r
+**/\r
+EFI_STATUS\r
+IScsiIsDevicePathSupported (\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
+  )\r
+{\r
+  EFI_DEVICE_PATH_PROTOCOL  *CurrentDevicePath;\r
+\r
+  CurrentDevicePath = RemainingDevicePath;\r
+  if (CurrentDevicePath != NULL) {\r
+    while (!IsDevicePathEnd (CurrentDevicePath)) {\r
+      if ((CurrentDevicePath->Type == MESSAGING_DEVICE_PATH) && (CurrentDevicePath->SubType == MSG_ISCSI_DP)) {\r
+        return EFI_SUCCESS;\r
+      }\r
+\r
+      CurrentDevicePath = NextDevicePathNode (CurrentDevicePath);\r
+    }\r
+\r
+    return EFI_UNSUPPORTED;\r
+  }\r
+\r
+  return EFI_SUCCESS;\r
+}\r
 \r
 /**\r
   Tests to see if this driver supports a given controller. If a child device is provided, \r
@@ -59,11 +94,10 @@ IScsiDriverBindingSupported (
   )\r
 {\r
   EFI_STATUS                Status;\r
-  EFI_DEVICE_PATH_PROTOCOL  *CurrentDevicePath;\r
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
-                  &gIScsiPrivateGuid,\r
+                  &gEfiCallerIdGuid,\r
                   NULL,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
@@ -85,17 +119,23 @@ IScsiDriverBindingSupported (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  CurrentDevicePath = RemainingDevicePath;\r
-  if (CurrentDevicePath != NULL) {\r
-    while (!IsDevicePathEnd (CurrentDevicePath)) {\r
-      if ((CurrentDevicePath->Type == MESSAGING_DEVICE_PATH) && (CurrentDevicePath->SubType == MSG_ISCSI_DP)) {\r
-        return EFI_SUCCESS;\r
-      }\r
+  Status = IScsiIsDevicePathSupported (RemainingDevicePath);\r
+  if (EFI_ERROR (Status)) {\r
+    return EFI_UNSUPPORTED;\r
+  }\r
 \r
-      CurrentDevicePath = NextDevicePathNode (CurrentDevicePath);\r
+  if (IScsiDhcpIsConfigured (ControllerHandle)) {\r
+    Status = gBS->OpenProtocol (\r
+                    ControllerHandle,\r
+                    &gEfiDhcp4ServiceBindingProtocolGuid,\r
+                    NULL,\r
+                    This->DriverBindingHandle,\r
+                    ControllerHandle,\r
+                    EFI_OPEN_PROTOCOL_TEST_PROTOCOL\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      return EFI_UNSUPPORTED;\r
     }\r
-\r
-    return EFI_UNSUPPORTED;\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -137,16 +177,61 @@ IScsiDriverBindingStart (
 {\r
   EFI_STATUS        Status;\r
   ISCSI_DRIVER_DATA *Private;\r
+  VOID              *Interface;\r
+\r
+  Private = IScsiCreateDriverData (This->DriverBindingHandle, ControllerHandle);\r
+  if (Private == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
+\r
+  //\r
+  // Create a underlayer child instance, but not need to configure it. Just open ChildHandle\r
+  // via BY_DRIVER. That is, establishing the relationship between ControllerHandle and ChildHandle.\r
+  // Therefore, when DisconnectController(), especially VLAN virtual controller handle,\r
+  // IScsiDriverBindingStop() will be called.\r
+  //\r
+  Status = NetLibCreateServiceChild (\r
+             ControllerHandle,\r
+             This->DriverBindingHandle,\r
+             &gEfiTcp4ServiceBindingProtocolGuid,\r
+             &Private->ChildHandle\r
+             );\r
+\r
+  if (EFI_ERROR (Status)) {\r
+    goto ON_ERROR;\r
+  }\r
+\r
+  Status = gBS->OpenProtocol (\r
+                  Private->ChildHandle,\r
+                  &gEfiTcp4ProtocolGuid,\r
+                  &Interface,\r
+                  This->DriverBindingHandle,\r
+                  ControllerHandle,\r
+                  EFI_OPEN_PROTOCOL_BY_DRIVER\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    goto ON_ERROR;\r
+  }\r
+\r
+  //\r
+  // Always install private protocol no matter what happens later. We need to \r
+  // keep the relationship between ControllerHandle and ChildHandle.\r
+  //\r
+  Status = gBS->InstallProtocolInterface (\r
+                  &ControllerHandle,\r
+                  &gEfiCallerIdGuid,\r
+                  EFI_NATIVE_INTERFACE,\r
+                  &Private->IScsiIdentifier\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    goto ON_ERROR;\r
+  }\r
 \r
   //\r
   // Try to add a port configuration page for this controller.\r
   //\r
   IScsiConfigUpdateForm (This->DriverBindingHandle, ControllerHandle, TRUE);\r
 \r
-  Private = IScsiCreateDriverData (This->DriverBindingHandle, ControllerHandle);\r
-  if (Private == NULL) {\r
-    return EFI_OUT_OF_RESOURCES;\r
-  }\r
   //\r
   // Get the iSCSI configuration data of this controller.\r
   //\r
@@ -190,19 +275,7 @@ IScsiDriverBindingStart (
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
   }\r
-  //\r
-  // Install the iSCSI private stuff as a flag to indicate this controller\r
-  // is already controlled by iSCSI driver.\r
-  //\r
-  Status = gBS->InstallProtocolInterface (\r
-                  &ControllerHandle,\r
-                  &gIScsiPrivateGuid,\r
-                  EFI_NATIVE_INTERFACE,\r
-                  &Private->IScsiIdentifier\r
-                  );\r
-  if (EFI_ERROR (Status)) {\r
-    goto ON_ERROR;\r
-  }\r
+\r
   //\r
   // Update/Publish the iSCSI Boot Firmware Table.\r
   //\r
@@ -213,7 +286,6 @@ IScsiDriverBindingStart (
 ON_ERROR:\r
 \r
   IScsiSessionAbort (&Private->Session);\r
-  IScsiCleanDriverData (Private);\r
 \r
   return Status;\r
 }\r
@@ -300,7 +372,7 @@ IScsiDriverBindingStop (
 \r
   Status = gBS->OpenProtocol (\r
                   IScsiController,\r
-                  &gIScsiPrivateGuid,\r
+                  &gEfiCallerIdGuid,\r
                   (VOID **)&IScsiIdentifier,\r
                   This->DriverBindingHandle,\r
                   ControllerHandle,\r
@@ -312,12 +384,33 @@ IScsiDriverBindingStop (
 \r
   Private = ISCSI_DRIVER_DATA_FROM_IDENTIFIER (IScsiIdentifier);\r
 \r
+  if (Private->ChildHandle != NULL) {\r
+    Status = gBS->CloseProtocol (\r
+                    Private->ChildHandle,\r
+                    &gEfiTcp4ProtocolGuid,\r
+                    This->DriverBindingHandle,\r
+                    IScsiController\r
+                    );\r
+\r
+    ASSERT (!EFI_ERROR (Status));\r
+\r
+    Status = NetLibDestroyServiceChild (\r
+               IScsiController,\r
+               This->DriverBindingHandle,\r
+               &gEfiTcp4ServiceBindingProtocolGuid,\r
+               Private->ChildHandle\r
+               );\r
+    ASSERT (!EFI_ERROR (Status));\r
+  }\r
+\r
+  IScsiConfigUpdateForm (This->DriverBindingHandle, IScsiController, FALSE);\r
+\r
   //\r
   // Uninstall the private protocol.\r
   //\r
   gBS->UninstallProtocolInterface (\r
         IScsiController,\r
-        &gIScsiPrivateGuid,\r
+        &gEfiCallerIdGuid,\r
         &Private->IScsiIdentifier\r
         );\r
 \r
@@ -371,7 +464,7 @@ EfiIScsiUnload (
     }\r
 \r
     if (DeviceHandleBuffer != NULL) {\r
-      gBS->FreePool (DeviceHandleBuffer);\r
+      FreePool (DeviceHandleBuffer);\r
     }\r
   }\r
   //\r