From b53dd6ed3d113dafa829a51ca9824b54cf89b914 Mon Sep 17 00:00:00 2001
From: chbansal <chirag.bansal@silabs.com>
Date: Mon, 8 Jul 2024 09:40:18 +0530
Subject: [PATCH 01/18] Modifying the retry logic for the wifi devices

---
 examples/platform/silabs/BaseApplication.h    |   5 +-
 .../silabs/SiWx917/SiWx917/sl_wifi_if.cpp     |  18 +--
 .../platform/silabs/efr32/rs911x/rsi_if.c     |  39 +-----
 .../platform/silabs/efr32/wf200/host_if.cpp   |  24 +---
 examples/platform/silabs/wfx_rsi.h            |   1 -
 .../platform/silabs}/wifi/wfx_notify.cpp      | 130 ++++++++----------
 .../silabs/SiWx917/wifi/wfx_host_events.h     |   4 +-
 .../silabs/efr32/wifi/wfx_host_events.h       |   9 +-
 8 files changed, 85 insertions(+), 145 deletions(-)
 rename {src/platform/silabs/SiWx917 => examples/platform/silabs}/wifi/wfx_notify.cpp (66%)

diff --git a/examples/platform/silabs/BaseApplication.h b/examples/platform/silabs/BaseApplication.h
index 8a231aa6c51513..9dc34e015ef193 100644
--- a/examples/platform/silabs/BaseApplication.h
+++ b/examples/platform/silabs/BaseApplication.h
@@ -65,8 +65,11 @@
 #if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI917
 class BaseApplicationDelegate : public AppDelegate
 {
+public:
+    bool isCommissioningInProgress() { return isComissioningStarted; }
 private:
-    bool isComissioningStarted;
+    // AppDelegate
+    bool isComissioningStarted = false;
     void OnCommissioningSessionStarted() override;
     void OnCommissioningSessionStopped() override;
     void OnCommissioningWindowClosed() override;
diff --git a/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.cpp b/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.cpp
index 59bf52bbc0f30f..3ca60c74f8ad75 100644
--- a/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.cpp
+++ b/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.cpp
@@ -92,11 +92,6 @@ bool hasNotifiedIPV4 = false;
 #endif /* CHIP_DEVICE_CONFIG_ENABLE_IPV4 */
 bool hasNotifiedWifiConnectivity = false;
 
-/* Declare a flag to differentiate between after boot-up first IP connection or reconnection */
-bool is_wifi_disconnection_event = false;
-
-/* Declare a variable to hold connection time intervals */
-uint32_t retryInterval                 = WLAN_MIN_RETRY_TIMER_MS;
 volatile bool scan_results_complete    = false;
 volatile bool bg_scan_results_complete = false;
 
@@ -249,12 +244,7 @@ sl_status_t join_callback_handler(sl_wifi_event_t event, char * result, uint32_t
         callback_status = *(sl_status_t *) result;
         ChipLogError(DeviceLayer, "join_callback_handler: failed: 0x%lx", static_cast<uint32_t>(callback_status));
         wfx_rsi.dev_state &= ~(WFX_RSI_ST_STA_CONNECTED);
-        wfx_retry_interval_handler(is_wifi_disconnection_event, wfx_rsi.join_retries++);
-        if (is_wifi_disconnection_event || wfx_rsi.join_retries <= WFX_RSI_CONFIG_MAX_JOIN)
-        {
-            WfxEvent.eventType = WFX_EVT_STA_START_JOIN;
-            WfxPostEvent(&WfxEvent);
-        }
+        wfx_retry_connection(++wfx_rsi.join_retries);
         return SL_STATUS_FAIL;
     }
     /*
@@ -266,9 +256,6 @@ sl_status_t join_callback_handler(sl_wifi_event_t event, char * result, uint32_t
     WfxEvent.eventType = WFX_EVT_STA_CONN;
     WfxPostEvent(&WfxEvent);
     wfx_rsi.join_retries = 0;
-    retryInterval        = WLAN_MIN_RETRY_TIMER_MS;
-    // Once the join passes setting the disconnection event to true to differentiate between the first connection and reconnection
-    is_wifi_disconnection_event = true;
     callback_status             = SL_STATUS_OK;
     return SL_STATUS_OK;
 }
@@ -698,8 +685,7 @@ static sl_status_t wfx_rsi_do_join(void)
 
     wfx_rsi.dev_state &= ~(WFX_RSI_ST_STA_CONNECTING | WFX_RSI_ST_STA_CONNECTED);
     ChipLogProgress(DeviceLayer, "wfx_rsi_do_join: retry attempt %d", wfx_rsi.join_retries);
-    wfx_retry_interval_handler(is_wifi_disconnection_event, wfx_rsi.join_retries);
-    wfx_rsi.join_retries++;
+    wfx_retry_connection(++wfx_rsi.join_retries);
     event.eventType = WFX_EVT_STA_START_JOIN;
     WfxPostEvent(&event);
     return status;
diff --git a/examples/platform/silabs/efr32/rs911x/rsi_if.c b/examples/platform/silabs/efr32/rs911x/rsi_if.c
index a08e2a2f292de1..2d82919fd00849 100644
--- a/examples/platform/silabs/efr32/rs911x/rsi_if.c
+++ b/examples/platform/silabs/efr32/rs911x/rsi_if.c
@@ -70,12 +70,6 @@ bool hasNotifiedIPV4 = false;
 #endif /* CHIP_DEVICE_CONFIG_ENABLE_IPV4 */
 bool hasNotifiedWifiConnectivity = false;
 
-/* Declare a flag to differentiate between after boot-up first IP connection or reconnection */
-bool is_wifi_disconnection_event = false;
-
-/* Declare a variable to hold connection time intervals */
-uint32_t retryInterval = WLAN_MIN_RETRY_TIMER_MS;
-
 #if (RSI_BLE_ENABLE)
 extern rsi_semaphore_handle_t sl_rs_ble_init_sem;
 #endif
@@ -280,12 +274,7 @@ static void wfx_rsi_join_cb(uint16_t status, const uint8_t * buf, const uint16_t
          * We should enable retry.. (Need config variable for this)
          */
         SILABS_LOG("%s: failed. retry: %d", __func__, wfx_rsi.join_retries);
-        wfx_retry_interval_handler(is_wifi_disconnection_event, wfx_rsi.join_retries++);
-        if (is_wifi_disconnection_event || wfx_rsi.join_retries <= WFX_RSI_CONFIG_MAX_JOIN)
-        {
-            WfxEvent.eventType = WFX_EVT_STA_START_JOIN;
-            WfxPostEvent(&WfxEvent);
-        }
+        wfx_retry_connection(++wfx_rsi.join_retries);
     }
     else
     {
@@ -297,7 +286,6 @@ static void wfx_rsi_join_cb(uint16_t status, const uint8_t * buf, const uint16_t
         WfxEvent.eventType = WFX_EVT_STA_CONN;
         WfxPostEvent(&WfxEvent);
         wfx_rsi.join_retries = 0;
-        retryInterval        = WLAN_MIN_RETRY_TIMER_MS;
     }
 }
 
@@ -317,7 +305,6 @@ static void wfx_rsi_join_fail_cb(uint16_t status, uint8_t * buf, uint32_t len)
     WfxEvent_t WfxEvent;
     wfx_rsi.join_retries += 1;
     wfx_rsi.dev_state &= ~(WFX_RSI_ST_STA_CONNECTING | WFX_RSI_ST_STA_CONNECTED);
-    is_wifi_disconnection_event = true;
     WfxEvent.eventType          = WFX_EVT_STA_START_JOIN;
     WfxPostEvent(&WfxEvent);
 }
@@ -586,27 +573,15 @@ static void wfx_rsi_do_join(void)
         /* Try to connect Wifi with given Credentials
          * untill there is a success or maximum number of tries allowed
          */
-        while (is_wifi_disconnection_event || wfx_rsi.join_retries <= WFX_RSI_CONFIG_MAX_JOIN)
+        if ((status = rsi_wlan_connect_async((int8_t *) &wfx_rsi.sec.ssid[0], connect_security_mode, &wfx_rsi.sec.passkey[0],
+                                             wfx_rsi_join_cb)) != RSI_SUCCESS)
         {
-            /* Call rsi connect call with given ssid and password
-             * And check there is a success
-             */
-            if ((status = rsi_wlan_connect_async((int8_t *) &wfx_rsi.sec.ssid[0], connect_security_mode, &wfx_rsi.sec.passkey[0],
-                                                 wfx_rsi_join_cb)) != RSI_SUCCESS)
-            {
-
-                wfx_rsi.dev_state &= ~WFX_RSI_ST_STA_CONNECTING;
-                SILABS_LOG("%s: rsi_wlan_connect_async failed with status: %02x on try %d", __func__, status, wfx_rsi.join_retries);
-
-                wfx_retry_interval_handler(is_wifi_disconnection_event, wfx_rsi.join_retries);
-                wfx_rsi.join_retries++;
-            }
-            else
-            {
+            wfx_rsi.dev_state &= ~WFX_RSI_ST_STA_CONNECTING;
+            SILABS_LOG("%s: rsi_wlan_connect_async failed with status: %02x on try %d", __func__, status, wfx_rsi.join_retries);
+            wfx_retry_connection(++wfx_rsi.join_retries);
+        } else {
                 SILABS_LOG("%s: starting JOIN to %s after %d tries\n", __func__, (char *) &wfx_rsi.sec.ssid[0],
                            wfx_rsi.join_retries);
-                break; // exit while loop
-            }
         }
     }
 }
diff --git a/examples/platform/silabs/efr32/wf200/host_if.cpp b/examples/platform/silabs/efr32/wf200/host_if.cpp
index ac3ad07773d9d3..f06b8a779b0822 100644
--- a/examples/platform/silabs/efr32/wf200/host_if.cpp
+++ b/examples/platform/silabs/efr32/wf200/host_if.cpp
@@ -99,12 +99,6 @@ bool hasNotifiedWifiConnectivity = false;
 static uint8_t retryJoin         = 0;
 bool retryInProgress             = false;
 
-/* Declare a flag to differentiate between after boot-up first IP connection or reconnection */
-bool is_wifi_disconnection_event = false;
-
-/* Declare a variable to hold connection time intervals */
-uint32_t retryInterval = WLAN_MIN_RETRY_TIMER_MS;
-
 #ifdef SL_WFX_CONFIG_SCAN
 static struct scan_result_holder
 {
@@ -401,14 +395,14 @@ static void sl_wfx_connect_callback(sl_wfx_connect_ind_body_t connect_indication
     }
     }
 
-    if ((status != WFM_STATUS_SUCCESS) && (!is_wifi_disconnection_event ? (retryJoin < MAX_JOIN_RETRIES_COUNT) : true))
+    if (status != WFM_STATUS_SUCCESS)
     {
         retryJoin += 1;
         retryInProgress = false;
         SILABS_LOG("WFX Retry to connect to network count: %d", retryJoin);
         sl_wfx_context->state =
             static_cast<sl_wfx_state_t>(static_cast<int>(sl_wfx_context->state) & ~static_cast<int>(SL_WFX_STARTED));
-        xEventGroupSetBits(sl_wfx_event_group, SL_WFX_RETRY_CONNECT);
+        wfx_retry_connection(retryJoin);
     }
 }
 
@@ -425,8 +419,7 @@ static void sl_wfx_disconnect_callback(uint8_t * mac, uint16_t reason)
     sl_wfx_context->state =
         static_cast<sl_wfx_state_t>(static_cast<int>(sl_wfx_context->state) & ~static_cast<int>(SL_WFX_STA_INTERFACE_CONNECTED));
     retryInProgress             = false;
-    is_wifi_disconnection_event = true;
-    xEventGroupSetBits(sl_wfx_event_group, SL_WFX_RETRY_CONNECT);
+    wfx_retry_connection(retryJoin);
 }
 
 #ifdef SL_WFX_CONFIG_SOFTAP
@@ -541,13 +534,8 @@ static void wfx_events_task(void * p_arg)
                                     pdTRUE, pdFALSE, pdMS_TO_TICKS(250)); /* 250 msec delay converted to ticks */
         if (flags & SL_WFX_RETRY_CONNECT)
         {
-            if (!retryInProgress)
-            {
-                retryInProgress = true;
-                wfx_retry_interval_handler(is_wifi_disconnection_event, retryJoin);
-                SILABS_LOG("WFX sending the connect command");
-                wfx_connect_to_ap();
-            }
+            SILABS_LOG("WFX sending the connect command");
+            wfx_connect_to_ap();
         }
 
         if (wifi_extra & WE_ST_STA_CONN)
@@ -600,7 +588,6 @@ static void wfx_events_task(void * p_arg)
             SILABS_LOG("WIFI: Connected to AP");
             wifi_extra |= WE_ST_STA_CONN;
             retryJoin     = 0;
-            retryInterval = WLAN_MIN_RETRY_TIMER_MS;
             wfx_lwip_set_sta_link_up();
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
             if (!(wfx_get_wifi_state() & SL_WFX_AP_INTERFACE_UP))
@@ -750,6 +737,7 @@ static void wfx_wifi_hw_start(void)
         /* Initialize the LwIP stack */
         SILABS_LOG("WF200:Start LWIP");
         wfx_lwip_start();
+        wfx_started_notify();
         wifiContext.state = SL_WFX_STARTED; /* Really this is a bit mask */
         SILABS_LOG("WF200:ready..");
     }
