[Silabs] [WiFi] Removing the IP polling from the siwx917 and adding only for rs9116 (project-chip#37782)

* Using the lwip file from wifi sdk and moving dhcp only for rs9116

* addressing review comments

* restyling the PR

* renaming the API name

* adding the comment for the TA retries

* addressing review comments

* Update src/platform/silabs/wifi/wiseconnect-interface/WiseconnectWifiInterface.h

Co-authored-by: Mathieu Kardous <84793247+mkardous-silabs@users.noreply.github.com>

* Update src/platform/silabs/wifi/SiWx/WifiInterfaceImpl.cpp

Co-authored-by: Mathieu Kardous <84793247+mkardous-silabs@users.noreply.github.com>

* Update src/platform/silabs/wifi/SiWx/WifiInterfaceImpl.h

Co-authored-by: Mathieu Kardous <84793247+mkardous-silabs@users.noreply.github.com>

* Update src/platform/silabs/wifi/rs911x/WifiInterfaceImpl.cpp

Co-authored-by: Mathieu Kardous <84793247+mkardous-silabs@users.noreply.github.com>

* restyling the PR

* fixing the build errors

* updating the path and submodule

---------

Co-authored-by: Mathieu Kardous <84793247+mkardous-silabs@users.noreply.github.com>

Author: chirag-silabs

src/platform/silabs/wifi/BUILD.gn

@@ -135,9 +135,7 @@ source_set("wifi-platform") {
       "${silabs_platform_dir}/wifi/SiWx/WifiInterfaceImpl.h",
       "${silabs_platform_dir}/wifi/wiseconnect-interface/WiseconnectWifiInterface.cpp",
       "${silabs_platform_dir}/wifi/wiseconnect-interface/WiseconnectWifiInterface.h",
-
-      # Wi-Fi Config - Using the file sdk support until the wiseconnect file is fixed
-      "${matter_support_root}/sdk-copies/components/service/network_manager/src/sl_net_for_lwip.c",
+      "${wifi_sdk_root}/components/service/network_manager/src/sl_net_for_lwip.c",
     ]
 
     public_deps += [ "${lwip_root}:lwip" ]

src/platform/silabs/wifi/SiWx/WifiInterfaceImpl.cpp

@@ -372,7 +372,10 @@ sl_status_t SetWifiConfigurations()
     VerifyOrReturnError(status == SL_STATUS_OK, status,
                         ChipLogError(DeviceLayer, "sl_wifi_set_listen_interval failed: 0x%lx", status));
 
-    sl_wifi_advanced_client_configuration_t client_config = { .max_retry_attempts = 5 };
+    // This is be triggered on the disconnect use case, providing the amount of TA tries
+    // Setting the TA retry to 1 and giving the control to the M4 for improved power efficiency
+    // When max_retry_attempts is set to 0, TA will retry indefinitely.
+    sl_wifi_advanced_client_configuration_t client_config = { .max_retry_attempts = 1 };
     status = sl_wifi_set_advanced_client_configuration(SL_WIFI_CLIENT_INTERFACE, &client_config);
     VerifyOrReturnError(status == SL_STATUS_OK, status,
                         ChipLogError(DeviceLayer, "sl_wifi_set_advanced_client_configuration failed: 0x%lx", status));
@@ -490,10 +493,6 @@ CHIP_ERROR WifiInterfaceImpl::InitWiFiStack(void)
     sWifiEventQueue = osMessageQueueNew(kWfxQueueSize, sizeof(WiseconnectWifiInterface::WifiPlatformEvent), nullptr);
     VerifyOrReturnError(sWifiEventQueue != nullptr, CHIP_ERROR_NO_MEMORY);
 
-    status = CreateDHCPTimer();
-    VerifyOrReturnError(status == SL_STATUS_OK, CHIP_ERROR_NO_MEMORY,
-                        ChipLogError(DeviceLayer, "CreateDHCPTimer failed: %lx", status));
-
     return CHIP_NO_ERROR;
 }
 
