NetworkPkg/IScsiDxe: Add IPv6 support condition check.

Base on the request of https://bugzilla.tianocore.org/show_bug.cgi?id=710,
we provide this patch to IPv6 condition check by leveraging AIP Protocol.

Cc: Karunakar P <karunakarp@amiindia.co.in>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Karunakar P <karunakarp@amiindia.co.in>
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Karunakar p <karunakarp@amiindia.co.in>
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>

diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c b/NetworkPkg/IScsiDxe/IScsiConfig.c
index f20f5904640c62a4a15d76bc5094e11eb37927b7..3ce37c59e0435dcd0c9dbdc578ac309ba398a5a3 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiConfig.c
+++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
@@ -3421,6 +3421,9 @@ IScsiFormCallback (
   ISCSI_CONFIG_IFR_NVDATA     OldIfrNvData;\r
   EFI_STATUS                  Status;\r
   EFI_INPUT_KEY               Key;\r
+  ISCSI_NIC_INFO              *NicInfo;\r
+\r
+  NicInfo = NULL;\r
 \r
   if ((Action == EFI_BROWSER_ACTION_FORM_OPEN) || (Action == EFI_BROWSER_ACTION_FORM_CLOSE)) {\r
     //\r
@@ -3591,6 +3594,21 @@ IScsiFormCallback (
     case KEY_IP_MODE:\r
       switch (Value->u8) {\r
       case IP_MODE_IP6:\r
+        NicInfo = IScsiGetNicInfoByIndex (Private->Current->NicIndex); \r
+        if(!NicInfo->Ipv6Available) {                  \r
+             //\r
+          // Current NIC doesn't Support IPv6, hence use IPv4.    \r
+          //    \r
+          IfrNvData->IpMode = IP_MODE_IP4;\r
+               \r
+          CreatePopUp (\r
+            EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+            &Key,\r
+            L"Current NIC doesn't Support IPv6!",\r
+            NULL\r
+            );\r
+        }\r
+         \r
       case IP_MODE_IP4:\r
         ZeroMem (IfrNvData->LocalIp, sizeof (IfrNvData->LocalIp));\r
         ZeroMem (IfrNvData->SubnetMask, sizeof (IfrNvData->SubnetMask));\r

diff --git a/NetworkPkg/IScsiDxe/IScsiDriver.c b/NetworkPkg/IScsiDxe/IScsiDriver.c
index 2249919e18e9799a6f5a77cbb1b0845360902ccc..fbeef970ba6143f910972e53d3599f936a9ac852 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiDriver.c
+++ b/NetworkPkg/IScsiDxe/IScsiDriver.c
@@ -440,7 +440,7 @@ IScsiStart (
   //\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

diff --git a/NetworkPkg/IScsiDxe/IScsiDriver.h b/NetworkPkg/IScsiDxe/IScsiDriver.h
index 6c6e11b0d22831af246ae8f4f90d2b8047f75976..2db93c5d01be7e781e8be840dac48518d01f0b36 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiDriver.h
+++ b/NetworkPkg/IScsiDxe/IScsiDriver.h
@@ -81,6 +81,7 @@ typedef struct {
   UINTN           BusNumber;\r
   UINTN           DeviceNumber;\r
   UINTN           FunctionNumber;\r
+  BOOLEAN         Ipv6Available;\r
 } ISCSI_NIC_INFO;\r
 \r
 typedef struct _ISCSI_PRIVATE_PROTOCOL {\r

diff --git a/NetworkPkg/IScsiDxe/IScsiDxe.inf b/NetworkPkg/IScsiDxe/IScsiDxe.inf
index 01998a0d28957f3d8a0d9bef9b5e501b3db46204..319c7fe79a52519efd1ed2cba0ed99c600b6386e 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiDxe.inf
+++ b/NetworkPkg/IScsiDxe/IScsiDxe.inf
@@ -117,6 +117,7 @@
   gEfiAuthenticationInfoProtocolGuid\r
   ## SOMETIMES_CONSUMES\r
   gEfiAdapterInformationProtocolGuid\r
+  gEfiNetworkInterfaceIdentifierProtocolGuid_31 ## SOMETIMES_CONSUMES\r
 \r
 [Guids]\r
   gEfiEventExitBootServicesGuid                 ## SOMETIMES_CONSUMES ## Event\r
@@ -125,6 +126,7 @@
   gEfiAcpi10TableGuid                           ## SOMETIMES_CONSUMES ## SystemTable\r
   gEfiAcpi20TableGuid                           ## SOMETIMES_CONSUMES ## SystemTable\r
   gEfiAdapterInfoNetworkBootGuid                ## SOMETIMES_CONSUMES ## UNDEFINED\r
+  gEfiAdapterInfoUndiIpv6SupportGuid            ## SOMETIMES_CONSUMES ## GUID\r
   \r
   ## SOMETIMES_PRODUCES ## Variable:L"AttemptOrder"\r
   ## SOMETIMES_CONSUMES ## Variable:L"AttemptOrder"\r

diff --git a/NetworkPkg/IScsiDxe/IScsiImpl.h b/NetworkPkg/IScsiDxe/IScsiImpl.h
index 741c49784adee4db83f318cc05b1149b3cfb845c..9e36da0203091ca7c0d7f058c0e9633cc6c75ec2 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiImpl.h
+++ b/NetworkPkg/IScsiDxe/IScsiImpl.h
@@ -39,6 +39,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/IScsiInitiatorName.h>\r
 #include <Protocol/ScsiPassThruExt.h>\r
 #include <Protocol/AdapterInformation.h>\r
+#include <Protocol/NetworkInterfaceIdentifier.h>\r
 \r
 #include <Library/HiiLib.h>\r
 #include <Library/UefiHiiServicesLib.h>\r

diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.c b/NetworkPkg/IScsiDxe/IScsiMisc.c
index 0a0a3f53e197473790d43489bb390cd3ec8e287f..9e4164c986bc58af794de0a93b168614ed4cf74a 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiMisc.c
+++ b/NetworkPkg/IScsiDxe/IScsiMisc.c
@@ -465,10 +465,115 @@ IScsiGenRandom (
 }\r
 \r
 \r
+/**\r
+  Check whether UNDI protocol supports IPv6.\r
+\r
+  @param[in]   ControllerHandle    Controller handle.\r
+  @param[in]   Image               Handle of the image.\r
+  @param[out]  Ipv6Support         TRUE if UNDI supports IPv6.\r
+\r
+  @retval EFI_SUCCESS            Get the result whether UNDI supports IPv6 by NII or AIP protocol successfully.\r
+  @retval EFI_NOT_FOUND          Don't know whether UNDI supports IPv6 since NII or AIP is not available.\r
+\r
+**/\r
+EFI_STATUS\r
+IScsiCheckIpv6Support (\r
+  IN  EFI_HANDLE                   ControllerHandle,\r
+  IN  EFI_HANDLE                   Image,\r
+  OUT BOOLEAN                      *Ipv6Support\r
+  )\r
+{\r
+  EFI_HANDLE                       Handle;\r
+  EFI_ADAPTER_INFORMATION_PROTOCOL *Aip;\r
+  EFI_STATUS                       Status;\r
+  EFI_GUID                         *InfoTypesBuffer;\r
+  UINTN                            InfoTypeBufferCount;\r
+  UINTN                            TypeIndex;\r
+  BOOLEAN                          Supported;\r
+  VOID                             *InfoBlock;\r
+  UINTN                            InfoBlockSize;\r
+  \r
+  EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL *Nii;\r
+\r
+  ASSERT (Ipv6Support != NULL);\r
+\r
+  //\r
+  // Check whether the UNDI supports IPv6 by NII protocol.\r
+  //\r
+  Status = gBS->OpenProtocol (\r
+                  ControllerHandle,\r
+                  &gEfiNetworkInterfaceIdentifierProtocolGuid_31,\r
+                  (VOID **) &Nii,\r
+                  Image,\r
+                  ControllerHandle,\r
+                  EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                  );\r
+  if (Status == EFI_SUCCESS) {\r
+    *Ipv6Support = Nii->Ipv6Supported;\r
+    return EFI_SUCCESS;\r
+  }\r
+\r
+  //\r
+  // Get the NIC handle by SNP protocol.\r
+  //  \r
+  Handle = NetLibGetSnpHandle (ControllerHandle, NULL);\r
+  if (Handle == NULL) {\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
+  Aip    = NULL;\r
+  Status = gBS->HandleProtocol (\r
+                  Handle,\r
+                  &gEfiAdapterInformationProtocolGuid,\r
+                  (VOID *) &Aip\r
+                  );\r
+  if (EFI_ERROR (Status) || Aip == NULL) {\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
+  InfoTypesBuffer     = NULL;\r
+  InfoTypeBufferCount = 0;\r
+  Status = Aip->GetSupportedTypes (Aip, &InfoTypesBuffer, &InfoTypeBufferCount);\r
+  if (EFI_ERROR (Status) || InfoTypesBuffer == NULL) {\r
+    FreePool (InfoTypesBuffer);\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
+  Supported = FALSE;\r
+  for (TypeIndex = 0; TypeIndex < InfoTypeBufferCount; TypeIndex++) {\r
+    if (CompareGuid (&InfoTypesBuffer[TypeIndex], &gEfiAdapterInfoUndiIpv6SupportGuid)) {\r
+      Supported = TRUE;\r
+      break;\r
+    }\r
+  }\r
+\r
+  FreePool (InfoTypesBuffer);\r
+  if (!Supported) {\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
+  //\r
+  // We now have adapter information block.\r
+  //\r
+  InfoBlock     = NULL;\r
+  InfoBlockSize = 0;\r
+  Status = Aip->GetInformation (Aip, &gEfiAdapterInfoUndiIpv6SupportGuid, &InfoBlock, &InfoBlockSize);\r
+  if (EFI_ERROR (Status) || InfoBlock == NULL) {\r
+    FreePool (InfoBlock);\r
+    return EFI_NOT_FOUND;\r
+  }  \r
+\r
+  *Ipv6Support = ((EFI_ADAPTER_INFO_UNDI_IPV6_SUPPORT *) InfoBlock)->Ipv6Support;\r
+  FreePool (InfoBlock);\r
+  \r
+  return EFI_SUCCESS;\r
+}\r
+\r
 /**\r
   Record the NIC info in global structure.\r
 \r
   @param[in]  Controller         The handle of the controller.\r
+  @param[in]  Image              Handle of the image.\r
 \r
   @retval EFI_SUCCESS            The operation is completed.\r
   @retval EFI_OUT_OF_RESOURCES   Do not have sufficient resources to finish this\r
@@ -477,7 +582,8 @@ IScsiGenRandom (
 **/\r
 EFI_STATUS\r
 IScsiAddNic (\r
-  IN EFI_HANDLE  Controller\r
+  IN EFI_HANDLE  Controller,\r
+  IN EFI_HANDLE  Image\r
   )\r
 {\r
   EFI_STATUS                  Status;\r
@@ -509,6 +615,19 @@ IScsiAddNic (
         CompareMem (&NicInfo->PermanentAddress, MacAddr.Addr, HwAddressSize) == 0 &&\r
         NicInfo->VlanId == VlanId) {\r
       mPrivate->CurrentNic = NicInfo->NicIndex;\r
+         \r
+           //\r
+      // Set IPv6 available flag.\r
+      // \r
+      Status = IScsiCheckIpv6Support (Controller, Image, &NicInfo->Ipv6Available);\r
+      if (EFI_ERROR (Status)) {\r
+        //\r
+        // Fail to get the data whether UNDI supports IPv6. \r
+        // Set default value to TRUE.\r
+        //\r
+        NicInfo->Ipv6Available = TRUE;\r
+      }\r
+         \r
       return EFI_SUCCESS;\r
     }\r
 \r
@@ -530,7 +649,19 @@ IScsiAddNic (
   NicInfo->VlanId         = VlanId;\r
   NicInfo->NicIndex       = (UINT8) (mPrivate->MaxNic + 1);\r
   mPrivate->MaxNic        = NicInfo->NicIndex;\r
-\r
+  \r
+  //\r
+  // Set IPv6 available flag.\r
+  // \r
+  Status = IScsiCheckIpv6Support (Controller, Image, &NicInfo->Ipv6Available);\r
+  if (EFI_ERROR (Status)) {\r
+    //\r
+    // Fail to get the data whether UNDI supports IPv6. \r
+    // Set default value to TRUE.\r
+    //\r
+    NicInfo->Ipv6Available = TRUE;\r
+  }\r
+  \r
   //\r
   // Get the PCI location.\r
   //\r

diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.h b/NetworkPkg/IScsiDxe/IScsiMisc.h
index caa2f94bb1b90d9d758b547b88d74ca896dca5aa..659c0268b582d52e9ce49458917da0810a332be3 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiMisc.h
+++ b/NetworkPkg/IScsiDxe/IScsiMisc.h
@@ -217,6 +217,7 @@ IScsiGenRandom (
   Record the NIC information in a global structure.\r
 \r
   @param[in]  Controller         The handle of the controller.\r
+  @param[in]  Image              Handle of the image.\r
 \r
   @retval EFI_SUCCESS            The operation is completed.\r
   @retval EFI_OUT_OF_RESOURCES   Do not have sufficient resource to finish this\r
@@ -225,7 +226,8 @@ IScsiGenRandom (
 **/\r
 EFI_STATUS\r
 IScsiAddNic (\r
-  IN EFI_HANDLE  Controller\r
+  IN EFI_HANDLE  Controller,\r
+  IN EFI_HANDLE  Image\r
   );\r
 \r
 /**\r