diff --git a/examples/platform/silabs/wfx_rsi.h b/examples/platform/silabs/wfx_rsi.h
index c47a4ee0af251e..6d996924857ad0 100644
--- a/examples/platform/silabs/wfx_rsi.h
+++ b/examples/platform/silabs/wfx_rsi.h
@@ -31,7 +31,6 @@
 #define WFX_RSI_WLAN_TASK_SZ (1024 + 512 + 256) /* Stack for the WLAN task	 	*/
 #define WFX_RSI_TASK_SZ (1024 + 1024)           /* Stack for the WFX/RSI task		*/
 #define WFX_RSI_BUF_SZ (1024 * 10)              /* May need tweak 			*/
-#define WFX_RSI_CONFIG_MAX_JOIN (5)             /* Max join retries			*/
 // TODO: Default values are usually in minutes, but this is in ms. Confirm if this is correct
 #define WFX_RSI_DHCP_POLL_INTERVAL (250) /* Poll interval in ms for DHCP		*/
 #define WFX_RSI_NUM_TIMERS (2)           /* Number of RSI timers to alloc	*/
diff --git a/src/platform/silabs/SiWx917/wifi/wfx_notify.cpp b/examples/platform/silabs/wifi/wfx_notify.cpp
similarity index 66%
rename from src/platform/silabs/SiWx917/wifi/wfx_notify.cpp
rename to examples/platform/silabs/wifi/wfx_notify.cpp
index ded8e8389d256d..403c27522a05fc 100644
--- a/src/platform/silabs/SiWx917/wifi/wfx_notify.cpp
+++ b/examples/platform/silabs/wifi/wfx_notify.cpp
@@ -19,6 +19,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "AppConfig.h"
+#include "BaseApplication.h"
+
 #include "FreeRTOS.h"
 #include "event_groups.h"
 #include "silabs_utils.h"
@@ -29,32 +32,28 @@
 #include "wfx_rsi.h"
 #endif
 
-#if SL_ICD_ENABLED
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif // SL_ICD_ENABLED
-
 #include <platform/CHIPDeviceLayer.h>
-// #include <app/server/Mdns.h>
-#include <app/server/Dnssd.h>
-#include <app/server/Server.h>
 
 using namespace ::chip;
 using namespace ::chip::DeviceLayer;
 
-#include <lib/support/logging/CHIPLogging.h>
-
-extern uint32_t retryInterval;
+static uint16_t retryInterval = WLAN_MIN_RETRY_TIMER_MS;
+static osTimerId_t sRetryTimer;
 /*
  * Notifications to the upper-layer
  * All done in the context of the RSI/WiFi task (rsi_if.c)
  */
 
+static void RetryConnectionTimerHandler(void * arg)
+{
+#if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI91X_MCU_INTERFACE
+    // TODO: remove this once it is fixed in the wifi sdk SI91X-15845
+    wfx_rsi_power_save(RSI_ACTIVE, HIGH_PERFORMANCE);
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI91X_MCU_INTERFACE
+    if (wfx_connect_to_ap() != SL_STATUS_OK) {
+        ChipLogError(DeviceLayer, "wfx_connect_to_ap() failed.");
+    }
+}
 /***********************************************************************************
  * @fn  wfx_started_notify()
  * @brief
@@ -67,6 +66,15 @@ void wfx_started_notify()
     sl_wfx_startup_ind_t evt;
     sl_wfx_mac_address_t mac;
 
+    // Creating a timer which will be used to retry connection with AP
+    sRetryTimer = osTimerNew(RetryConnectionTimerHandler, osTimerOnce, NULL, NULL);
+    if (sRetryTimer == NULL)
+    {
+        return;
+    }
+
+    ChipLogProgress(DeviceLayer,"wfx_started_notify: started.");
+
     memset(&evt, 0, sizeof(evt));
     evt.header.id     = SL_WFX_STARTUP_IND_ID;
     evt.header.length = sizeof evt;
@@ -90,13 +98,15 @@ void wfx_connected_notify(int32_t status, sl_wfx_mac_address_t * ap)
 {
     sl_wfx_connect_ind_t evt;
 
+    ChipLogProgress(DeviceLayer,"wfx_connected_notify : started.");
+
     if (status != SUCCESS_STATUS)
     {
-        ChipLogProgress(DeviceLayer, "%s: error: failed status: %ld.", __func__, status);
+        ChipLogProgress(DeviceLayer,"wfx_connected_notify : error: failed status: %ld.", status);
         return;
     }
 
-    ChipLogProgress(DeviceLayer, "%s: connected.", __func__);
+    ChipLogProgress(DeviceLayer,"wfx_connected_notify : connected.");
 
     memset(&evt, 0, sizeof(evt));
     evt.header.id     = SL_WFX_CONNECT_IND_ID;
@@ -121,6 +131,8 @@ void wfx_disconnected_notify(int32_t status)
 {
     sl_wfx_disconnect_ind_t evt;
 
+    ChipLogProgress(DeviceLayer,"wfx_disconnected_notify: started.");
+
     memset(&evt, 0, sizeof(evt));
     evt.header.id     = SL_WFX_DISCONNECT_IND_ID;
     evt.header.length = sizeof evt;
@@ -139,20 +151,12 @@ void wfx_ipv6_notify(int got_ip)
 {
     sl_wfx_generic_message_t eventData;
 
+    ChipLogProgress(DeviceLayer,"wfx_ipv6_notify: started.");
+
     memset(&eventData, 0, sizeof(eventData));
     eventData.header.id     = got_ip ? IP_EVENT_GOT_IP6 : IP_EVENT_STA_LOST_IP;
     eventData.header.length = sizeof(eventData.header);
     PlatformMgrImpl().HandleWFXSystemEvent(IP_EVENT, &eventData);
-
-    /* So the other threads can run and have the connectivity OK */
-    if (got_ip)
-    {
-        /* Should remember this */
-        vTaskDelay(1);
-        chip::DeviceLayer::PlatformMgr().LockChipStack();
-        chip::app::DnssdServer::Instance().StartServer(/*Dnssd::CommissioningMode::kEnabledBasic*/);
-        chip::DeviceLayer::PlatformMgr().UnlockChipStack();
-    }
 }
 
 /**************************************************************************************
@@ -166,57 +170,38 @@ void wfx_ip_changed_notify(int got_ip)
 {
     sl_wfx_generic_message_t eventData;
 
+    ChipLogProgress(DeviceLayer,"wfx_ip_changed_notify: started.");
+
     memset(&eventData, 0, sizeof(eventData));
     eventData.header.id     = got_ip ? IP_EVENT_STA_GOT_IP : IP_EVENT_STA_LOST_IP;
     eventData.header.length = sizeof(eventData.header);
     PlatformMgrImpl().HandleWFXSystemEvent(IP_EVENT, &eventData);
-
-    /* So the other threads can run and have the connectivity OK */
-    if (got_ip)
-    {
-        /* Should remember this */
-        vTaskDelay(1);
-        chip::DeviceLayer::PlatformMgr().LockChipStack();
-        chip::app::DnssdServer::Instance().StartServer(/*Dnssd::CommissioningMode::kEnabledBasic*/);
-        chip::DeviceLayer::PlatformMgr().UnlockChipStack();
-    }
 }
 
 /**************************************************************************************
- * @fn  void wfx_retry_interval_handler(bool is_wifi_disconnection_event, uint16_t retryJoin)
+ * @fn  void wfx_retry_connection(uint16_t retryAttempt)
  * @brief
- *      Based on condition will delay for a certain period of time.
- * @param[in]  is_wifi_disconnection_event, retryJoin
+ *      During commissioning, we retry to join the network MAX_JOIN_RETRIES_COUNT times.
+ *      If DUT is disconnected from the AP or device is power cycled, then retry connection
+ *      with AP continously after a certain time interval.
+ * @param[in]  retryAttempt
  * @return None
  ********************************************************************************************/
