/** @file\r
The entry point of IScsi driver.\r
\r
-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
+(C) Copyright 2017 Hewlett Packard Enterprise Development LP<BR>\r
+\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
**/\r
EFI_STATUS\r
IScsiCheckAip (\r
+ VOID\r
)\r
{\r
UINTN AipHandleCount;\r
//\r
// Check any AIP instances exist in system.\r
//\r
- AipHandleCount = 0;\r
+ AipHandleCount = 0;\r
+ AipHandleBuffer = NULL;\r
Status = gBS->LocateHandleBuffer (\r
ByProtocol,\r
&gEfiAdapterInformationProtocolGuid,\r
return EFI_NOT_FOUND;\r
}\r
\r
+ ASSERT (AipHandleBuffer != NULL);\r
+\r
InfoBlock = NULL;\r
\r
for (AipIndex = 0; AipIndex < AipHandleCount; AipIndex++) {\r
EFI_GUID *IScsiServiceBindingGuid;\r
EFI_GUID *TcpServiceBindingGuid;\r
EFI_GUID *DhcpServiceBindingGuid;\r
+ EFI_GUID *DnsServiceBindingGuid;\r
\r
if (IpVersion == IP_VERSION_4) {\r
IScsiServiceBindingGuid = &gIScsiV4PrivateGuid;\r
TcpServiceBindingGuid = &gEfiTcp4ServiceBindingProtocolGuid;\r
DhcpServiceBindingGuid = &gEfiDhcp4ServiceBindingProtocolGuid;\r
+ DnsServiceBindingGuid = &gEfiDns4ServiceBindingProtocolGuid;\r
+\r
} else {\r
IScsiServiceBindingGuid = &gIScsiV6PrivateGuid;\r
TcpServiceBindingGuid = &gEfiTcp6ServiceBindingProtocolGuid;\r
DhcpServiceBindingGuid = &gEfiDhcp6ServiceBindingProtocolGuid;\r
+ DnsServiceBindingGuid = &gEfiDns6ServiceBindingProtocolGuid;\r
}\r
\r
Status = gBS->OpenProtocol (\r
return EFI_UNSUPPORTED;\r
}\r
}\r
- \r
+\r
+ if (IScsiDnsIsConfigured (ControllerHandle)) {\r
+ Status = gBS->OpenProtocol (\r
+ ControllerHandle,\r
+ DnsServiceBindingGuid,\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
+\r
return EFI_SUCCESS;\r
}\r
\r
@retval EFI_INVALID_PARAMETER Any input parameter is invalid.\r
@retval EFI_NOT_FOUND There is no sufficient information to establish\r
the iScsi session.\r
- @retval EFI_DEVICE_ERROR Failed to get TCP connection device path. \r
+ @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.\r
+ @retval EFI_DEVICE_ERROR Failed to get TCP connection device path.\r
+ @retval EFI_ACCESS_DENIED The protocol could not be removed from the Handle\r
+ because its interfaces are being used.\r
\r
**/\r
EFI_STATUS\r
EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
EFI_GUID *IScsiPrivateGuid;\r
EFI_GUID *TcpServiceBindingGuid;\r
- CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];\r
BOOLEAN NeedUpdate;\r
VOID *Interface;\r
EFI_GUID *ProtocolGuid;\r
UINT8 NetworkBootPolicy;\r
+ ISCSI_SESSION_CONFIG_NVDATA *NvData;\r
\r
//\r
// Test to see if iSCSI driver supports the given controller.\r
}\r
\r
NetworkBootPolicy = PcdGet8 (PcdIScsiAIPNetworkBootPolicy);\r
- if (NetworkBootPolicy != ALWAYS_USE_UEFI_ISCSI_AND_IGNORE_AIP) {\r
+ if (NetworkBootPolicy == ALWAYS_USE_ISCSI_HBA_AND_IGNORE_UEFI_ISCSI) {\r
+ return EFI_ABORTED;\r
+ }\r
+\r
+ if (NetworkBootPolicy != ALWAYS_USE_UEFI_ISCSI_AND_IGNORE_ISCSI_HBA) {\r
//\r
// Check existing iSCSI AIP.\r
//\r
//\r
// Record the incoming NIC info.\r
//\r
- Status = IScsiAddNic (ControllerHandle);\r
+ Status = IScsiAddNic (ControllerHandle, Image);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
Session->ConfigData = AttemptConfigData;\r
Session->AuthType = AttemptConfigData->AuthenticationType;\r
\r
- AsciiStrToUnicodeStr (AttemptConfigData->MacString, MacString);\r
UnicodeSPrint (\r
mPrivate->PortString,\r
(UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
- L"%s%d",\r
- MacString,\r
+ L"Attempt %d",\r
(UINTN) AttemptConfigData->AttemptConfigIndex\r
);\r
\r
Status = IScsiSessionReLogin (Session);\r
}\r
\r
+ //\r
+ // Restore the origial user setting which specifies the proxy/virtual iSCSI target to NV region.\r
+ //\r
+ NvData = &AttemptConfigData->SessionConfigData;\r
+ if (NvData->RedirectFlag) {\r
+ NvData->TargetPort = NvData->OriginalTargetPort;\r
+ CopyMem (&NvData->TargetIp, &NvData->OriginalTargetIp, sizeof (EFI_IP_ADDRESS));\r
+ NvData->RedirectFlag = FALSE;\r
+\r
+ gRT->SetVariable (\r
+ mPrivate->PortString,\r
+ &gEfiIScsiInitiatorNameProtocolGuid,\r
+ ISCSI_CONFIG_VAR_ATTR,\r
+ sizeof (ISCSI_ATTEMPT_CONFIG_NVDATA),\r
+ AttemptConfigData\r
+ );\r
+ }\r
+\r
if (EFI_ERROR (Status)) {\r
//\r
// In Single path mode, only the successful attempt will be recorded in iBFT;\r
IScsiSessionAbort (ExistPrivate->Session);\r
}\r
\r
- IScsiCleanDriverData (ExistPrivate);\r
+ if (ExistPrivate->DevicePath != NULL) {\r
+ Status = gBS->UninstallProtocolInterface (\r
+ ExistPrivate->ExtScsiPassThruHandle,\r
+ &gEfiDevicePathProtocolGuid,\r
+ ExistPrivate->DevicePath\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ goto ON_ERROR;\r
+ }\r
+\r
+ FreePool (ExistPrivate->DevicePath);\r
+ }\r
+\r
+ gBS->CloseEvent (ExistPrivate->ExitBootServiceEvent);\r
+ FreePool (ExistPrivate);\r
+\r
}\r
} else {\r
//\r
\r
@retval EFI_SUCCESS The device was stopped.\r
@retval EFI_DEVICE_ERROR The device could not be stopped due to a device error.\r
+ @retval EFI_INVALID_PARAMETER Child handle is NULL.\r
+ @retval EFI_ACCESS_DENIED The protocol could not be removed from the Handle\r
+ because its interfaces are being used.\r
\r
**/\r
EFI_STATUS\r
IScsiSessionAbort (Private->Session);\r
}\r
\r
- IScsiCleanDriverData (Private);\r
+ Status = IScsiCleanDriverData (Private);\r
+\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
\r
return EFI_SUCCESS;\r
}\r
goto Error4;\r
}\r
\r
+ //\r
+ // Create the Maximum Attempts.\r
+ //\r
+ Status = IScsiCreateAttempts (PcdGet8 (PcdMaxIScsiAttemptNumber));\r
+ if (EFI_ERROR (Status)) {\r
+ goto Error5;\r
+ }\r
+\r
+ //\r
+ // Create Keywords for all the Attempts.\r
+ //\r
+ Status = IScsiCreateKeywords (PcdGet8 (PcdMaxIScsiAttemptNumber));\r
+ if (EFI_ERROR (Status)) {\r
+ goto Error6;\r
+ }\r
+\r
//\r
// There should be only one EFI_AUTHENTICATION_INFO_PROTOCOL. If already exists,\r
// do not produce the protocol instance.\r
&gIScsiAuthenticationInfo\r
);\r
if (EFI_ERROR (Status)) {\r
- goto Error5;\r
+ goto Error6;\r
} \r
}\r
\r
return EFI_SUCCESS;\r
\r
+Error6:\r
+ IScsiCleanAttemptVariable ();\r
+\r
Error5:\r
IScsiConfigFormUnload (gIScsiIp4DriverBinding.DriverBindingHandle);\r
\r
Error4:\r
- FreePool (mPrivate);\r
+ if (mPrivate != NULL) {\r
+ FreePool (mPrivate);\r
+ mPrivate = NULL;\r
+ }\r
\r
Error3:\r
gBS->UninstallMultipleProtocolInterfaces (\r
projects / mirror_edk2.git / blobdiff