UefiCpuPkg/PiSmmCpuDxeSmm: Add CPUID MCA support check

[mirror_edk2.git] / NetworkPkg / Ip6Dxe / Ip6Driver.c

diff --git a/NetworkPkg/Ip6Dxe/Ip6Driver.c b/NetworkPkg/Ip6Dxe/Ip6Driver.c
index 8095ed1ae20e15ecca540236122e581e7c0837bb..8a8cc8916afeb965adb5ef51168f507e66e811a7 100644 (file)
--- a/NetworkPkg/Ip6Dxe/Ip6Driver.c
+++ b/NetworkPkg/Ip6Dxe/Ip6Driver.c
@@ -1,7 +1,8 @@
 /** @file\r
   The driver binding and service binding protocol for IP6 driver.\r
 \r
 /** @file\r
   The driver binding and service binding protocol for IP6 driver.\r
 \r

-  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<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
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r


@@ -24,6 +25,32 @@ EFI_DRIVER_BINDING_PROTOCOL gIp6DriverBinding = {
   NULL\r
 };\r
 \r
   NULL\r
 };\r
 \r

+BOOLEAN  mIpSec2Installed = FALSE;\r
+\r
+/**\r
+   Callback function for IpSec2 Protocol install.\r
+\r
+   @param[in] Event           Event whose notification function is being invoked\r
+   @param[in] Context         Pointer to the notification function's context\r
+\r
+**/\r
+VOID\r
+EFIAPI\r
+IpSec2InstalledCallback (\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
+  )\r
+{\r
+  //\r
+  // Close the event so it does not get called again.\r
+  //\r
+  gBS->CloseEvent (Event);\r
+\r
+  mIpSec2Installed = TRUE;\r
+\r
+  return;\r
+}\r
+\r

 /**\r
   This is the declaration of an EFI image entry point. This entry point is\r
   the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including\r
 /**\r
   This is the declaration of an EFI image entry point. This entry point is\r
   the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including\r


@@ -46,6 +73,16 @@ Ip6DriverEntryPoint (
   IN EFI_SYSTEM_TABLE       *SystemTable\r
   )\r
 {\r
   IN EFI_SYSTEM_TABLE       *SystemTable\r
   )\r
 {\r

+  VOID            *Registration;\r
+\r
+  EfiCreateProtocolNotifyEvent (\r
+    &gEfiIpSec2ProtocolGuid,\r
+    TPL_CALLBACK,\r
+    IpSec2InstalledCallback,\r
+    NULL,\r
+    &Registration\r
+    );\r
+\r

   return EfiLibInstallDriverBindingComponentName2 (\r
            ImageHandle,\r
            SystemTable,\r
   return EfiLibInstallDriverBindingComponentName2 (\r
            ImageHandle,\r
            SystemTable,\r


@@ -112,6 +149,22 @@ Ip6CleanService (
   EFI_IPv6_ADDRESS          AllNodes;\r
   IP6_NEIGHBOR_ENTRY        *NeighborCache;\r
 \r
   EFI_IPv6_ADDRESS          AllNodes;\r
   IP6_NEIGHBOR_ENTRY        *NeighborCache;\r
 \r

+  IpSb->State     = IP6_SERVICE_DESTROY;\r
+\r
+  if (IpSb->Timer != NULL) {\r
+    gBS->SetTimer (IpSb->Timer, TimerCancel, 0);\r
+    gBS->CloseEvent (IpSb->Timer);\r
+\r
+    IpSb->Timer = NULL;\r
+  }\r
+\r
+  if (IpSb->FasterTimer != NULL) {\r
+    gBS->SetTimer (IpSb->FasterTimer, TimerCancel, 0);\r
+    gBS->CloseEvent (IpSb->FasterTimer);\r
+\r
+    IpSb->FasterTimer = NULL;\r
+  }\r
+\r

   Ip6ConfigCleanInstance (&IpSb->Ip6ConfigInstance);\r
 \r
   if (!IpSb->LinkLocalDadFail) {\r
   Ip6ConfigCleanInstance (&IpSb->Ip6ConfigInstance);\r
 \r
   if (!IpSb->LinkLocalDadFail) {\r


@@ -177,19 +230,6 @@ Ip6CleanService (
     gBS->CloseEvent (IpSb->RecvRequest.MnpToken.Event);\r
   }\r
 \r
     gBS->CloseEvent (IpSb->RecvRequest.MnpToken.Event);\r
   }\r
 \r

-  if (IpSb->Timer != NULL) {\r
-    gBS->SetTimer (IpSb->Timer, TimerCancel, 0);\r
-    gBS->CloseEvent (IpSb->Timer);\r
-\r
-    IpSb->Timer = NULL;\r
-  }\r
-\r
-  if (IpSb->FasterTimer != NULL) {\r
-    gBS->SetTimer (IpSb->FasterTimer, TimerCancel, 0);\r
-    gBS->CloseEvent (IpSb->FasterTimer);\r
-\r
-    IpSb->FasterTimer = NULL;\r
-  }\r

   //\r
   // Free the Neighbor Discovery resources\r
   //\r
   //\r
   // Free the Neighbor Discovery resources\r
   //\r


@@ -225,7 +265,6 @@ Ip6CreateService (
   EFI_STATUS                            Status;\r
   EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *MnpToken;\r
   EFI_MANAGED_NETWORK_CONFIG_DATA       *Config;\r
   EFI_STATUS                            Status;\r
   EFI_MANAGED_NETWORK_COMPLETION_TOKEN  *MnpToken;\r
   EFI_MANAGED_NETWORK_CONFIG_DATA       *Config;\r

-  IP6_CONFIG_DATA_ITEM                  *DataItem;\r

 \r
   ASSERT (Service != NULL);\r
 \r
 \r
   ASSERT (Service != NULL);\r
 \r


@@ -412,22 +451,21 @@ Ip6CreateService (
     goto ON_ERROR;\r
   }\r
 \r
     goto ON_ERROR;\r
   }\r
 \r

-  //\r
-  // The timer expires every 100 (IP6_TIMER_INTERVAL_IN_MS) milliseconds.\r
-  //\r
-  Status = gBS->SetTimer (IpSb->FasterTimer, TimerPeriodic, TICKS_PER_MS * IP6_TIMER_INTERVAL_IN_MS);\r
+  Status = NetLibGetMacString (IpSb->Controller, IpSb->Image, &IpSb->MacString);\r

   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
   }\r
 \r

-  //\r
-  // The timer expires every 1000 (IP6_ONE_SECOND_IN_MS) milliseconds.\r
-  //\r
-  Status = gBS->SetTimer (IpSb->Timer, TimerPeriodic, TICKS_PER_MS * IP6_ONE_SECOND_IN_MS);\r
+  Status = Ip6ConfigInitInstance (&IpSb->Ip6ConfigInstance);\r

   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
   }\r
 \r

+  IpSb->DefaultInterface = Ip6CreateInterface (IpSb, TRUE);\r
+  if (IpSb->DefaultInterface == NULL) {\r
+    Status = EFI_DEVICE_ERROR;\r
+    goto ON_ERROR;\r
+  }\r

 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r


@@ -440,51 +478,6 @@ Ip6CreateService (
     goto ON_ERROR;\r
   }\r
 \r
     goto ON_ERROR;\r
   }\r
 \r

-  Status = Ip6ReceiveFrame (Ip6AcceptFrame, IpSb);\r
-  if (EFI_ERROR (Status)) {\r
-    goto ON_ERROR;\r
-  }\r
-\r
-  Status = NetLibGetMacString (IpSb->Controller, IpSb->Image, &IpSb->MacString);\r
-  if (EFI_ERROR (Status)) {\r
-    goto ON_ERROR;\r
-  }\r
-\r
-  Status = Ip6ConfigInitInstance (&IpSb->Ip6ConfigInstance);\r
-  if (EFI_ERROR (Status)) {\r
-    goto ON_ERROR;\r
-  }\r
-\r
-  IpSb->DefaultInterface = Ip6CreateInterface (IpSb, TRUE);\r
-  if (IpSb->DefaultInterface == NULL) {\r
-    Status = EFI_DEVICE_ERROR;\r
-    goto ON_ERROR;\r
-  }\r
-\r
-  //\r
-  // If there is any manual address, set it.\r
-  //\r
-  DataItem = &IpSb->Ip6ConfigInstance.DataItem[Ip6ConfigDataTypeManualAddress];\r
-  if (DataItem->Data.Ptr != NULL) {\r
-    DataItem->SetData (\r
-                &IpSb->Ip6ConfigInstance,\r
-                DataItem->DataSize,\r
-                DataItem->Data.Ptr\r
-                );\r
-  }\r
-\r
-  //\r
-  // If there is any gateway address, set it.\r
-  //\r
-  DataItem = &IpSb->Ip6ConfigInstance.DataItem[Ip6ConfigDataTypeGateway];\r
-  if (DataItem->Data.Ptr != NULL) {\r
-    DataItem->SetData (\r
-                &IpSb->Ip6ConfigInstance,\r
-                DataItem->DataSize,\r
-                DataItem->Data.Ptr\r
-                );\r
-  }\r
-\r

   InsertHeadList (&IpSb->Interfaces, &IpSb->DefaultInterface->Link);\r
 \r
   *Service = IpSb;\r
   InsertHeadList (&IpSb->Interfaces, &IpSb->DefaultInterface->Link);\r
 \r
   *Service = IpSb;\r


@@ -520,6 +513,12 @@ Ip6DriverBindingStart (
 {\r
   IP6_SERVICE               *IpSb;\r
   EFI_STATUS                Status;\r
 {\r
   IP6_SERVICE               *IpSb;\r
   EFI_STATUS                Status;\r

+  EFI_IP6_CONFIG_PROTOCOL   *Ip6Cfg;\r
+  IP6_CONFIG_DATA_ITEM      *DataItem;\r
+\r
+  IpSb     = NULL;\r
+  Ip6Cfg   = NULL;\r
+  DataItem = NULL;\r

 \r
   //\r
   // Test for the Ip6 service binding protocol\r
 \r
   //\r
   // Test for the Ip6 service binding protocol\r


@@ -545,6 +544,8 @@ Ip6DriverBindingStart (
 \r
   ASSERT (IpSb != NULL);\r
 \r
 \r
   ASSERT (IpSb != NULL);\r
 \r

+  Ip6Cfg  = &IpSb->Ip6ConfigInstance.Ip6Config;\r
+\r

   //\r
   // Install the Ip6ServiceBinding Protocol onto ControlerHandle\r
   //\r
   //\r
   // Install the Ip6ServiceBinding Protocol onto ControlerHandle\r
   //\r


@@ -553,23 +554,96 @@ Ip6DriverBindingStart (
                   &gEfiIp6ServiceBindingProtocolGuid,\r
                   &IpSb->ServiceBinding,\r
                   &gEfiIp6ConfigProtocolGuid,\r
                   &gEfiIp6ServiceBindingProtocolGuid,\r
                   &IpSb->ServiceBinding,\r
                   &gEfiIp6ConfigProtocolGuid,\r

-                  &IpSb->Ip6ConfigInstance.Ip6Config,\r
+                  Ip6Cfg,\r

                   NULL\r
                   );\r
                   NULL\r
                   );\r

+  if (EFI_ERROR (Status)) {\r
+    goto ON_ERROR;\r
+  }\r

 \r
 \r

+  //\r
+  // Read the config data from NV variable again. \r
+  // The default data can be changed by other drivers.\r
+  //\r
+  Status = Ip6ConfigReadConfigData (IpSb->MacString, &IpSb->Ip6ConfigInstance);\r

   if (EFI_ERROR (Status)) {\r
   if (EFI_ERROR (Status)) {\r

+    goto ON_ERROR;\r
+  }\r
+  \r
+  //\r
+  // If there is any default manual address, set it.\r
+  //\r
+  DataItem = &IpSb->Ip6ConfigInstance.DataItem[Ip6ConfigDataTypeManualAddress];\r
+  if (DataItem->Data.Ptr != NULL) {\r
+    Status = Ip6Cfg->SetData (\r
+                       Ip6Cfg,\r
+                       Ip6ConfigDataTypeManualAddress,\r
+                       DataItem->DataSize,\r
+                       DataItem->Data.Ptr\r
+                       );\r
+    if (EFI_ERROR(Status) && Status != EFI_NOT_READY) {\r
+      goto ON_ERROR;\r
+    }\r
+  }\r

 \r
 \r

-    Ip6CleanService (IpSb);\r
-    FreePool (IpSb);\r
-  } else {\r
-    //\r
-    // Initialize the IP6 ID\r
-    //\r
-    mIp6Id = NET_RANDOM (NetRandomInitSeed ());\r
+  //\r
+  // If there is any default gateway address, set it.\r
+  //\r
+  DataItem = &IpSb->Ip6ConfigInstance.DataItem[Ip6ConfigDataTypeGateway];\r
+  if (DataItem->Data.Ptr != NULL) {\r
+    Status = Ip6Cfg->SetData (\r
+                       Ip6Cfg,\r
+                       Ip6ConfigDataTypeGateway,\r
+                       DataItem->DataSize,\r
+                       DataItem->Data.Ptr\r
+                       );\r
+    if (EFI_ERROR(Status)) {\r
+      goto ON_ERROR;\r
+    }\r
+  }\r

 \r
 \r

-    Ip6SetVariableData (IpSb);\r
+  //\r
+  // ready to go: start the receiving and timer\r
+  //\r
+  Status = Ip6ReceiveFrame (Ip6AcceptFrame, IpSb);\r
+  if (EFI_ERROR (Status)) {\r
+    goto ON_ERROR;\r

   }\r
 \r
   }\r
 \r

+  //\r
+  // The timer expires every 100 (IP6_TIMER_INTERVAL_IN_MS) milliseconds.\r
+  //\r
+  Status = gBS->SetTimer (\r
+                  IpSb->FasterTimer,\r
+                  TimerPeriodic,\r
+                  TICKS_PER_MS * IP6_TIMER_INTERVAL_IN_MS\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    goto ON_ERROR;\r
+  }\r
+\r
+  //\r
+  // The timer expires every 1000 (IP6_ONE_SECOND_IN_MS) milliseconds.\r
+  //\r
+  Status = gBS->SetTimer (\r
+                  IpSb->Timer,\r
+                  TimerPeriodic,\r
+                  TICKS_PER_MS * IP6_ONE_SECOND_IN_MS\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    goto ON_ERROR;\r
+  }    \r
+\r
+  //\r
+  // Initialize the IP6 ID\r
+  //\r
+  mIp6Id = NET_RANDOM (NetRandomInitSeed ());\r
+\r
+  return EFI_SUCCESS;\r
+\r
+ON_ERROR:\r
+  Ip6CleanService (IpSb);\r
+  FreePool (IpSb);\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -688,13 +762,6 @@ Ip6DriverBindingStop (
                );\r
   } else if (IsListEmpty (&IpSb->Children)) {\r
     State           = IpSb->State;\r
                );\r
   } else if (IsListEmpty (&IpSb->Children)) {\r
     State           = IpSb->State;\r

-    IpSb->State     = IP6_SERVICE_DESTROY;\r
-\r
-    //\r
-    // Clear the variable data.\r
-    //\r
-    Ip6ClearVariableData (IpSb);\r
-\r

     Status = Ip6CleanService (IpSb);\r
     if (EFI_ERROR (Status)) {\r
       IpSb->State = State;\r
     Status = Ip6CleanService (IpSb);\r
     if (EFI_ERROR (Status)) {\r
       IpSb->State = State;\r


@@ -729,7 +796,7 @@ Exit:
                                  the existing child handle.\r
 \r
   @retval EFI_SUCCES             The child handle was created with the I/O services.\r
                                  the existing child handle.\r
 \r
   @retval EFI_SUCCES             The child handle was created with the I/O services.\r

-  @retval EFI_OUT_OF_RESOURCES   There are not enough resources availabe to create\r
+  @retval EFI_OUT_OF_RESOURCES   There are not enough resources available to create\r

                                  the child.\r
   @retval other                  The child handle was not created.\r
 \r
                                  the child.\r
   @retval other                  The child handle was not created.\r
 \r


@@ -932,9 +999,6 @@ Ip6ServiceBindingDestroyChild (
   }\r
 \r
   Status = Ip6CleanProtocol (IpInstance);\r
   }\r
 \r
   Status = Ip6CleanProtocol (IpInstance);\r

-\r
-  Ip6SetVariableData (IpSb);\r
-\r

   if (EFI_ERROR (Status)) {\r
     gBS->InstallMultipleProtocolInterfaces (\r
            &ChildHandle,\r
   if (EFI_ERROR (Status)) {\r
     gBS->InstallMultipleProtocolInterfaces (\r
            &ChildHandle,\r