-void wfx_retry_interval_handler(bool is_wifi_disconnection_event, uint16_t retryJoin)
+void wfx_retry_connection(uint16_t retryAttempt)
 {
-    if (!is_wifi_disconnection_event)
-    {
-        /* After the reboot or a commissioning time device failed to connect with AP.
-         * Device will retry to connect with AP upto WFX_RSI_CONFIG_MAX_JOIN retries.
-         */
-        if (retryJoin < MAX_JOIN_RETRIES_COUNT)
-        {
-            ChipLogProgress(DeviceLayer, "wfx_retry_interval_handler : Next attempt after %d Seconds",
-                            CONVERT_MS_TO_SEC(WLAN_RETRY_TIMER_MS));
-#if SL_ICD_ENABLED
-            // TODO: cleanup the retry logic MATTER-1921
-            if (!chip::Server::GetInstance().GetCommissioningWindowManager().IsCommissioningWindowOpen())
-            {
-                wfx_rsi_power_save(RSI_SLEEP_MODE_8, STANDBY_POWER_SAVE_WITH_RAM_RETENTION);
+    // During commissioning, we retry to join the network MAX_JOIN_RETRIES_COUNT
+    if(BaseApplication::sAppDelegate.isCommissioningInProgress()) {
+        if(retryAttempt < MAX_JOIN_RETRIES_COUNT) {
+            ChipLogProgress(DeviceLayer,"wfx_retry_connection : Next attempt after %d Seconds", CONVERT_MS_TO_SEC(WLAN_RETRY_TIMER_MS));
+            if (osTimerStart(sRetryTimer, pdMS_TO_TICKS(WLAN_RETRY_TIMER_MS)) != osOK) {
+                ChipLogProgress(DeviceLayer,"Failed to start retry timer");
+                return;
             }
-#endif // SL_ICD_ENABLED
-            vTaskDelay(pdMS_TO_TICKS(WLAN_RETRY_TIMER_MS));
-        }
-        else
-        {
-            ChipLogProgress(DeviceLayer, "Connect failed after max %d tries", retryJoin);
+        } else {
+            ChipLogProgress(DeviceLayer,"Connect failed after max %d tries", retryAttempt);
         }
-    }
-    else
-    {
-        /* After disconnection
+    } else {
+        /* After disconnection or power cycle the DUT
          * At the telescopic time interval device try to reconnect with AP, upto WLAN_MAX_RETRY_TIMER_MS intervals
          * are telescopic. If interval exceed WLAN_MAX_RETRY_TIMER_MS then it will try to reconnect at
          * WLAN_MAX_RETRY_TIMER_MS intervals.
@@ -225,12 +210,15 @@ void wfx_retry_interval_handler(bool is_wifi_disconnection_event, uint16_t retry
         {
             retryInterval = WLAN_MAX_RETRY_TIMER_MS;
         }
-        ChipLogProgress(DeviceLayer, "wfx_retry_interval_handler : Next attempt after %ld Seconds",
-                        CONVERT_MS_TO_SEC(retryInterval));
-#if SL_ICD_ENABLED
+        if (osTimerStart(sRetryTimer, pdMS_TO_TICKS(retryInterval)) != osOK) {
+            ChipLogProgress(DeviceLayer,"Failed to start retry timer");
+            return;
+        }
+#if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI91X_MCU_INTERFACE
         wfx_rsi_power_save(RSI_SLEEP_MODE_8, STANDBY_POWER_SAVE_WITH_RAM_RETENTION);
-#endif // SL_ICD_ENABLED
-        vTaskDelay(pdMS_TO_TICKS(retryInterval));
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI91X_MCU_INTERFACE
+        ChipLogProgress(DeviceLayer,"wfx_retry_connection : Next attempt after %d Seconds", CONVERT_MS_TO_SEC(retryInterval));
         retryInterval += retryInterval;
+        return ;
     }
 }
diff --git a/src/platform/silabs/SiWx917/wifi/wfx_host_events.h b/src/platform/silabs/SiWx917/wifi/wfx_host_events.h
index 745de9b38410ba..fd91b48cada670 100644
--- a/src/platform/silabs/SiWx917/wifi/wfx_host_events.h
+++ b/src/platform/silabs/SiWx917/wifi/wfx_host_events.h
@@ -62,7 +62,7 @@
 #define MAX_JOIN_RETRIES_COUNT (5)
 
 // WLAN retry time intervals in milli seconds
-#define WLAN_MAX_RETRY_TIMER_MS 30000
+#define WLAN_MAX_RETRY_TIMER_MS 60000
 #define WLAN_MIN_RETRY_TIMER_MS 1000
 #define WLAN_RETRY_TIMER_MS 5000
 #define CONVERT_MS_TO_SEC(TimeInMS) (TimeInMS / 1000)
@@ -256,7 +256,7 @@ void sl_button_on_change(uint8_t btn, uint8_t btnAction);
 #endif /* SL_ICD_ENABLED */
 
 void wfx_ipv6_notify(int got_ip);
-void wfx_retry_interval_handler(bool is_wifi_disconnection_event, uint16_t retryJoin);
+void wfx_retry_connection(uint16_t retryAttempt);
 
 #ifdef __cplusplus
 }
diff --git a/src/platform/silabs/efr32/wifi/wfx_host_events.h b/src/platform/silabs/efr32/wifi/wfx_host_events.h
index 3e83f3b07d46c5..c6335bae6802fb 100644
--- a/src/platform/silabs/efr32/wifi/wfx_host_events.h
+++ b/src/platform/silabs/efr32/wifi/wfx_host_events.h
@@ -140,12 +140,10 @@ typedef struct __attribute__((__packed__)) sl_wfx_mib_req_s
 #define WLAN_TASK_PRIORITY 1
 #define WLAN_DRIVER_TASK_PRIORITY 1
 #define BLE_DRIVER_TASK_PRIORITY 1
-#define MAX_JOIN_RETRIES_COUNT 5
 
 #else /* WF200 */
 #define WLAN_TASK_STACK_SIZE 1024
 #define WLAN_TASK_PRIORITY 1
-#define MAX_JOIN_RETRIES_COUNT 5
 #endif // RS911X_WIFI
 
 // MAX SSID LENGTH excluding NULL character
@@ -154,11 +152,14 @@ typedef struct __attribute__((__packed__)) sl_wfx_mib_req_s
 #define WFX_MAX_PASSKEY_LENGTH (64)
 
 // WLAN retry time intervals in milli seconds
-#define WLAN_MAX_RETRY_TIMER_MS 30000
+#define WLAN_MAX_RETRY_TIMER_MS 60000
 #define WLAN_MIN_RETRY_TIMER_MS 1000
 #define WLAN_RETRY_TIMER_MS 5000
 #define CONVERT_MS_TO_SEC(TimeInMS) (TimeInMS / 1000)
 
+// WLAN MAX retry
+#define MAX_JOIN_RETRIES_COUNT 5
+
 // WLAN related Macros
 #define ETH_FRAME 0
 #define CMP_SUCCESS 0
@@ -389,7 +390,7 @@ void sl_wfx_host_gpio_init(void);
 sl_status_t sl_wfx_host_process_event(sl_wfx_generic_message_t * event_payload);
 #endif
 
-void wfx_retry_interval_handler(bool is_wifi_disconnection_event, uint16_t retryJoin);
+void wfx_retry_connection(uint16_t retryAttempt);
 
 #ifdef __cplusplus
 }

From e72956d583a84c2d75d6a5c25a962f2d2e755475 Mon Sep 17 00:00:00 2001
From: chbansal <chirag.bansal@silabs.com>
Date: Mon, 8 Jul 2024 09:47:20 +0530
Subject: [PATCH 02/18] Baseapplication.cpp modification of the delegate fix

---
 examples/platform/silabs/BaseApplication.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/examples/platform/silabs/BaseApplication.cpp b/examples/platform/silabs/BaseApplication.cpp
index fd22a7ea3a48fc..50fa0dee4f3d0e 100644
--- a/examples/platform/silabs/BaseApplication.cpp
+++ b/examples/platform/silabs/BaseApplication.cpp
@@ -181,7 +181,6 @@ void AppSpecificConnectivityEventCallback(const ChipDeviceEvent * event, intptr_
 } // namespace
 #endif // DIC_ENABLE
 
-#if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI917
 void BaseApplicationDelegate::OnCommissioningSessionStarted()
 {
     isComissioningStarted = true;
@@ -192,6 +191,7 @@ void BaseApplicationDelegate::OnCommissioningSessionStopped()
 }
 void BaseApplicationDelegate::OnCommissioningWindowClosed()
 {
+#if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI917
     if (!BaseApplication::GetProvisionStatus() && !isComissioningStarted)
     {
         int32_t status = wfx_power_save(RSI_SLEEP_MODE_8, STANDBY_POWER_SAVE_WITH_RAM_RETENTION);
@@ -200,8 +200,13 @@ void BaseApplicationDelegate::OnCommissioningWindowClosed()
             ChipLogError(DeviceLayer, "Failed to enable the TA Deep Sleep");
         }
     }
-}
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI917
+    if(BaseApplication::GetProvisionStatus()) {
+        // After the device is provisioned and the commissioning passed
+        // resetting the isCommissioningStarted to false
+        isComissioningStarted = false;
+    }
+}
 
 /**********************************************************
  * AppTask Definitions

From b5a6c6112f09c8556d8d2ce8eb8a6e8f93eff9c3 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Mon, 8 Jul 2024 04:17:46 +0000
Subject: [PATCH 03/18] Restyled by clang-format

---
 examples/platform/silabs/BaseApplication.cpp  |  3 +-
 examples/platform/silabs/BaseApplication.h    |  1 +
 .../silabs/SiWx917/SiWx917/sl_wifi_if.cpp     |  2 +-
 .../platform/silabs/efr32/rs911x/rsi_if.c     |  9 ++--
 .../platform/silabs/efr32/wf200/host_if.cpp   |  4 +-
 examples/platform/silabs/wifi/wfx_notify.cpp  | 50 +++++++++++--------
 6 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/examples/platform/silabs/BaseApplication.cpp b/examples/platform/silabs/BaseApplication.cpp
index 50fa0dee4f3d0e..c5fc8501f6a6db 100644
--- a/examples/platform/silabs/BaseApplication.cpp
+++ b/examples/platform/silabs/BaseApplication.cpp
@@ -201,7 +201,8 @@ void BaseApplicationDelegate::OnCommissioningWindowClosed()
         }
     }
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI917
-    if(BaseApplication::GetProvisionStatus()) {
+    if (BaseApplication::GetProvisionStatus())
+    {
         // After the device is provisioned and the commissioning passed
         // resetting the isCommissioningStarted to false
         isComissioningStarted = false;
diff --git a/examples/platform/silabs/BaseApplication.h b/examples/platform/silabs/BaseApplication.h
index 9dc34e015ef193..fe53f7fdc0662b 100644
--- a/examples/platform/silabs/BaseApplication.h
+++ b/examples/platform/silabs/BaseApplication.h
@@ -67,6 +67,7 @@ class BaseApplicationDelegate : public AppDelegate
 {
 public:
     bool isCommissioningInProgress() { return isComissioningStarted; }
+
 private:
     // AppDelegate
     bool isComissioningStarted = false;
diff --git a/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.cpp b/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.cpp
index 3ca60c74f8ad75..6133a36afa10c6 100644
--- a/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.cpp
+++ b/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.cpp
@@ -256,7 +256,7 @@ sl_status_t join_callback_handler(sl_wifi_event_t event, char * result, uint32_t
     WfxEvent.eventType = WFX_EVT_STA_CONN;
     WfxPostEvent(&WfxEvent);
     wfx_rsi.join_retries = 0;
-    callback_status             = SL_STATUS_OK;
+    callback_status      = SL_STATUS_OK;
     return SL_STATUS_OK;
 }
 
diff --git a/examples/platform/silabs/efr32/rs911x/rsi_if.c b/examples/platform/silabs/efr32/rs911x/rsi_if.c
index 2d82919fd00849..e824fbbdd0a50e 100644
--- a/examples/platform/silabs/efr32/rs911x/rsi_if.c
+++ b/examples/platform/silabs/efr32/rs911x/rsi_if.c
@@ -305,7 +305,7 @@ static void wfx_rsi_join_fail_cb(uint16_t status, uint8_t * buf, uint32_t len)
     WfxEvent_t WfxEvent;
     wfx_rsi.join_retries += 1;
     wfx_rsi.dev_state &= ~(WFX_RSI_ST_STA_CONNECTING | WFX_RSI_ST_STA_CONNECTED);
-    WfxEvent.eventType          = WFX_EVT_STA_START_JOIN;
+    WfxEvent.eventType = WFX_EVT_STA_START_JOIN;
     WfxPostEvent(&WfxEvent);
 }
 /*************************************************************************************
@@ -579,9 +579,10 @@ static void wfx_rsi_do_join(void)
             wfx_rsi.dev_state &= ~WFX_RSI_ST_STA_CONNECTING;
             SILABS_LOG("%s: rsi_wlan_connect_async failed with status: %02x on try %d", __func__, status, wfx_rsi.join_retries);
             wfx_retry_connection(++wfx_rsi.join_retries);
-        } else {
-                SILABS_LOG("%s: starting JOIN to %s after %d tries\n", __func__, (char *) &wfx_rsi.sec.ssid[0],
-                           wfx_rsi.join_retries);
+        }
+        else
+        {
+            SILABS_LOG("%s: starting JOIN to %s after %d tries\n", __func__, (char *) &wfx_rsi.sec.ssid[0], wfx_rsi.join_retries);
         }
     }
 }
diff --git a/examples/platform/silabs/efr32/wf200/host_if.cpp b/examples/platform/silabs/efr32/wf200/host_if.cpp
index f06b8a779b0822..44e65e2728fa4b 100644
--- a/examples/platform/silabs/efr32/wf200/host_if.cpp
+++ b/examples/platform/silabs/efr32/wf200/host_if.cpp
@@ -418,7 +418,7 @@ static void sl_wfx_disconnect_callback(uint8_t * mac, uint16_t reason)
     SILABS_LOG("WFX Disconnected %d\r\n", reason);
     sl_wfx_context->state =
         static_cast<sl_wfx_state_t>(static_cast<int>(sl_wfx_context->state) & ~static_cast<int>(SL_WFX_STA_INTERFACE_CONNECTED));
-    retryInProgress             = false;
+    retryInProgress = false;
     wfx_retry_connection(retryJoin);
 }
 
@@ -587,7 +587,7 @@ static void wfx_events_task(void * p_arg)
             hasNotifiedWifiConnectivity = false;
             SILABS_LOG("WIFI: Connected to AP");
             wifi_extra |= WE_ST_STA_CONN;
-            retryJoin     = 0;
+            retryJoin = 0;
             wfx_lwip_set_sta_link_up();
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
             if (!(wfx_get_wifi_state() & SL_WFX_AP_INTERFACE_UP))
diff --git a/examples/platform/silabs/wifi/wfx_notify.cpp b/examples/platform/silabs/wifi/wfx_notify.cpp
index 403c27522a05fc..c5a7f07583d8cf 100644
--- a/examples/platform/silabs/wifi/wfx_notify.cpp
+++ b/examples/platform/silabs/wifi/wfx_notify.cpp
@@ -50,7 +50,8 @@ static void RetryConnectionTimerHandler(void * arg)
     // TODO: remove this once it is fixed in the wifi sdk SI91X-15845
     wfx_rsi_power_save(RSI_ACTIVE, HIGH_PERFORMANCE);
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI91X_MCU_INTERFACE
-    if (wfx_connect_to_ap() != SL_STATUS_OK) {
+    if (wfx_connect_to_ap() != SL_STATUS_OK)
+    {
         ChipLogError(DeviceLayer, "wfx_connect_to_ap() failed.");
     }
 }
@@ -73,7 +74,7 @@ void wfx_started_notify()
         return;
     }
 
-    ChipLogProgress(DeviceLayer,"wfx_started_notify: started.");
+    ChipLogProgress(DeviceLayer, "wfx_started_notify: started.");
 
     memset(&evt, 0, sizeof(evt));
     evt.header.id     = SL_WFX_STARTUP_IND_ID;
@@ -98,15 +99,15 @@ void wfx_connected_notify(int32_t status, sl_wfx_mac_address_t * ap)
 {
     sl_wfx_connect_ind_t evt;
 
-    ChipLogProgress(DeviceLayer,"wfx_connected_notify : started.");
+    ChipLogProgress(DeviceLayer, "wfx_connected_notify : started.");
 
     if (status != SUCCESS_STATUS)
     {
-        ChipLogProgress(DeviceLayer,"wfx_connected_notify : error: failed status: %ld.", status);
+        ChipLogProgress(DeviceLayer, "wfx_connected_notify : error: failed status: %ld.", status);
         return;
     }
 
-    ChipLogProgress(DeviceLayer,"wfx_connected_notify : connected.");
+    ChipLogProgress(DeviceLayer, "wfx_connected_notify : connected.");
 
     memset(&evt, 0, sizeof(evt));
     evt.header.id     = SL_WFX_CONNECT_IND_ID;
@@ -131,7 +132,7 @@ void wfx_disconnected_notify(int32_t status)
 {
     sl_wfx_disconnect_ind_t evt;
 
-    ChipLogProgress(DeviceLayer,"wfx_disconnected_notify: started.");
+    ChipLogProgress(DeviceLayer, "wfx_disconnected_notify: started.");
 
     memset(&evt, 0, sizeof(evt));
     evt.header.id     = SL_WFX_DISCONNECT_IND_ID;
@@ -151,7 +152,7 @@ void wfx_ipv6_notify(int got_ip)
 {
     sl_wfx_generic_message_t eventData;
 
-    ChipLogProgress(DeviceLayer,"wfx_ipv6_notify: started.");
+    ChipLogProgress(DeviceLayer, "wfx_ipv6_notify: started.");
 
     memset(&eventData, 0, sizeof(eventData));
     eventData.header.id     = got_ip ? IP_EVENT_GOT_IP6 : IP_EVENT_STA_LOST_IP;
@@ -170,7 +171,7 @@ void wfx_ip_changed_notify(int got_ip)
 {
     sl_wfx_generic_message_t eventData;
 
-    ChipLogProgress(DeviceLayer,"wfx_ip_changed_notify: started.");
+    ChipLogProgress(DeviceLayer, "wfx_ip_changed_notify: started.");
 
     memset(&eventData, 0, sizeof(eventData));
     eventData.header.id     = got_ip ? IP_EVENT_STA_GOT_IP : IP_EVENT_STA_LOST_IP;
@@ -190,17 +191,25 @@ void wfx_ip_changed_notify(int got_ip)
 void wfx_retry_connection(uint16_t retryAttempt)
 {
     // During commissioning, we retry to join the network MAX_JOIN_RETRIES_COUNT
-    if(BaseApplication::sAppDelegate.isCommissioningInProgress()) {
-        if(retryAttempt < MAX_JOIN_RETRIES_COUNT) {
-            ChipLogProgress(DeviceLayer,"wfx_retry_connection : Next attempt after %d Seconds", CONVERT_MS_TO_SEC(WLAN_RETRY_TIMER_MS));
-            if (osTimerStart(sRetryTimer, pdMS_TO_TICKS(WLAN_RETRY_TIMER_MS)) != osOK) {
-                ChipLogProgress(DeviceLayer,"Failed to start retry timer");
+    if (BaseApplication::sAppDelegate.isCommissioningInProgress())
+    {
+        if (retryAttempt < MAX_JOIN_RETRIES_COUNT)
+        {
+            ChipLogProgress(DeviceLayer, "wfx_retry_connection : Next attempt after %d Seconds",
+                            CONVERT_MS_TO_SEC(WLAN_RETRY_TIMER_MS));
+            if (osTimerStart(sRetryTimer, pdMS_TO_TICKS(WLAN_RETRY_TIMER_MS)) != osOK)
+            {
+                ChipLogProgress(DeviceLayer, "Failed to start retry timer");
                 return;
             }
-        } else {
-            ChipLogProgress(DeviceLayer,"Connect failed after max %d tries", retryAttempt);
         }
-    } else {
+        else
+        {
+            ChipLogProgress(DeviceLayer, "Connect failed after max %d tries", retryAttempt);
+        }
+    }
+    else
+    {
         /* After disconnection or power cycle the DUT
          * At the telescopic time interval device try to reconnect with AP, upto WLAN_MAX_RETRY_TIMER_MS intervals
          * are telescopic. If interval exceed WLAN_MAX_RETRY_TIMER_MS then it will try to reconnect at
@@ -210,15 +219,16 @@ void wfx_retry_connection(uint16_t retryAttempt)
         {
             retryInterval = WLAN_MAX_RETRY_TIMER_MS;
         }
-        if (osTimerStart(sRetryTimer, pdMS_TO_TICKS(retryInterval)) != osOK) {
-            ChipLogProgress(DeviceLayer,"Failed to start retry timer");
+        if (osTimerStart(sRetryTimer, pdMS_TO_TICKS(retryInterval)) != osOK)
+        {
+            ChipLogProgress(DeviceLayer, "Failed to start retry timer");
             return;
         }
 #if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI91X_MCU_INTERFACE
         wfx_rsi_power_save(RSI_SLEEP_MODE_8, STANDBY_POWER_SAVE_WITH_RAM_RETENTION);
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI91X_MCU_INTERFACE
-        ChipLogProgress(DeviceLayer,"wfx_retry_connection : Next attempt after %d Seconds", CONVERT_MS_TO_SEC(retryInterval));
+        ChipLogProgress(DeviceLayer, "wfx_retry_connection : Next attempt after %d Seconds", CONVERT_MS_TO_SEC(retryInterval));
         retryInterval += retryInterval;
-        return ;
+        return;
     }
 }

From 8611d078e074b89a37585c248f95f8cdfde15b1f Mon Sep 17 00:00:00 2001
From: chbansal <chirag.bansal@silabs.com>
Date: Mon, 8 Jul 2024 11:40:35 +0530
Subject: [PATCH 04/18] removing the soc and sleepy condition

---
 examples/platform/silabs/BaseApplication.cpp     | 2 --
 examples/platform/silabs/BaseApplication.h       | 4 ----
 examples/platform/silabs/MatterConfig.cpp        | 3 +--
 examples/platform/silabs/SiWx917/BUILD.gn        | 2 +-
 examples/platform/silabs/efr32/rs911x/rs911x.gni | 2 +-
 examples/platform/silabs/efr32/wf200/wf200.gni   | 2 +-
 6 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/examples/platform/silabs/BaseApplication.cpp b/examples/platform/silabs/BaseApplication.cpp
index c5fc8501f6a6db..75352b2b10fb08 100644
--- a/examples/platform/silabs/BaseApplication.cpp
+++ b/examples/platform/silabs/BaseApplication.cpp
@@ -161,9 +161,7 @@ Identify gIdentify = {
 bool BaseApplication::sIsProvisioned           = false;
 bool BaseApplication::sIsFactoryResetTriggered = false;
 LEDWidget * BaseApplication::sAppActionLed     = nullptr;
-#if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI917
 BaseApplicationDelegate BaseApplication::sAppDelegate = BaseApplicationDelegate();
-#endif // CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI917
 
 #ifdef DIC_ENABLE
 namespace {
diff --git a/examples/platform/silabs/BaseApplication.h b/examples/platform/silabs/BaseApplication.h
index fe53f7fdc0662b..7bb51f3efe5777 100644
--- a/examples/platform/silabs/BaseApplication.h
+++ b/examples/platform/silabs/BaseApplication.h
@@ -62,7 +62,6 @@
 #define APP_ERROR_START_TIMER_FAILED CHIP_APPLICATION_ERROR(0x05)
 #define APP_ERROR_STOP_TIMER_FAILED CHIP_APPLICATION_ERROR(0x06)
 
-#if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI917
 class BaseApplicationDelegate : public AppDelegate
 {
 public:
@@ -75,7 +74,6 @@ class BaseApplicationDelegate : public AppDelegate
     void OnCommissioningSessionStopped() override;
     void OnCommissioningWindowClosed() override;
 };
-#endif // CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI917
 
 /**********************************************************
  * BaseApplication Declaration
@@ -90,9 +88,7 @@ class BaseApplication
     static bool sIsProvisioned;
     static bool sIsFactoryResetTriggered;
     static LEDWidget * sAppActionLed;
-#if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI917
     static BaseApplicationDelegate sAppDelegate;
-#endif // CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI917
 
     /**
      * @brief Create AppTask task and Event Queue
diff --git a/examples/platform/silabs/MatterConfig.cpp b/examples/platform/silabs/MatterConfig.cpp
index 0f25e2e25a40ed..b28ca811888eb4 100644
--- a/examples/platform/silabs/MatterConfig.cpp
+++ b/examples/platform/silabs/MatterConfig.cpp
@@ -304,9 +304,8 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
     initParams.endpointNativeParams    = static_cast<void *>(&nativeParams);
 #endif
 
-#if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI917
     initParams.appDelegate = &BaseApplication::sAppDelegate;
-#endif // CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI917
+
     // Init Matter Server and Start Event Loop
     err = chip::Server::GetInstance().Init(initParams);
 
diff --git a/examples/platform/silabs/SiWx917/BUILD.gn b/examples/platform/silabs/SiWx917/BUILD.gn
index 8acee7c3b9cfcd..f82056e4d0344a 100644
--- a/examples/platform/silabs/SiWx917/BUILD.gn
+++ b/examples/platform/silabs/SiWx917/BUILD.gn
@@ -204,7 +204,7 @@ source_set("siwx917-common") {
     "${silabs_plat_si91x_wifi_dir}/dhcp_client.cpp",
     "${silabs_plat_si91x_wifi_dir}/ethernetif.cpp",
     "${silabs_plat_si91x_wifi_dir}/lwip_netif.cpp",
-    "${silabs_plat_si91x_wifi_dir}/wfx_notify.cpp",
+    "${silabs_common_plat_dir}/wifi/wfx_notify.cpp",
     "SiWx917/sl_wifi_if.cpp",
     "SiWx917/wfx_rsi_host.cpp",
   ]
diff --git a/examples/platform/silabs/efr32/rs911x/rs911x.gni b/examples/platform/silabs/efr32/rs911x/rs911x.gni
index ebf7c546f6a068..54507de66e0ced 100644
--- a/examples/platform/silabs/efr32/rs911x/rs911x.gni
+++ b/examples/platform/silabs/efr32/rs911x/rs911x.gni
@@ -9,7 +9,7 @@ rs911x_src_plat = [
   "${examples_plat_dir}/rs911x/hal/rsi_hal_mcu_ioports.c",
   "${examples_plat_dir}/rs911x/hal/rsi_hal_mcu_timer.c",
   "${examples_plat_dir}/rs911x/hal/efx_spi.c",
-  "${silabs_plat_efr32_wifi_dir}/wfx_notify.cpp",
+  "${silabs_common_plat_dir}/wifi/wfx_notify.cpp",
 ]
 
 #
diff --git a/examples/platform/silabs/efr32/wf200/wf200.gni b/examples/platform/silabs/efr32/wf200/wf200.gni
index 7e3b4ae6f18d75..307b6815374c38 100644
--- a/examples/platform/silabs/efr32/wf200/wf200.gni
+++ b/examples/platform/silabs/efr32/wf200/wf200.gni
@@ -4,7 +4,7 @@ import("${efr32_sdk_build_root}/efr32_sdk.gni")
 
 wf200_plat_incs = [ "${examples_plat_dir}/wf200" ]
 wf200_plat_src = [
-  "${silabs_plat_efr32_wifi_dir}/wfx_notify.cpp",
+  "${silabs_common_plat_dir}/wifi/wfx_notify.cpp",
   "${examples_plat_dir}/wf200/sl_wfx_task.c",
   "${examples_plat_dir}/wf200/wf200_init.c",
   "${examples_plat_dir}/wf200/efr_spi.c",

From 57e9e04327f2615c1ca9b0912e8922b0f4f538df Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Mon, 8 Jul 2024 06:11:06 +0000
Subject: [PATCH 05/18] Restyled by clang-format

---
 examples/platform/silabs/BaseApplication.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/platform/silabs/BaseApplication.cpp b/examples/platform/silabs/BaseApplication.cpp
index 75352b2b10fb08..31d28fc7646fb8 100644
--- a/examples/platform/silabs/BaseApplication.cpp
+++ b/examples/platform/silabs/BaseApplication.cpp
@@ -158,9 +158,9 @@ Identify gIdentify = {
 #endif // MATTER_DM_PLUGIN_IDENTIFY_SERVER
 } // namespace
 
-bool BaseApplication::sIsProvisioned           = false;
-bool BaseApplication::sIsFactoryResetTriggered = false;
-LEDWidget * BaseApplication::sAppActionLed     = nullptr;
+bool BaseApplication::sIsProvisioned                  = false;
+bool BaseApplication::sIsFactoryResetTriggered        = false;
+LEDWidget * BaseApplication::sAppActionLed            = nullptr;
 BaseApplicationDelegate BaseApplication::sAppDelegate = BaseApplicationDelegate();
 
 #ifdef DIC_ENABLE

From 9759cd6ee36f957795e410418421e10500654f12 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Mon, 8 Jul 2024 06:11:07 +0000
Subject: [PATCH 06/18] Restyled by gn

---
 examples/platform/silabs/SiWx917/BUILD.gn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/platform/silabs/SiWx917/BUILD.gn b/examples/platform/silabs/SiWx917/BUILD.gn
index f82056e4d0344a..b034a84471218b 100644
--- a/examples/platform/silabs/SiWx917/BUILD.gn
+++ b/examples/platform/silabs/SiWx917/BUILD.gn
@@ -201,10 +201,10 @@ source_set("siwx917-common") {
     "${silabs_common_plat_dir}/provision/ProvisionStorageFlash.cpp",
     "${silabs_common_plat_dir}/silabs_utils.cpp",
     "${silabs_common_plat_dir}/syscalls_stubs.cpp",
+    "${silabs_common_plat_dir}/wifi/wfx_notify.cpp",
     "${silabs_plat_si91x_wifi_dir}/dhcp_client.cpp",
     "${silabs_plat_si91x_wifi_dir}/ethernetif.cpp",
     "${silabs_plat_si91x_wifi_dir}/lwip_netif.cpp",
-    "${silabs_common_plat_dir}/wifi/wfx_notify.cpp",
     "SiWx917/sl_wifi_if.cpp",
     "SiWx917/wfx_rsi_host.cpp",
   ]

From 8d0d1d5d3dd043123b9ba7d7ec9a04d81c8088c5 Mon Sep 17 00:00:00 2001
From: chbansal <chirag.bansal@silabs.com>
Date: Tue, 9 Jul 2024 00:16:11 +0530
Subject: [PATCH 07/18] moving the variable to efr32_sdk.gni to make it
 available everywhere

---
 examples/platform/silabs/SiWx917/BUILD.gn | 2 --
 examples/platform/silabs/efr32/BUILD.gn   | 2 --
 third_party/silabs/efr32_sdk.gni          | 1 +
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/examples/platform/silabs/SiWx917/BUILD.gn b/examples/platform/silabs/SiWx917/BUILD.gn
index b034a84471218b..ebe0fc1db2425e 100644
--- a/examples/platform/silabs/SiWx917/BUILD.gn
+++ b/examples/platform/silabs/SiWx917/BUILD.gn
@@ -50,8 +50,6 @@ declare_args() {
 
 # Sanity check
 assert(chip_enable_wifi)
-
-silabs_common_plat_dir = "${chip_root}/examples/platform/silabs"
 silabs_plat_si91x_wifi_dir = "${chip_root}/src/platform/silabs/SiWx917/wifi"
 import("${silabs_common_plat_dir}/args.gni")
 
diff --git a/examples/platform/silabs/efr32/BUILD.gn b/examples/platform/silabs/efr32/BUILD.gn
index 6cf43897f43b10..d0e8f0f4f894c1 100644
--- a/examples/platform/silabs/efr32/BUILD.gn
+++ b/examples/platform/silabs/efr32/BUILD.gn
@@ -48,8 +48,6 @@ declare_args() {
   sl_test_event_trigger_enable_key = "00112233445566778899AABBCCDDEEFF"
 }
 
-silabs_common_plat_dir = "${chip_root}/examples/platform/silabs"
-
 import("${silabs_common_plat_dir}/args.gni")
 
 # Sanity check
diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
index 87d0b0bc078d06..5c5092093a584d 100644
--- a/third_party/silabs/efr32_sdk.gni
+++ b/third_party/silabs/efr32_sdk.gni
@@ -84,6 +84,7 @@ declare_args() {
 
 examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
 silabs_plat_efr32_wifi_dir = "${chip_root}/src/platform/silabs/efr32/wifi"
+silabs_common_plat_dir = "${chip_root}/examples/platform/silabs"
 is_series_2 = silabs_family == "mgm24" || silabs_family == "efr32mg24" ||
               silabs_family == "efr32mg26"
 

From f9f499beea6cf0b720cfd2ee3687710f890a9ea7 Mon Sep 17 00:00:00 2001
From: chbansal <chirag.bansal@silabs.com>
Date: Wed, 10 Jul 2024 13:51:50 +0530
Subject: [PATCH 08/18] correcting the path of the 917 ncp file

---
 examples/platform/silabs/efr32/rs911x/rs9117.gni | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/platform/silabs/efr32/rs911x/rs9117.gni b/examples/platform/silabs/efr32/rs911x/rs9117.gni
index c068e7aa3efaff..356b72f55f75d4 100644
--- a/examples/platform/silabs/efr32/rs911x/rs9117.gni
+++ b/examples/platform/silabs/efr32/rs911x/rs9117.gni
@@ -8,7 +8,7 @@ rs911x_src_plat = [
   "${examples_plat_dir}/rs911x/hal/rsi_hal_mcu_interrupt.c",
   "${examples_plat_dir}/rs911x/hal/sl_si91x_ncp_utility.c",
   "${examples_plat_dir}/rs911x/hal/efx32_ncp_host.c",
-  "${silabs_plat_efr32_wifi_dir}/wfx_notify.cpp",
+  "${silabs_common_plat_dir}/wifi/wfx_notify.cpp",
 ]
 
 rs9117_inc_plat = [

From 95eaa1d510efce2e31b4e5b0569c018c6b3b0f92 Mon Sep 17 00:00:00 2001
From: chbansal <chirag.bansal@silabs.com>
Date: Wed, 10 Jul 2024 13:54:15 +0530
Subject: [PATCH 09/18] fixing the build for the 917 ncp

---
 .../silabs/SiWx917/SiWx917/sl_wifi_if.cpp     |   2 +-
 src/platform/silabs/efr32/wifi/wfx_notify.cpp | 220 ------------------
 2 files changed, 1 insertion(+), 221 deletions(-)
 delete mode 100644 src/platform/silabs/efr32/wifi/wfx_notify.cpp

diff --git a/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.cpp b/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.cpp
index 6133a36afa10c6..8e296479f7ba63 100644
--- a/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.cpp
+++ b/examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.cpp
@@ -681,7 +681,7 @@ static sl_status_t wfx_rsi_do_join(void)
 
     // failure only happens when the firmware returns an error
     ChipLogError(DeviceLayer, "wfx_rsi_do_join: sl_wifi_connect failed: 0x%lx", static_cast<uint32_t>(status));
-    VerifyOrReturnError((is_wifi_disconnection_event || wfx_rsi.join_retries <= MAX_JOIN_RETRIES_COUNT), status);
+    VerifyOrReturnError((wfx_rsi.join_retries <= MAX_JOIN_RETRIES_COUNT), status);
 
     wfx_rsi.dev_state &= ~(WFX_RSI_ST_STA_CONNECTING | WFX_RSI_ST_STA_CONNECTED);
     ChipLogProgress(DeviceLayer, "wfx_rsi_do_join: retry attempt %d", wfx_rsi.join_retries);
diff --git a/src/platform/silabs/efr32/wifi/wfx_notify.cpp b/src/platform/silabs/efr32/wifi/wfx_notify.cpp
deleted file mode 100644
index fd183100e7b913..00000000000000
--- a/src/platform/silabs/efr32/wifi/wfx_notify.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "em_bus.h"
-#include "em_cmu.h"
-#include "em_gpio.h"
-#include "em_ldma.h"
-#include "em_usart.h"
-#include "gpiointerrupt.h"
-
-#include "FreeRTOS.h"
-#include "event_groups.h"
-#include "task.h"
-
-#include "wfx_host_events.h"
-
-#ifdef RS911X_WIFI
-#include "wfx_rsi.h"
-#endif
-
-#include <app/server/Dnssd.h>
-#include <app/server/Server.h>
-#include <lib/support/logging/CHIPLogging.h>
-#include <platform/CHIPDeviceLayer.h>
-
-using namespace ::chip;
-using namespace ::chip::DeviceLayer;
-
-extern uint32_t retryInterval;
-
-/*
- * Notifications to the upper-layer
- * All done in the context of the RSI/WiFi task (rsi_if.c)
- */
-
-/***********************************************************************************
- * @fn  wfx_started_notify()
- * @brief
- *       Wifi device started notification
- * @param[in]: None
- * @return None
- *************************************************************************************/
-void wfx_started_notify()
-{
-    sl_wfx_startup_ind_t evt;
-    sl_wfx_mac_address_t mac;
-
-    memset(&evt, 0, sizeof(evt));
-    evt.header.id     = SL_WFX_STARTUP_IND_ID;
-    evt.header.length = sizeof evt;
-    evt.body.status   = 0;
-    wfx_get_wifi_mac_addr(SL_WFX_STA_INTERFACE, &mac);
-    memcpy(&evt.body.mac_addr[0], &mac.octet[0], MAC_ADDRESS_FIRST_OCTET);
-
-    PlatformMgrImpl().HandleWFXSystemEvent(WIFI_EVENT, (sl_wfx_generic_message_t *) &evt);
-}
-
-/***********************************************************************************
- * @fn  void wfx_connected_notify(int32_t status, sl_wfx_mac_address_t *ap)
- * @brief
- * For now we are not notifying anything other than AP Mac -
- * Other stuff such as DTIM etc. may be required for later
- * @param[in] status:
- * @param[in] ap: access point
- * @return None
- *************************************************************************************/
-void wfx_connected_notify(int32_t status, sl_wfx_mac_address_t * ap)
-{
-    sl_wfx_connect_ind_t evt;
-
-    if (status != SUCCESS_STATUS)
-    {
-        ChipLogProgress(DeviceLayer, "%s: error: failed status: %ld.", __func__, status);
-        return;
-    }
-
-    ChipLogProgress(DeviceLayer, "%s: connected.", __func__);
-
-    memset(&evt, 0, sizeof(evt));
-    evt.header.id     = SL_WFX_CONNECT_IND_ID;
-    evt.header.length = sizeof evt;
-
-#ifdef RS911X_WIFI
-    evt.body.channel = wfx_rsi.ap_chan;
-#endif
-    memcpy(&evt.body.mac[0], &ap->octet[0], MAC_ADDRESS_FIRST_OCTET);
-
-    PlatformMgrImpl().HandleWFXSystemEvent(WIFI_EVENT, (sl_wfx_generic_message_t *) &evt);
-}
-
-/**************************************************************************************
- * @fn  void wfx_disconnected_notify(int32_t status)
- * @brief
- *    notification of disconnection
- * @param[in] status:
- * @return None
- ********************************************************************************************/
-void wfx_disconnected_notify(int32_t status)
-{
-    sl_wfx_disconnect_ind_t evt;
-
-    memset(&evt, 0, sizeof(evt));
-    evt.header.id     = SL_WFX_DISCONNECT_IND_ID;
-    evt.header.length = sizeof evt;
-    evt.body.reason   = status;
-    PlatformMgrImpl().HandleWFXSystemEvent(WIFI_EVENT, (sl_wfx_generic_message_t *) &evt);
-}
-
-/**************************************************************************************
- * @fn  void wfx_ipv6_notify(int got_ip)
- * @brief
- *      notification of ipv6
- * @param[in]  got_ip:
- * @return None
- ********************************************************************************************/
-void wfx_ipv6_notify(int got_ip)
-{
-    sl_wfx_generic_message_t eventData;
-
-    memset(&eventData, 0, sizeof(eventData));
-    eventData.header.id     = got_ip ? IP_EVENT_GOT_IP6 : IP_EVENT_STA_LOST_IP;
-    eventData.header.length = sizeof(eventData.header);
-    PlatformMgrImpl().HandleWFXSystemEvent(IP_EVENT, &eventData);
-
-    /* So the other threads can run and have the connectivity OK */
-    if (got_ip)
-    {
-        /* Should remember this */
-        vTaskDelay(1);
-        chip::DeviceLayer::PlatformMgr().LockChipStack();
-        chip::app::DnssdServer::Instance().StartServer(/*Dnssd::CommissioningMode::kEnabledBasic*/);
-        chip::DeviceLayer::PlatformMgr().UnlockChipStack();
-    }
-}
-
-/**************************************************************************************
- * @fn   void wfx_ip_changed_notify(int got_ip)
- * @brief
- *      notification of ip change
- * @param[in]  got_ip:
- * @return None
- ********************************************************************************************/
-void wfx_ip_changed_notify(int got_ip)
-{
-    sl_wfx_generic_message_t eventData;
-
-    memset(&eventData, 0, sizeof(eventData));
-    eventData.header.id     = got_ip ? IP_EVENT_STA_GOT_IP : IP_EVENT_STA_LOST_IP;
-    eventData.header.length = sizeof(eventData.header);
-    PlatformMgrImpl().HandleWFXSystemEvent(IP_EVENT, &eventData);
-
-    /* So the other threads can run and have the connectivity OK */
-    if (got_ip)
-    {
-        /* Should remember this */
-        vTaskDelay(1);
-        chip::DeviceLayer::PlatformMgr().LockChipStack();
-        chip::app::DnssdServer::Instance().StartServer(/*Dnssd::CommissioningMode::kEnabledBasic*/);
-        chip::DeviceLayer::PlatformMgr().UnlockChipStack();
-    }
-}
-
-/**************************************************************************************
- * @fn  void wfx_retry_interval_handler(bool is_wifi_disconnection_event, uint16_t retryJoin)
- * @brief
- *      Based on condition will delay for a certain period of time.
- * @param[in]  is_wifi_disconnection_event, retryJoin
- * @return None
- ********************************************************************************************/
-void wfx_retry_interval_handler(bool is_wifi_disconnection_event, uint16_t retryJoin)
-{
-    if (!is_wifi_disconnection_event)
-    {
-        /* After the reboot or a commissioning time device failed to connect with AP.
-         * Device will retry to connect with AP upto WFX_RSI_CONFIG_MAX_JOIN retries.
-         */
-        if (retryJoin < MAX_JOIN_RETRIES_COUNT)
-        {
-            ChipLogProgress(DeviceLayer, "%s: Next attempt after %d Seconds", __func__, CONVERT_MS_TO_SEC(WLAN_RETRY_TIMER_MS));
-            vTaskDelay(pdMS_TO_TICKS(WLAN_RETRY_TIMER_MS));
-        }
-        else
-        {
-            ChipLogProgress(DeviceLayer, "Connect failed after max %d tries", retryJoin);
-        }
-    }
-    else
-    {
-        /* After disconnection
-         * At the telescopic time interval device try to reconnect with AP, upto WLAN_MAX_RETRY_TIMER_MS intervals
-         * are telescopic. If interval exceed WLAN_MAX_RETRY_TIMER_MS then it will try to reconnect at
-         * WLAN_MAX_RETRY_TIMER_MS intervals.
-         */
-        if (retryInterval > WLAN_MAX_RETRY_TIMER_MS)
-        {
-            retryInterval = WLAN_MAX_RETRY_TIMER_MS;
-        }
-        ChipLogProgress(DeviceLayer, "%s: Next attempt after %ld Seconds", __func__, CONVERT_MS_TO_SEC(retryInterval));
-        vTaskDelay(pdMS_TO_TICKS(retryInterval));
-        retryInterval += retryInterval;
-    }
-}

From 2f75be5d7f2e3355c2805f231438e47a8fb4a3f7 Mon Sep 17 00:00:00 2001
From: chbansal <chirag.bansal@silabs.com>
Date: Fri, 16 Aug 2024 10:38:00 +0530
Subject: [PATCH 10/18] addressing the review comments

---
 .../platform/silabs/efr32/rs911x/rsi_if.c     | 64 +++++++++----------
 examples/platform/silabs/wifi/wfx_notify.cpp  | 34 ++++------
 2 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/examples/platform/silabs/efr32/rs911x/rsi_if.c b/examples/platform/silabs/efr32/rs911x/rsi_if.c
index e824fbbdd0a50e..7ce148df5c0ff5 100644
--- a/examples/platform/silabs/efr32/rs911x/rsi_if.c
+++ b/examples/platform/silabs/efr32/rs911x/rsi_if.c
@@ -273,7 +273,7 @@ static void wfx_rsi_join_cb(uint16_t status, const uint8_t * buf, const uint16_t
         /*
          * We should enable retry.. (Need config variable for this)
          */
-        SILABS_LOG("%s: failed. retry: %d", __func__, wfx_rsi.join_retries);
+        SILABS_LOG("wfx_rsi_join_cb: failed. retry: %d", wfx_rsi.join_retries);
         wfx_retry_connection(++wfx_rsi.join_retries);
     }
     else
@@ -282,7 +282,7 @@ static void wfx_rsi_join_cb(uint16_t status, const uint8_t * buf, const uint16_t
          * Join was complete - Do the DHCP
          */
         memset(&temp_reset, 0, sizeof(wfx_wifi_scan_ext_t));
-        SILABS_LOG("%s: join completed.", __func__);
+        SILABS_LOG("wfx_rsi_join_cb: join completed.");
         WfxEvent.eventType = WFX_EVT_STA_CONN;
         WfxPostEvent(&WfxEvent);
         wfx_rsi.join_retries = 0;
@@ -301,7 +301,7 @@ static void wfx_rsi_join_cb(uint16_t status, const uint8_t * buf, const uint16_t
  *********************************************************************/
 static void wfx_rsi_join_fail_cb(uint16_t status, uint8_t * buf, uint32_t len)
 {
-    SILABS_LOG("%s: error: failed status: %02x", __func__, status);
+    SILABS_LOG("wfx_rsi_join_fail_cb: error: failed status: %02x", status);
     WfxEvent_t WfxEvent;
     wfx_rsi.join_retries += 1;
     wfx_rsi.dev_state &= ~(WFX_RSI_ST_STA_CONNECTING | WFX_RSI_ST_STA_CONNECTED);
@@ -341,23 +341,23 @@ static int32_t wfx_rsi_init(void)
     uint8_t buf[RSI_RESPONSE_HOLD_BUFF_SIZE];
     extern void rsi_hal_board_init(void);
 
-    SILABS_LOG("%s: starting(HEAP_SZ = %d)", __func__, SL_HEAP_SIZE);
+    SILABS_LOG("wfx_rsi_init: starting(HEAP_SZ = %d)", SL_HEAP_SIZE);
     //! Driver initialization
     status = rsi_driver_init(wfx_rsi_drv_buf, WFX_RSI_BUF_SZ);
     if ((status < RSI_DRIVER_STATUS) || (status > WFX_RSI_BUF_SZ))
     {
-        SILABS_LOG("%s: error: RSI Driver initialization failed with status: %02x", __func__, status);
+        SILABS_LOG("wfx_rsi_init: error: RSI Driver initialization failed with status: %02x", status);
         return status;
     }
 
-    SILABS_LOG("%s: rsi_device_init", __func__);
+    SILABS_LOG("wfx_rsi_init: rsi_device_init", __func__);
     /* ! Redpine module intialisation */
     if ((status = rsi_device_init(LOAD_NWP_FW)) != RSI_SUCCESS)
     {
-        SILABS_LOG("%s: error: rsi_device_init failed with status: %02x", __func__, status);
+        SILABS_LOG("wfx_rsi_init: error: rsi_device_init failed with status: %02x", status);
         return status;
     }
-    SILABS_LOG("%s: start wireless drv task", __func__);
+    SILABS_LOG("wfx_rsi_init: start wireless drv task", __func__);
     /*
      * Create the driver task
      */
@@ -365,7 +365,7 @@ static int32_t wfx_rsi_init(void)
                                          WLAN_TASK_PRIORITY, driverRsiTaskStack, &driverRsiTaskBuffer);
     if (NULL == wfx_rsi.drv_task)
     {
-        SILABS_LOG("%s: error: rsi_wireless_driver_task failed", __func__);
+        SILABS_LOG("wfx_rsi_init: error: rsi_wireless_driver_task failed", __func__);
         return RSI_ERROR_INVALID_PARAM;
     }
 
@@ -376,40 +376,40 @@ static int32_t wfx_rsi_init(void)
     if ((status = rsi_wireless_init(OPER_MODE_0, COEX_MODE_0)) != RSI_SUCCESS)
     {
 #endif
-        SILABS_LOG("%s: error: Initialize WiSeConnect failed with status: %02x", __func__, status);
+        SILABS_LOG("wfx_rsi_init: error: Initialize WiSeConnect failed with status: %02x", status);
         return status;
     }
 
-    SILABS_LOG("%s: get FW version..", __func__);
+    SILABS_LOG("wfx_rsi_init: get FW version..", __func__);
     /*
      * Get the MAC and other info to let the user know about it.
      */
     if (rsi_wlan_get(RSI_FW_VERSION, buf, sizeof(buf)) != RSI_SUCCESS)
     {
-        SILABS_LOG("%s: error: rsi_wlan_get(RSI_FW_VERSION) failed with status: %02x", __func__, status);
+        SILABS_LOG("wfx_rsi_init: error: rsi_wlan_get(RSI_FW_VERSION) failed with status: %02x", status);
         return status;
     }
 
     buf[sizeof(buf) - 1] = 0;
-    SILABS_LOG("%s: RSI firmware version: %s", __func__, buf);
+    SILABS_LOG("wfx_rsi_init: RSI firmware version: %s", buf);
     //! Send feature frame
     if ((status = rsi_send_feature_frame()) != RSI_SUCCESS)
     {
-        SILABS_LOG("%s: error: rsi_send_feature_frame failed with status: %02x", __func__, status);
+        SILABS_LOG("wfx_rsi_init: error: rsi_send_feature_frame failed with status: %02x", status);
         return status;
     }
 
-    SILABS_LOG("%s: sent rsi_send_feature_frame", __func__);
+    SILABS_LOG("wfx_rsi_init: sent rsi_send_feature_frame", __func__);
     /* initializes wlan radio parameters and WLAN supplicant parameters.
      */
     (void) rsi_wlan_radio_init(); /* Required so we can get MAC address */
     if ((status = rsi_wlan_get(RSI_MAC_ADDRESS, &wfx_rsi.sta_mac.octet[0], RESP_BUFF_SIZE)) != RSI_SUCCESS)
     {
-        SILABS_LOG("%s: error: rsi_wlan_get failed with status: %02x", __func__, status);
+        SILABS_LOG("wfx_rsi_init: error: rsi_wlan_get failed with status: %02x", status);
         return status;
     }
 
-    SILABS_LOG("%s: WLAN: MAC %02x:%02x:%02x %02x:%02x:%02x", __func__, wfx_rsi.sta_mac.octet[0], wfx_rsi.sta_mac.octet[1],
+    SILABS_LOG("wfx_rsi_init: WLAN: MAC %02x:%02x:%02x %02x:%02x:%02x", wfx_rsi.sta_mac.octet[0], wfx_rsi.sta_mac.octet[1],
                wfx_rsi.sta_mac.octet[2], wfx_rsi.sta_mac.octet[3], wfx_rsi.sta_mac.octet[4], wfx_rsi.sta_mac.octet[5]);
 
     // Create the message queue
@@ -432,12 +432,12 @@ static int32_t wfx_rsi_init(void)
      */
     if ((status = rsi_wlan_register_callbacks(RSI_JOIN_FAIL_CB, wfx_rsi_join_fail_cb)) != RSI_SUCCESS)
     {
-        SILABS_LOG("%s: RSI callback register join failed with status: %02x", __func__, status);
+        SILABS_LOG("wfx_rsi_init: RSI callback register join failed with status: %02x", status);
         return status;
     }
     if ((status = rsi_wlan_register_callbacks(RSI_WLAN_DATA_RECEIVE_NOTIFY_CB, wfx_rsi_wlan_pkt_cb)) != RSI_SUCCESS)
     {
-        SILABS_LOG("%s: RSI callback register data-notify failed with status: %02x", __func__, status);
+        SILABS_LOG("wfx_rsi_init: RSI callback register data-notify failed with status: %02x", status);
         return status;
     }
 
@@ -446,7 +446,7 @@ static int32_t wfx_rsi_init(void)
 #endif
 
     wfx_rsi.dev_state |= WFX_RSI_ST_DEV_READY;
-    SILABS_LOG("%s: RSI: OK", __func__);
+    SILABS_LOG("wfx_rsi_init: RSI: OK", __func__);
     return RSI_SUCCESS;
 }
 
@@ -475,7 +475,7 @@ static void wfx_rsi_save_ap_info() // translation
 #else  /* !WIFI_ENABLE_SECURITY_WPA3_TRANSITION */
         wfx_rsi.sec.security = WFX_SEC_WPA2;
 #endif /* WIFI_ENABLE_SECURITY_WPA3_TRANSITION */
-        SILABS_LOG("%s: warn: failed with status: %02x", __func__, status);
+        SILABS_LOG("wfx_rsi_save_ap_info: warn: failed with status: %02x", status);
         return;
     }
     wfx_rsi.sec.security = WFX_SEC_UNSPECIFIED;
@@ -511,7 +511,7 @@ static void wfx_rsi_save_ap_info() // translation
         break;
     }
 
-    SILABS_LOG("%s: WLAN: connecting to %s, sec=%d, status=%02x", __func__, &wfx_rsi.sec.ssid[0], wfx_rsi.sec.security, status);
+    SILABS_LOG("wfx_rsi_save_ap_info: WLAN: connecting to %s, sec=%d, status=%02x", &wfx_rsi.sec.ssid[0], wfx_rsi.sec.security, status);
 }
 
 /********************************************************************************************
@@ -528,7 +528,7 @@ static void wfx_rsi_do_join(void)
 
     if (wfx_rsi.dev_state & (WFX_RSI_ST_STA_CONNECTING | WFX_RSI_ST_STA_CONNECTED))
     {
-        SILABS_LOG("%s: not joining - already in progress", __func__);
+        SILABS_LOG("wfx_rsi_do_join: not joining - already in progress");
     }
     else
     {
@@ -551,11 +551,11 @@ static void wfx_rsi_do_join(void)
             connect_security_mode = RSI_OPEN;
             break;
         default:
-            SILABS_LOG("%s: error: unknown security type.", __func__);
+            SILABS_LOG("wfx_rsi_do_join: error: unknown security type.");
             return;
         }
 
-        SILABS_LOG("%s: WLAN: connecting to %s, sec=%d", __func__, &wfx_rsi.sec.ssid[0], wfx_rsi.sec.security);
+        SILABS_LOG("wfx_rsi_do_join: WLAN: connecting to %s, sec=%d", &wfx_rsi.sec.ssid[0], wfx_rsi.sec.security);
 
         /*
          * Join the network
@@ -567,7 +567,7 @@ static void wfx_rsi_do_join(void)
 
         if ((status = rsi_wlan_register_callbacks(RSI_JOIN_FAIL_CB, wfx_rsi_join_fail_cb)) != RSI_SUCCESS)
         {
-            SILABS_LOG("%s: RSI callback register join failed with status: %02x", __func__, status);
+            SILABS_LOG("wfx_rsi_do_join: RSI callback register join failed with status: %02x", status);
         }
 
         /* Try to connect Wifi with given Credentials
@@ -577,12 +577,12 @@ static void wfx_rsi_do_join(void)
                                              wfx_rsi_join_cb)) != RSI_SUCCESS)
         {
             wfx_rsi.dev_state &= ~WFX_RSI_ST_STA_CONNECTING;
-            SILABS_LOG("%s: rsi_wlan_connect_async failed with status: %02x on try %d", __func__, status, wfx_rsi.join_retries);
+            SILABS_LOG("wfx_rsi_do_join: rsi_wlan_connect_async failed with status: %02x on try %d", status, wfx_rsi.join_retries);
             wfx_retry_connection(++wfx_rsi.join_retries);
         }
         else
         {
-            SILABS_LOG("%s: starting JOIN to %s after %d tries\n", __func__, (char *) &wfx_rsi.sec.ssid[0], wfx_rsi.join_retries);
+            SILABS_LOG("wfx_rsi_do_join: starting JOIN to %s after %d tries\n", (char *) &wfx_rsi.sec.ssid[0], wfx_rsi.join_retries);
         }
     }
 }
@@ -677,7 +677,7 @@ void ProcessEvent(WfxEvent_t inEvent)
     switch (inEvent.eventType)
     {
     case WFX_EVT_STA_CONN:
-        SILABS_LOG("%s: starting LwIP STA", __func__);
+        SILABS_LOG("Starting LwIP STA");
         wfx_rsi.dev_state |= WFX_RSI_ST_STA_CONNECTED;
         ResetDHCPNotificationFlags();
         wfx_lwip_set_sta_link_up();
@@ -691,7 +691,7 @@ void ProcessEvent(WfxEvent_t inEvent)
         // TODO: This event is not being posted anywhere, seems to be a dead code or we are missing something
         wfx_rsi.dev_state &=
             ~(WFX_RSI_ST_STA_READY | WFX_RSI_ST_STA_CONNECTING | WFX_RSI_ST_STA_CONNECTED | WFX_RSI_ST_STA_DHCP_DONE);
-        SILABS_LOG("%s: disconnect notify", __func__);
+        SILABS_LOG("Disconnect notify");
         /* TODO: Implement disconnect notify */
         ResetDHCPNotificationFlags();
         wfx_lwip_set_sta_link_down(); // Internally dhcpclient_poll(netif) ->