@@ -504,7 +503,7 @@ void WifiInterfaceImpl::ProcessEvent(WiseconnectWifiInterface::WifiPlatformEvent
     case WiseconnectWifiInterface::WifiPlatformEvent::kStationConnect:
         ChipLogDetail(DeviceLayer, "WifiPlatformEvent::kStationConnect");
         wfx_rsi.dev_state.Set(WifiInterface::WifiState::kStationConnected);
-        ResetDHCPNotificationFlags();
+        ResetConnectivityNotificationFlags();
         break;
 
     case WiseconnectWifiInterface::WifiPlatformEvent::kStationDisconnect: {
@@ -513,11 +512,10 @@ void WifiInterfaceImpl::ProcessEvent(WiseconnectWifiInterface::WifiPlatformEvent
 
         wfx_rsi.dev_state.Clear(WifiInterface::WifiState::kStationReady)
             .Clear(WifiInterface::WifiState::kStationConnecting)
-            .Clear(WifiInterface::WifiState::kStationConnected)
-            .Clear(WifiInterface::WifiState::kStationDhcpDone);
+            .Clear(WifiInterface::WifiState::kStationConnected);
 
         // TODO: Implement disconnect notify
-        ResetDHCPNotificationFlags();
+        ResetConnectivityNotificationFlags();
 #if (CHIP_DEVICE_CONFIG_ENABLE_IPV4)
         NotifyIPv4Change(false);
 #endif /* CHIP_DEVICE_CONFIG_ENABLE_IPV4 */
@@ -595,61 +593,29 @@ void WifiInterfaceImpl::ProcessEvent(WiseconnectWifiInterface::WifiPlatformEvent
         JoinWifiNetwork();
         break;
 
-    case WiseconnectWifiInterface::WifiPlatformEvent::kStationDoDhcp:
-        ChipLogDetail(DeviceLayer, "WifiPlatformEvent::kStationDoDhcp");
-        StartDHCPTimer(kDhcpPollIntervalMs);
-        break;
-
-    case WiseconnectWifiInterface::WifiPlatformEvent::kStationDhcpDone:
-        ChipLogDetail(DeviceLayer, "WifiPlatformEvent::kStationDhcpDone");
-        CancelDHCPTimer();
-        break;
-
-    case WiseconnectWifiInterface::WifiPlatformEvent::kStationDhcpPoll:
-        ChipLogDetail(DeviceLayer, "WifiPlatformEvent::kStationDhcpPoll");
-        HandleDHCPPolling();
-        break;
+    case WiseconnectWifiInterface::WifiPlatformEvent::kConnectionComplete:
+        ChipLogDetail(DeviceLayer, "WifiPlatformEvent::kConnectionComplete");
+        NotifySuccessfulConnection();
 
     default:
         break;
     }
 }
 
-void WifiInterfaceImpl::HandleDHCPPolling(void)
+void WifiInterfaceImpl::NotifySuccessfulConnection(void)
 {
-    WiseconnectWifiInterface::WifiPlatformEvent event;
-
-    // TODO: Notify the application that the interface is not set up or Chipdie here because we are in an unkonwn state
     struct netif * sta_netif = &wifi_client_context.netif;
-    VerifyOrReturn(sta_netif != nullptr, ChipLogError(DeviceLayer, "HandleDHCPPolling: failed to get STA netif"));
+    VerifyOrReturn(sta_netif != nullptr, ChipLogError(DeviceLayer, "NotifySuccessfulConnection: failed to get STA netif"));
 
 #if (CHIP_DEVICE_CONFIG_ENABLE_IPV4)
-    uint8_t dhcp_state = dhcpclient_poll(sta_netif);
-    if (dhcp_state == DHCP_ADDRESS_ASSIGNED && !mHasNotifiedIPv4)
-    {
-        GotIPv4Address((uint32_t) sta_netif->ip_addr.u_addr.ip4.addr);
-        event = WiseconnectWifiInterface::WifiPlatformEvent::kStationDhcpDone;
-        WiseconnectWifiInterface::PostWifiPlatformEvent(event);
-        NotifyConnectivity();
-    }
-    else if (dhcp_state == DHCP_OFF)
-    {
-        NotifyIPv4Change(false);
-    }
+    GotIPv4Address((uint32_t) sta_netif->ip_addr.u_addr.ip4.addr);
 #endif /* CHIP_DEVICE_CONFIG_ENABLE_IPV4 */
-    /* Checks if the assigned IPv6 address is preferred by evaluating
-     * the first block of IPv6 address ( block 0)
-     */
-    if ((ip6_addr_ispreferred(netif_ip6_addr_state(sta_netif, 0))) && !mHasNotifiedIPv6)
-    {
-        char addrStr[chip::Inet::IPAddress::kMaxStringLength] = { 0 };
-        VerifyOrReturn(ip6addr_ntoa_r(netif_ip6_addr(sta_netif, 0), addrStr, sizeof(addrStr)) != nullptr);
-        ChipLogProgress(DeviceLayer, "SLAAC OK: linklocal addr: %s", addrStr);
-        NotifyIPv6Change(true);
-        event = WiseconnectWifiInterface::WifiPlatformEvent::kStationDhcpDone;
-        PostWifiPlatformEvent(event);
-        NotifyConnectivity();
-    }
+
+    char addrStr[chip::Inet::IPAddress::kMaxStringLength] = { 0 };
+    VerifyOrReturn(ip6addr_ntoa_r(netif_ip6_addr(sta_netif, 0), addrStr, sizeof(addrStr)) != nullptr);
+    ChipLogProgress(DeviceLayer, "SLAAC OK: linklocal addr: %s", addrStr);
+    NotifyIPv6Change(true);
+    NotifyConnectivity();
 }
 
 sl_status_t WifiInterfaceImpl::JoinWifiNetwork(void)

src/platform/silabs/wifi/SiWx/WifiInterfaceImpl.h

@@ -97,10 +97,10 @@ class WifiInterfaceImpl final : public WiseconnectWifiInterface
     sl_status_t JoinWifiNetwork();
 
     /**
-     * @brief Processing function responsible of executing the DHCP polling operation until we have an IPv6 or IPv4 address
+     * @brief Processing function responsible for notifying the upper layers of a succesful connection attempt.
      *
      */
-    void HandleDHCPPolling();
+    void NotifySuccessfulConnection();
 
     static WifiInterfaceImpl mInstance;
 };

src/platform/silabs/wifi/SiWx/ncp/rs9117.gni

@@ -43,9 +43,6 @@ rs9117_src_sapi = [
   "${wifi_sdk_root}/components/device/silabs/si91x/wireless/ncp_interface/spi/sl_si91x_spi.c",
   "${wifi_sdk_root}/components/device/silabs/si91x/wireless/ncp_interface/sl_si91x_ncp_driver.c",
 
-  # Wi-Fi Config - Using the file sdk support until the wiseconnect file is fixed
-  "${matter_support_root}/sdk-copies/components/service/network_manager/src/sl_net_for_lwip.c",
-
   # wifi component
   "${wifi_sdk_root}/components/protocol/wifi/src/sl_wifi_basic_credentials.c",
   "${wifi_sdk_root}/components/protocol/wifi/src/sl_wifi_callback_framework.c",
@@ -54,6 +51,7 @@ rs9117_src_sapi = [
   # basic_network_manager component
   "${wifi_sdk_root}/components/service/network_manager/src/sl_net_credentials.c",
   "${wifi_sdk_root}/components/service/network_manager/src/sl_net_basic_profiles.c",
+  "${wifi_sdk_root}/components/service/network_manager/src/sl_net_for_lwip.c",
 
   # si91x_basic_buffers component
   "${wifi_sdk_root}/components/device/silabs/si91x/wireless/memory/malloc_buffers.c",

src/platform/silabs/wifi/rs911x/WifiInterfaceImpl.cpp

@@ -72,6 +72,9 @@ osThreadAttr_t kDrvTaskAttr = { .name       = "drv_rsi",
 
 osMessageQueueId_t sWifiEventQueue = NULL;
 
+//  DHCP Polling interval for the IPv4/IPv6
+constexpr uint32_t kDhcpPollIntervalMs = 250;
+
 uint8_t wfx_rsi_drv_buf[WFX_RSI_BUF_SZ];
 wfx_wifi_scan_ext_t temp_reset;
 
@@ -314,7 +317,7 @@ void WifiInterfaceImpl::ProcessEvent(WifiPlatformEvent event)
     case WiseconnectWifiInterface::WifiPlatformEvent::kStationConnect: {
         ChipLogDetail(DeviceLayer, "WiseconnectWifiInterface::WifiPlatformEvent::kStationConnect");
         wfx_rsi.dev_state.Set(WifiInterface::WifiState::kStationConnected);
-        ResetDHCPNotificationFlags();
+        ResetConnectivityNotificationFlags();
         chip::DeviceLayer::Silabs::Lwip::SetLwipStationLinkUp();
     }
     break;
@@ -327,7 +330,7 @@ void WifiInterfaceImpl::ProcessEvent(WifiPlatformEvent event)
             .Clear(WifiInterface::WifiState::kStationDhcpDone);
 
         /* TODO: Implement disconnect notify */
-        ResetDHCPNotificationFlags();
+        ResetConnectivityNotificationFlags();
         chip::DeviceLayer::Silabs::Lwip::SetLwipStationLinkDown();
 
 #if (CHIP_DEVICE_CONFIG_ENABLE_IPV4)
@@ -404,7 +407,7 @@ void WifiInterfaceImpl::ProcessEvent(WifiPlatformEvent event)
         JoinWifiNetwork();
     }
     break;
-    case WiseconnectWifiInterface::WifiPlatformEvent::kStationDoDhcp: {
+    case WiseconnectWifiInterface::WifiPlatformEvent::kConnectionComplete: {
         StartDHCPTimer(kDhcpPollIntervalMs);
     }
     break;
@@ -606,6 +609,36 @@ void WifiInterfaceImpl::JoinWifiNetwork(void)
     }
 }
 
+void WifiInterfaceImpl::DHCPTimerEventHandler(void * arg)
+{
+    WifiPlatformEvent event = WiseconnectWifiInterface::WifiPlatformEvent::kStationDhcpPoll;
+    WifiInterfaceImpl::GetInstance().PostWifiPlatformEvent(event);
+}
+
+void WifiInterfaceImpl::CancelDHCPTimer(void)
+{
+    VerifyOrReturn(osTimerIsRunning(mDHCPTimer), ChipLogDetail(DeviceLayer, "CancelDHCPTimer: timer not running"));
+    VerifyOrReturn(osTimerStop(mDHCPTimer) == osOK, ChipLogError(DeviceLayer, "CancelDHCPTimer: failed to stop timer"));
+}
+
+void WifiInterfaceImpl::StartDHCPTimer(uint32_t timeout)
+{
+    // Cancel timer if already started
+    CancelDHCPTimer();
+
+    VerifyOrReturn(osTimerStart(mDHCPTimer, pdMS_TO_TICKS(timeout)) == osOK,
+                   ChipLogError(DeviceLayer, "StartDHCPTimer: failed to start timer"));
+}
+
+sl_status_t WifiInterfaceImpl::CreateDHCPTimer()
+{
+    // TODO: Use LWIP timer instead of creating a new one here
+    mDHCPTimer = osTimerNew(DHCPTimerEventHandler, osTimerPeriodic, nullptr, nullptr);
+    VerifyOrReturnError(mDHCPTimer != nullptr, SL_STATUS_ALLOCATION_FAILED);
+
+    return SL_STATUS_OK;
+}
+
 void WifiInterfaceImpl::HandleDHCPPolling(void)
 {
     struct netif * sta_netif;

src/platform/silabs/wifi/rs911x/WifiInterfaceImpl.h

@@ -103,6 +103,35 @@ class WifiInterfaceImpl final : public WiseconnectWifiInterface
      */
     void HandleDHCPPolling();
 
+    /**
+     * @brief Function cancels the DHCP timer if it is running.
+     *        If the timer isn't running, function doesn't do anything.
+     */
+    void CancelDHCPTimer();
+
+    /**
+     * @brief Function starts the DHCP timer with the given timeout.
+     *
+     * TODO: change input to milliseconds type
+     *
+     * @param timeout timer duration in milliseconds
+     */
+    void StartDHCPTimer(uint32_t timeout);
+
+    /**
+     * @brief Function creates the DHCP timer
+     *
+     *
+     * @return sl_status_t SL_STATUS_OK, the timer was successfully created
+     */
+    sl_status_t CreateDHCPTimer();
+
+    /**
+     * @brief Callback function for the DHCP timer event.
+     */
+    static void DHCPTimerEventHandler(void * arg);
+
+    osTimerId_t mDHCPTimer;
     static WifiInterfaceImpl mInstance;
 };
 

src/platform/silabs/wifi/wiseconnect-interface/WiseconnectWifiInterface.cpp

@@ -128,27 +128,6 @@ CHIP_ERROR WiseconnectWifiInterface::TriggerDisconnection()
     return CHIP_NO_ERROR;
 }
 
-void WiseconnectWifiInterface::DHCPTimerEventHandler(void * arg)
-{
-    WifiPlatformEvent event = WifiPlatformEvent::kStationDhcpPoll;
-    WiseconnectWifiInterface::GetInstance().PostWifiPlatformEvent(event);
-}
-
-void WiseconnectWifiInterface::CancelDHCPTimer(void)
-{
-    VerifyOrReturn(osTimerIsRunning(mDHCPTimer), ChipLogDetail(DeviceLayer, "CancelDHCPTimer: timer not running"));
-    VerifyOrReturn(osTimerStop(mDHCPTimer) == osOK, ChipLogError(DeviceLayer, "CancelDHCPTimer: failed to stop timer"));
-}
-
-void WiseconnectWifiInterface::StartDHCPTimer(uint32_t timeout)
-{
-    // Cancel timer if already started
-    CancelDHCPTimer();
-
-    VerifyOrReturn(osTimerStart(mDHCPTimer, pdMS_TO_TICKS(timeout)) == osOK,
-                   ChipLogError(DeviceLayer, "StartDHCPTimer: failed to start timer"));
-}
-
 void WiseconnectWifiInterface::NotifyConnectivity(void)
 {
     VerifyOrReturn(!mHasNotifiedWifiConnectivity);
@@ -157,22 +136,13 @@ void WiseconnectWifiInterface::NotifyConnectivity(void)
     mHasNotifiedWifiConnectivity = true;
 }
 
-sl_status_t WiseconnectWifiInterface::CreateDHCPTimer()
-{
-    // TODO: Use LWIP timer instead of creating a new one here
-    mDHCPTimer = osTimerNew(DHCPTimerEventHandler, osTimerPeriodic, nullptr, nullptr);
-    VerifyOrReturnError(mDHCPTimer != nullptr, SL_STATUS_ALLOCATION_FAILED);
-
-    return SL_STATUS_OK;
-}
-
-void WiseconnectWifiInterface::ResetDHCPNotificationFlags(void)
+void WiseconnectWifiInterface::ResetConnectivityNotificationFlags(void)
 {
 
     ResetIPNotificationStates();
     mHasNotifiedWifiConnectivity = false;
 
-    WifiPlatformEvent event = WifiPlatformEvent::kStationDoDhcp;
+    WifiPlatformEvent event = WifiPlatformEvent::kConnectionComplete;
     PostWifiPlatformEvent(event);
 }