NetworkPkg: Add WiFi profile sync protocol support

[mirror_edk2.git] / NetworkPkg / WifiConnectionManagerDxe / WifiConnectionMgrDriver.c

diff --git a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrDriver.c b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrDriver.c
index 67a01ca0583f9df60388bdcc90d5860da8ab90fd..36c467025f9b80af5abca22bca662ebc1e69a02c 100644 (file)
--- a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrDriver.c
+++ b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrDriver.c
@@ -1,7 +1,7 @@
 /** @file\r
   The driver binding protocol for the WiFi Connection Manager.\r
 \r
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2019 - 2022, Intel Corporation. All rights reserved.<BR>\r
 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
@@ -39,6 +39,11 @@ EFI_GUID  mWifiConfigNetworkListRefreshGuid = WIFI_CONFIG_NETWORK_LIST_REFRESH_G
 EFI_GUID  mWifiConfigConnectFormRefreshGuid = WIFI_CONFIG_CONNECT_FORM_REFRESH_GUID;\r
 EFI_GUID  mWifiConfigMainFormRefreshGuid    = WIFI_CONFIG_MAIN_FORM_REFRESH_GUID;\r
 \r
+//\r
+// Wifi connection attempt counter for retries\r
+//\r
+extern UINT8  mWifiConnectionCount;\r
+\r
 /**\r
   Tests to see if this driver supports a given controller. If a child device is provided,\r
   it further tests to see if this driver supports creating a handle for the specified child device.\r
@@ -167,8 +172,10 @@ WifiMgrDxeDriverBindingStart (
   EFI_WIRELESS_MAC_CONNECTION_II_PROTOCOL  *Wmp;\r
   EFI_SUPPLICANT_PROTOCOL                  *Supplicant;\r
   EFI_EAP_CONFIGURATION_PROTOCOL           *EapConfig;\r
+  EDKII_WIFI_PROFILE_SYNC_PROTOCOL         *WiFiProfileSyncProtocol;\r
 \r
-  Nic = NULL;\r
+  mWifiConnectionCount = 0;\r
+  Nic                  = NULL;\r
 \r
   //\r
   // Open Protocols\r
@@ -236,47 +243,73 @@ WifiMgrDxeDriverBindingStart (
   InitializeListHead (&Nic->ProfileList);\r
 \r
   //\r
-  // Record the MAC address of the incoming NIC.\r
+  // WiFi profile sync protocol installation check for OS recovery flow.\r
   //\r
-  Status = NetLibGetMacAddress (\r
-             ControllerHandle,\r
-             (EFI_MAC_ADDRESS *)&Nic->MacAddress,\r
-             &AddressSize\r
-             );\r
-  if (EFI_ERROR (Status)) {\r
-    goto ERROR2;\r
-  }\r
-\r
-  //\r
-  // Create and start the timer for the status check\r
-  //\r
-  Status = gBS->CreateEvent (\r
-                  EVT_NOTIFY_SIGNAL | EVT_TIMER,\r
-                  TPL_CALLBACK,\r
-                  WifiMgrOnTimerTick,\r
-                  Nic,\r
-                  &Nic->TickTimer\r
+  Status = gBS->LocateProtocol (\r
+                  &gEdkiiWiFiProfileSyncProtocolGuid,\r
+                  NULL,\r
+                  (VOID **)&WiFiProfileSyncProtocol\r
                   );\r
-  if (EFI_ERROR (Status)) {\r
-    goto ERROR2;\r
-  }\r
+  if (!EFI_ERROR (Status)) {\r
+    Nic->ConnectPendingNetwork = (WIFI_MGR_NETWORK_PROFILE *)AllocateZeroPool (sizeof (WIFI_MGR_NETWORK_PROFILE));\r
+    if (Nic->ConnectPendingNetwork == NULL) {\r
+      Status = EFI_OUT_OF_RESOURCES;\r
+      goto ERROR1;\r
+    }\r
 \r
-  Status = gBS->SetTimer (Nic->TickTimer, TimerPeriodic, EFI_TIMER_PERIOD_MILLISECONDS (500));\r
-  if (EFI_ERROR (Status)) {\r
-    goto ERROR3;\r
-  }\r
+    WiFiProfileSyncProtocol->GetProfile (Nic->ConnectPendingNetwork, Nic->MacAddress);\r
+    if (Nic->ConnectPendingNetwork != NULL) {\r
+      Status = WifiMgrConnectToNetwork (Nic, Nic->ConnectPendingNetwork);\r
+      if (!EFI_ERROR (Status)) {\r
+        goto ERROR1;\r
+      }\r
+\r
+      WiFiProfileSyncProtocol->SetConnectState (Status);\r
+    }\r
+  } else {\r
+    //\r
+    // Record the MAC address of the incoming NIC.\r
+    //\r
+    Status = NetLibGetMacAddress (\r
+               ControllerHandle,\r
+               (EFI_MAC_ADDRESS *)&Nic->MacAddress,\r
+               &AddressSize\r
+               );\r
+    if (EFI_ERROR (Status)) {\r
+      goto ERROR2;\r
+    }\r
 \r
-  Nic->ConnectState = WifiMgrDisconnected;\r
-  Nic->ScanState    = WifiMgrScanFinished;\r
+    //\r
+    // Create and start the timer for the status check\r
+    //\r
+    Status = gBS->CreateEvent (\r
+                    EVT_NOTIFY_SIGNAL | EVT_TIMER,\r
+                    TPL_CALLBACK,\r
+                    WifiMgrOnTimerTick,\r
+                    Nic,\r
+                    &Nic->TickTimer\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      goto ERROR2;\r
+    }\r
 \r
-  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
-  InsertTailList (&mPrivate->NicList, &Nic->Link);\r
-  Nic->NicIndex = mPrivate->NicCount++;\r
-  if (mPrivate->CurrentNic == NULL) {\r
-    mPrivate->CurrentNic = Nic;\r
-  }\r
+    Status = gBS->SetTimer (Nic->TickTimer, TimerPeriodic, EFI_TIMER_PERIOD_MILLISECONDS (500));\r
+    if (EFI_ERROR (Status)) {\r
+      goto ERROR3;\r
+    }\r
 \r
-  gBS->RestoreTPL (OldTpl);\r
+    Nic->ConnectState = WifiMgrDisconnected;\r
+    Nic->ScanState    = WifiMgrScanFinished;\r
+\r
+    OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
+    InsertTailList (&mPrivate->NicList, &Nic->Link);\r
+    Nic->NicIndex = mPrivate->NicCount++;\r
+    if (mPrivate->CurrentNic == NULL) {\r
+      mPrivate->CurrentNic = Nic;\r
+    }\r
+\r
+    gBS->RestoreTPL (OldTpl);\r
+  }\r
 \r
   Status = gBS->InstallProtocolInterface (\r
                   &ControllerHandle,\r
@@ -385,10 +418,11 @@ WifiMgrDxeDriverBindingStop (
   IN EFI_HANDLE                   *ChildHandleBuffer OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS                 Status;\r
-  EFI_TPL                    OldTpl;\r
-  WIFI_MGR_PRIVATE_PROTOCOL  *WifiMgrIdentifier;\r
-  WIFI_MGR_DEVICE_DATA       *Nic;\r
+  EFI_STATUS                        Status;\r
+  EFI_TPL                           OldTpl;\r
+  WIFI_MGR_PRIVATE_PROTOCOL         *WifiMgrIdentifier;\r
+  WIFI_MGR_DEVICE_DATA              *Nic;\r
+  EDKII_WIFI_PROFILE_SYNC_PROTOCOL  *WiFiProfileSyncProtocol;\r
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
@@ -481,7 +515,15 @@ WifiMgrDxeDriverBindingStop (
   //\r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
-  RemoveEntryList (&Nic->Link);\r
+  Status = gBS->LocateProtocol (\r
+                  &gEdkiiWiFiProfileSyncProtocolGuid,\r
+                  NULL,\r
+                  (VOID **)&WiFiProfileSyncProtocol\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    RemoveEntryList (&Nic->Link);\r
+  }\r
+\r
   mPrivate->NicCount--;\r
   if (mPrivate->CurrentNic == Nic) {\r
     mPrivate->CurrentNic = NULL;\r