@@ -789,7 +789,7 @@ void wfx_rsi_task(void * arg)
     uint32_t rsi_status = wfx_rsi_init();
     if (rsi_status != RSI_SUCCESS)
     {
-        SILABS_LOG("%s: error: wfx_rsi_init with status: %02x", __func__, rsi_status);
+        SILABS_LOG("wfx_rsi_task: error: wfx_rsi_init with status: %02x", rsi_status);
         return;
     }
     WfxEvent_t wfxEvent;
@@ -829,7 +829,7 @@ void wfx_dhcp_got_ipv4(uint32_t ip)
     wfx_rsi.ip4_addr[1] = (ip >> 8) & HEX_VALUE_FF;
     wfx_rsi.ip4_addr[2] = (ip >> 16) & HEX_VALUE_FF;
     wfx_rsi.ip4_addr[3] = (ip >> 24) & HEX_VALUE_FF;
-    SILABS_LOG("%s: DHCP OK: IP=%d.%d.%d.%d", __func__, wfx_rsi.ip4_addr[0], wfx_rsi.ip4_addr[1], wfx_rsi.ip4_addr[2],
+    SILABS_LOG("wfx_dhcp_got_ipv4: DHCP OK: IP=%d.%d.%d.%d", wfx_rsi.ip4_addr[0], wfx_rsi.ip4_addr[1], wfx_rsi.ip4_addr[2],
                wfx_rsi.ip4_addr[3]);
     /* Notify the Connectivity Manager - via the app */
     wfx_rsi.dev_state |= WFX_RSI_ST_STA_DHCP_DONE;
diff --git a/examples/platform/silabs/wifi/wfx_notify.cpp b/examples/platform/silabs/wifi/wfx_notify.cpp
index c5a7f07583d8cf..8ae7503d7ad1b2 100644
--- a/examples/platform/silabs/wifi/wfx_notify.cpp
+++ b/examples/platform/silabs/wifi/wfx_notify.cpp
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
+#include <icd/server/ICDServerConfig.h>
 #include "AppConfig.h"
 #include "BaseApplication.h"
 
@@ -37,8 +37,10 @@
 using namespace ::chip;
 using namespace ::chip::DeviceLayer;
 
-static uint16_t retryInterval = WLAN_MIN_RETRY_TIMER_MS;
-static osTimerId_t sRetryTimer;
+namespace {
+uint16_t retryInterval = WLAN_MIN_RETRY_TIMER_MS;
+osTimerId_t sRetryTimer; 
+}
 /*
  * Notifications to the upper-layer
  * All done in the context of the RSI/WiFi task (rsi_if.c)
@@ -47,7 +49,6 @@ static osTimerId_t sRetryTimer;
 static void RetryConnectionTimerHandler(void * arg)
 {
 #if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI91X_MCU_INTERFACE
-    // TODO: remove this once it is fixed in the wifi sdk SI91X-15845
     wfx_rsi_power_save(RSI_ACTIVE, HIGH_PERFORMANCE);
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI91X_MCU_INTERFACE
     if (wfx_connect_to_ap() != SL_STATUS_OK)
@@ -69,12 +70,7 @@ void wfx_started_notify()
 
     // Creating a timer which will be used to retry connection with AP
     sRetryTimer = osTimerNew(RetryConnectionTimerHandler, osTimerOnce, NULL, NULL);
-    if (sRetryTimer == NULL)
-    {
-        return;
-    }
-
-    ChipLogProgress(DeviceLayer, "wfx_started_notify: started.");
+    VerifyOrReturnError(sRetryTimer != NULL, SL_STATUS_ALLOCATION_FAILED);
 
     memset(&evt, 0, sizeof(evt));
     evt.header.id     = SL_WFX_STARTUP_IND_ID;
@@ -99,16 +95,12 @@ void wfx_connected_notify(int32_t status, sl_wfx_mac_address_t * ap)
 {
     sl_wfx_connect_ind_t evt;
 
-    ChipLogProgress(DeviceLayer, "wfx_connected_notify : started.");
-
     if (status != SUCCESS_STATUS)
     {
         ChipLogProgress(DeviceLayer, "wfx_connected_notify : error: failed status: %ld.", status);
         return;
     }
 
-    ChipLogProgress(DeviceLayer, "wfx_connected_notify : connected.");
-
     memset(&evt, 0, sizeof(evt));
     evt.header.id     = SL_WFX_CONNECT_IND_ID;
     evt.header.length = sizeof evt;
@@ -132,8 +124,6 @@ void wfx_disconnected_notify(int32_t status)
 {
     sl_wfx_disconnect_ind_t evt;
 
-    ChipLogProgress(DeviceLayer, "wfx_disconnected_notify: started.");
-
     memset(&evt, 0, sizeof(evt));
     evt.header.id     = SL_WFX_DISCONNECT_IND_ID;
     evt.header.length = sizeof evt;
@@ -152,8 +142,6 @@ void wfx_ipv6_notify(int got_ip)
 {
     sl_wfx_generic_message_t eventData;
 
-    ChipLogProgress(DeviceLayer, "wfx_ipv6_notify: started.");
-
     memset(&eventData, 0, sizeof(eventData));
     eventData.header.id     = got_ip ? IP_EVENT_GOT_IP6 : IP_EVENT_STA_LOST_IP;
     eventData.header.length = sizeof(eventData.header);
@@ -171,8 +159,6 @@ void wfx_ip_changed_notify(int got_ip)
 {
     sl_wfx_generic_message_t eventData;
 
-    ChipLogProgress(DeviceLayer, "wfx_ip_changed_notify: started.");
-
     memset(&eventData, 0, sizeof(eventData));
     eventData.header.id     = got_ip ? IP_EVENT_STA_GOT_IP : IP_EVENT_STA_LOST_IP;
     eventData.header.length = sizeof(eventData.header);
@@ -200,6 +186,10 @@ void wfx_retry_connection(uint16_t retryAttempt)
             if (osTimerStart(sRetryTimer, pdMS_TO_TICKS(WLAN_RETRY_TIMER_MS)) != osOK)
             {
                 ChipLogProgress(DeviceLayer, "Failed to start retry timer");
+                // Sending the join command if retry timer failed to start
+                if (wfx_connect_to_ap() != SL_STATUS_OK) {
+                    ChipLogError(DeviceLayer, "wfx_connect_to_ap() failed.");
+                } 
                 return;
             }
         }
@@ -222,6 +212,10 @@ void wfx_retry_connection(uint16_t retryAttempt)
         if (osTimerStart(sRetryTimer, pdMS_TO_TICKS(retryInterval)) != osOK)
         {
             ChipLogProgress(DeviceLayer, "Failed to start retry timer");
+            // Sending the join command if retry timer failed to start
+            if (wfx_connect_to_ap() != SL_STATUS_OK) {
+                ChipLogError(DeviceLayer, "wfx_connect_to_ap() failed.");
+            } 
             return;
         }
 #if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI91X_MCU_INTERFACE

From f2b161e34842dc335d950f8a9010625321b997c2 Mon Sep 17 00:00:00 2001
From: chbansal <chirag.bansal@silabs.com>
Date: Sat, 17 Aug 2024 15:52:15 +0530
Subject: [PATCH 11/18] fixing the build and replacing the define

---
 examples/platform/silabs/BaseApplication.h    |  3 +++
 examples/platform/silabs/wifi/wfx_notify.cpp  | 21 +++++++++++--------
 .../silabs/SiWx917/wifi/wfx_host_events.h     |  6 +-----
 .../silabs/efr32/wifi/wfx_host_events.h       |  6 +-----
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/examples/platform/silabs/BaseApplication.h b/examples/platform/silabs/BaseApplication.h
index d2671c5ca2c696..5d757b8ca4672d 100644
--- a/examples/platform/silabs/BaseApplication.h
+++ b/examples/platform/silabs/BaseApplication.h
@@ -72,6 +72,9 @@ class BaseApplicationDelegate : public AppDelegate, public chip::FabricTable::De
     // AppDelegate
     bool isComissioningStarted = false;
     void OnCommissioningSessionStarted() override;
+    void OnCommissioningSessionStopped() override;
+    void OnCommissioningWindowClosed() override;
+
     // FabricTable::Delegate
     void OnFabricCommitted(const chip::FabricTable & fabricTable, chip::FabricIndex fabricIndex) override;
     void OnFabricRemoved(const chip::FabricTable & fabricTable, chip::FabricIndex fabricIndex) override;
diff --git a/examples/platform/silabs/wifi/wfx_notify.cpp b/examples/platform/silabs/wifi/wfx_notify.cpp
index 8ae7503d7ad1b2..06ab1a2b94216a 100644
--- a/examples/platform/silabs/wifi/wfx_notify.cpp
+++ b/examples/platform/silabs/wifi/wfx_notify.cpp
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <icd/server/ICDServerConfig.h>
+#include <app/icd/server/ICDServerConfig.h>
 #include "AppConfig.h"
 #include "BaseApplication.h"
 
@@ -38,7 +38,10 @@ using namespace ::chip;
 using namespace ::chip::DeviceLayer;
 
 namespace {
-uint16_t retryInterval = WLAN_MIN_RETRY_TIMER_MS;
+constexpr uint8_t kWlanMinRetryIntervalsInSec = 1;
+constexpr uint8_t kWlanMaxRetryIntervalsInSec = 60;
+constexpr uint8_t kWlanRetryIntervalInSec = 5;
+uint8_t retryInterval = kWlanMinRetryIntervalsInSec;
 osTimerId_t sRetryTimer; 
 }
 /*
@@ -70,7 +73,7 @@ void wfx_started_notify()
 
     // Creating a timer which will be used to retry connection with AP
     sRetryTimer = osTimerNew(RetryConnectionTimerHandler, osTimerOnce, NULL, NULL);
-    VerifyOrReturnError(sRetryTimer != NULL, SL_STATUS_ALLOCATION_FAILED);
+    VerifyOrReturn(sRetryTimer != NULL);
 
     memset(&evt, 0, sizeof(evt));
     evt.header.id     = SL_WFX_STARTUP_IND_ID;
@@ -182,8 +185,8 @@ void wfx_retry_connection(uint16_t retryAttempt)
         if (retryAttempt < MAX_JOIN_RETRIES_COUNT)
         {
             ChipLogProgress(DeviceLayer, "wfx_retry_connection : Next attempt after %d Seconds",
-                            CONVERT_MS_TO_SEC(WLAN_RETRY_TIMER_MS));
-            if (osTimerStart(sRetryTimer, pdMS_TO_TICKS(WLAN_RETRY_TIMER_MS)) != osOK)
+                            kWlanRetryIntervalInSec);
+            if (osTimerStart(sRetryTimer, pdMS_TO_TICKS(CONVERT_SEC_TO_MS(kWlanRetryIntervalInSec))) != osOK)
             {
                 ChipLogProgress(DeviceLayer, "Failed to start retry timer");
                 // Sending the join command if retry timer failed to start
@@ -205,11 +208,11 @@ void wfx_retry_connection(uint16_t retryAttempt)
          * are telescopic. If interval exceed WLAN_MAX_RETRY_TIMER_MS then it will try to reconnect at
          * WLAN_MAX_RETRY_TIMER_MS intervals.
          */
-        if (retryInterval > WLAN_MAX_RETRY_TIMER_MS)
+        if (retryInterval > kWlanMaxRetryIntervalsInSec)
         {
-            retryInterval = WLAN_MAX_RETRY_TIMER_MS;
+            retryInterval = kWlanMaxRetryIntervalsInSec;
         }
-        if (osTimerStart(sRetryTimer, pdMS_TO_TICKS(retryInterval)) != osOK)
+        if (osTimerStart(sRetryTimer, pdMS_TO_TICKS(CONVERT_SEC_TO_MS(retryInterval))) != osOK)
         {
             ChipLogProgress(DeviceLayer, "Failed to start retry timer");
             // Sending the join command if retry timer failed to start
@@ -221,7 +224,7 @@ void wfx_retry_connection(uint16_t retryAttempt)
 #if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI91X_MCU_INTERFACE
         wfx_rsi_power_save(RSI_SLEEP_MODE_8, STANDBY_POWER_SAVE_WITH_RAM_RETENTION);
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI91X_MCU_INTERFACE
-        ChipLogProgress(DeviceLayer, "wfx_retry_connection : Next attempt after %d Seconds", CONVERT_MS_TO_SEC(retryInterval));
+        ChipLogProgress(DeviceLayer, "wfx_retry_connection : Next attempt after %d Seconds", retryInterval);
         retryInterval += retryInterval;
         return;
     }
diff --git a/src/platform/silabs/SiWx917/wifi/wfx_host_events.h b/src/platform/silabs/SiWx917/wifi/wfx_host_events.h
index 4abb164412b8a7..319a1c508e658d 100644
--- a/src/platform/silabs/SiWx917/wifi/wfx_host_events.h
+++ b/src/platform/silabs/SiWx917/wifi/wfx_host_events.h
@@ -60,11 +60,7 @@
 #define BLE_DRIVER_TASK_PRIORITY (2)
 #define MAX_JOIN_RETRIES_COUNT (5)
 
-// WLAN retry time intervals in milli seconds
-#define WLAN_MAX_RETRY_TIMER_MS 60000
-#define WLAN_MIN_RETRY_TIMER_MS 1000
-#define WLAN_RETRY_TIMER_MS 5000
-#define CONVERT_MS_TO_SEC(TimeInMS) (TimeInMS / 1000)
+#define CONVERT_SEC_TO_MS(TimeInS) (TimeInS * 1000)
 
 // WLAN related Macros
 #define ETH_FRAME (0)
diff --git a/src/platform/silabs/efr32/wifi/wfx_host_events.h b/src/platform/silabs/efr32/wifi/wfx_host_events.h
index 7087621e52747a..66ad95829049b5 100644
--- a/src/platform/silabs/efr32/wifi/wfx_host_events.h
+++ b/src/platform/silabs/efr32/wifi/wfx_host_events.h
@@ -150,11 +150,7 @@ typedef struct __attribute__((__packed__)) sl_wfx_mib_req_s
 // MAX PASSKEY LENGTH including NULL character
 #define WFX_MAX_PASSKEY_LENGTH (64)
 
-// WLAN retry time intervals in milli seconds
-#define WLAN_MAX_RETRY_TIMER_MS 60000
-#define WLAN_MIN_RETRY_TIMER_MS 1000
-#define WLAN_RETRY_TIMER_MS 5000
-#define CONVERT_MS_TO_SEC(TimeInMS) (TimeInMS / 1000)
+#define CONVERT_SEC_TO_MS(TimeInS) (TimeInMS * 1000)
 
 // WLAN MAX retry
 #define MAX_JOIN_RETRIES_COUNT 5

From 581140229e70aa2a3ff3bcd0d5f4d386bdbf1d5d Mon Sep 17 00:00:00 2001
From: chbansal <chirag.bansal@silabs.com>
Date: Sat, 17 Aug 2024 15:55:42 +0530
Subject: [PATCH 12/18] removing the unused else case

---
 examples/platform/silabs/efr32/rs911x/rsi_if.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/examples/platform/silabs/efr32/rs911x/rsi_if.c b/examples/platform/silabs/efr32/rs911x/rsi_if.c
index 7ce148df5c0ff5..8c52edfe005535 100644
--- a/examples/platform/silabs/efr32/rs911x/rsi_if.c
+++ b/examples/platform/silabs/efr32/rs911x/rsi_if.c
@@ -580,10 +580,6 @@ static void wfx_rsi_do_join(void)
             SILABS_LOG("wfx_rsi_do_join: rsi_wlan_connect_async failed with status: %02x on try %d", status, wfx_rsi.join_retries);
             wfx_retry_connection(++wfx_rsi.join_retries);
         }
-        else
-        {
-            SILABS_LOG("wfx_rsi_do_join: starting JOIN to %s after %d tries\n", (char *) &wfx_rsi.sec.ssid[0], wfx_rsi.join_retries);
-        }
     }
 }
 

From 2ff20110e096706e9bd5a585025daef88dc986da Mon Sep 17 00:00:00 2001
From: chirag-silabs <100861685+chirag-silabs@users.noreply.github.com>
Date: Sat, 17 Aug 2024 15:56:50 +0530
Subject: [PATCH 13/18] Update third_party/silabs/efr32_sdk.gni

Co-authored-by: mkardous-silabs <84793247+mkardous-silabs@users.noreply.github.com>
---
 third_party/silabs/efr32_sdk.gni | 1 +
 1 file changed, 1 insertion(+)

diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
index 1fd49ff90174fe..e8aafeb599e43d 100644
--- a/third_party/silabs/efr32_sdk.gni
+++ b/third_party/silabs/efr32_sdk.gni
@@ -87,6 +87,7 @@ declare_args() {
 examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
 silabs_plat_efr32_wifi_dir = "${chip_root}/src/platform/silabs/efr32/wifi"
 silabs_common_plat_dir = "${chip_root}/examples/platform/silabs"
+
 is_series_2 = silabs_family == "mgm24" || silabs_family == "efr32mg24" ||
               silabs_family == "efr32mg26"
 

From 4f05f52c857142e97f84a8f77d099ca2cc2ed5b7 Mon Sep 17 00:00:00 2001
From: chbansal <chirag.bansal@silabs.com>
Date: Sat, 17 Aug 2024 15:58:30 +0530
Subject: [PATCH 14/18] addressing the review comments

---
 examples/platform/silabs/wifi/wfx_notify.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/examples/platform/silabs/wifi/wfx_notify.cpp b/examples/platform/silabs/wifi/wfx_notify.cpp
index 06ab1a2b94216a..a894dea06c2d84 100644
--- a/examples/platform/silabs/wifi/wfx_notify.cpp
+++ b/examples/platform/silabs/wifi/wfx_notify.cpp
@@ -98,11 +98,7 @@ void wfx_connected_notify(int32_t status, sl_wfx_mac_address_t * ap)
 {
     sl_wfx_connect_ind_t evt;
 
-    if (status != SUCCESS_STATUS)
-    {
-        ChipLogProgress(DeviceLayer, "wfx_connected_notify : error: failed status: %ld.", status);
-        return;
-    }
+    VerifyOrReturn(status != SUCCESS_STATUS)
 
     memset(&evt, 0, sizeof(evt));
     evt.header.id     = SL_WFX_CONNECT_IND_ID;

From be7e1aef78c18182aa9b8ba4bf4ab97a2d2b1aa3 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Sat, 17 Aug 2024 10:28:56 +0000
Subject: [PATCH 15/18] Restyled by whitespace

---
 examples/platform/silabs/wifi/wfx_notify.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/platform/silabs/wifi/wfx_notify.cpp b/examples/platform/silabs/wifi/wfx_notify.cpp
index a894dea06c2d84..d81014c6b71fbd 100644
--- a/examples/platform/silabs/wifi/wfx_notify.cpp
+++ b/examples/platform/silabs/wifi/wfx_notify.cpp
@@ -42,7 +42,7 @@ constexpr uint8_t kWlanMinRetryIntervalsInSec = 1;
 constexpr uint8_t kWlanMaxRetryIntervalsInSec = 60;
 constexpr uint8_t kWlanRetryIntervalInSec = 5;
 uint8_t retryInterval = kWlanMinRetryIntervalsInSec;
-osTimerId_t sRetryTimer; 
+osTimerId_t sRetryTimer;
 }
 /*
  * Notifications to the upper-layer
@@ -188,7 +188,7 @@ void wfx_retry_connection(uint16_t retryAttempt)
                 // Sending the join command if retry timer failed to start
                 if (wfx_connect_to_ap() != SL_STATUS_OK) {
                     ChipLogError(DeviceLayer, "wfx_connect_to_ap() failed.");
-                } 
+                }
                 return;
             }
         }
@@ -214,7 +214,7 @@ void wfx_retry_connection(uint16_t retryAttempt)
             // Sending the join command if retry timer failed to start
             if (wfx_connect_to_ap() != SL_STATUS_OK) {
                 ChipLogError(DeviceLayer, "wfx_connect_to_ap() failed.");
-            } 
+            }
             return;
         }
 #if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI91X_MCU_INTERFACE

From a6a9734fc374f9ed03a971d62de2dc96f57617b4 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Sat, 17 Aug 2024 10:28:57 +0000
Subject: [PATCH 16/18] Restyled by clang-format

---
 .../platform/silabs/efr32/rs911x/rsi_if.c     |  3 ++-
 examples/platform/silabs/wifi/wfx_notify.cpp  | 23 ++++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/examples/platform/silabs/efr32/rs911x/rsi_if.c b/examples/platform/silabs/efr32/rs911x/rsi_if.c
index 8c52edfe005535..5279f99d84526a 100644
--- a/examples/platform/silabs/efr32/rs911x/rsi_if.c
+++ b/examples/platform/silabs/efr32/rs911x/rsi_if.c
@@ -511,7 +511,8 @@ static void wfx_rsi_save_ap_info() // translation
         break;
     }
 
-    SILABS_LOG("wfx_rsi_save_ap_info: WLAN: connecting to %s, sec=%d, status=%02x", &wfx_rsi.sec.ssid[0], wfx_rsi.sec.security, status);
+    SILABS_LOG("wfx_rsi_save_ap_info: WLAN: connecting to %s, sec=%d, status=%02x", &wfx_rsi.sec.ssid[0], wfx_rsi.sec.security,
+               status);
 }
 
 /********************************************************************************************
diff --git a/examples/platform/silabs/wifi/wfx_notify.cpp b/examples/platform/silabs/wifi/wfx_notify.cpp
index d81014c6b71fbd..637f057ab9471f 100644
--- a/examples/platform/silabs/wifi/wfx_notify.cpp
+++ b/examples/platform/silabs/wifi/wfx_notify.cpp
@@ -15,12 +15,12 @@
  *    limitations under the License.
  */
 
+#include "AppConfig.h"
+#include "BaseApplication.h"
+#include <app/icd/server/ICDServerConfig.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <app/icd/server/ICDServerConfig.h>
-#include "AppConfig.h"
-#include "BaseApplication.h"
 
 #include "FreeRTOS.h"
 #include "event_groups.h"
@@ -40,10 +40,10 @@ using namespace ::chip::DeviceLayer;
 namespace {
 constexpr uint8_t kWlanMinRetryIntervalsInSec = 1;
 constexpr uint8_t kWlanMaxRetryIntervalsInSec = 60;
-constexpr uint8_t kWlanRetryIntervalInSec = 5;
-uint8_t retryInterval = kWlanMinRetryIntervalsInSec;
+constexpr uint8_t kWlanRetryIntervalInSec     = 5;
+uint8_t retryInterval                         = kWlanMinRetryIntervalsInSec;
 osTimerId_t sRetryTimer;
-}
+} // namespace
 /*
  * Notifications to the upper-layer
  * All done in the context of the RSI/WiFi task (rsi_if.c)
@@ -100,7 +100,7 @@ void wfx_connected_notify(int32_t status, sl_wfx_mac_address_t * ap)
 
     VerifyOrReturn(status != SUCCESS_STATUS)
 
-    memset(&evt, 0, sizeof(evt));
+        memset(&evt, 0, sizeof(evt));
     evt.header.id     = SL_WFX_CONNECT_IND_ID;
     evt.header.length = sizeof evt;
 
@@ -180,13 +180,13 @@ void wfx_retry_connection(uint16_t retryAttempt)
     {
         if (retryAttempt < MAX_JOIN_RETRIES_COUNT)
         {
-            ChipLogProgress(DeviceLayer, "wfx_retry_connection : Next attempt after %d Seconds",
-                            kWlanRetryIntervalInSec);
+            ChipLogProgress(DeviceLayer, "wfx_retry_connection : Next attempt after %d Seconds", kWlanRetryIntervalInSec);
             if (osTimerStart(sRetryTimer, pdMS_TO_TICKS(CONVERT_SEC_TO_MS(kWlanRetryIntervalInSec))) != osOK)
             {
                 ChipLogProgress(DeviceLayer, "Failed to start retry timer");
                 // Sending the join command if retry timer failed to start
-                if (wfx_connect_to_ap() != SL_STATUS_OK) {
+                if (wfx_connect_to_ap() != SL_STATUS_OK)
+                {
                     ChipLogError(DeviceLayer, "wfx_connect_to_ap() failed.");
                 }
                 return;
@@ -212,7 +212,8 @@ void wfx_retry_connection(uint16_t retryAttempt)
         {
             ChipLogProgress(DeviceLayer, "Failed to start retry timer");
             // Sending the join command if retry timer failed to start
-            if (wfx_connect_to_ap() != SL_STATUS_OK) {
+            if (wfx_connect_to_ap() != SL_STATUS_OK)
+            {
                 ChipLogError(DeviceLayer, "wfx_connect_to_ap() failed.");
             }
             return;

From 2562468a45a596b2b556aafc9f36c251de180541 Mon Sep 17 00:00:00 2001
From: chbansal <chirag.bansal@silabs.com>
Date: Sat, 17 Aug 2024 17:08:25 +0530
Subject: [PATCH 17/18] fixing the build

---
 examples/platform/silabs/wifi/wfx_notify.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/platform/silabs/wifi/wfx_notify.cpp b/examples/platform/silabs/wifi/wfx_notify.cpp
index 637f057ab9471f..a37b102c334804 100644
--- a/examples/platform/silabs/wifi/wfx_notify.cpp
+++ b/examples/platform/silabs/wifi/wfx_notify.cpp
@@ -98,9 +98,9 @@ void wfx_connected_notify(int32_t status, sl_wfx_mac_address_t * ap)
 {
     sl_wfx_connect_ind_t evt;
 
-    VerifyOrReturn(status != SUCCESS_STATUS)
+    VerifyOrReturn(status != SUCCESS_STATUS);
 
-        memset(&evt, 0, sizeof(evt));
+    memset(&evt, 0, sizeof(evt));
     evt.header.id     = SL_WFX_CONNECT_IND_ID;
     evt.header.length = sizeof evt;
 

From ca91d6dae39ba5912324d69f6bc2a496ece803b1 Mon Sep 17 00:00:00 2001
From: chbansal <chirag.bansal@silabs.com>
Date: Sun, 18 Aug 2024 14:05:30 +0530
Subject: [PATCH 18/18] fixing the efr32 build

---
 src/platform/silabs/efr32/wifi/wfx_host_events.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/platform/silabs/efr32/wifi/wfx_host_events.h b/src/platform/silabs/efr32/wifi/wfx_host_events.h
index 66ad95829049b5..51f96d7b9dbc73 100644
--- a/src/platform/silabs/efr32/wifi/wfx_host_events.h
+++ b/src/platform/silabs/efr32/wifi/wfx_host_events.h
@@ -150,7 +150,7 @@ typedef struct __attribute__((__packed__)) sl_wfx_mib_req_s
 // MAX PASSKEY LENGTH including NULL character
 #define WFX_MAX_PASSKEY_LENGTH (64)
 
-#define CONVERT_SEC_TO_MS(TimeInS) (TimeInMS * 1000)
+#define CONVERT_SEC_TO_MS(TimeInS) (TimeInS * 1000)
 
 // WLAN MAX retry
 #define MAX_JOIN_RETRIES_COUNT 5