clean up and address review comments

Author: mkardous-silabs

examples/platform/silabs/BaseApplication.cpp

@@ -902,10 +902,12 @@ void BaseApplication::OnPlatformEvent(const ChipDeviceEvent * event, intptr_t)
         if ((event->ThreadConnectivityChange.Result == kConnectivity_Established) ||
             (event->InternetConnectivityChange.IPv6 == kConnectivity_Established))
         {
-#if SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
+#if SL_WIFI
             chip::app::DnssdServer::Instance().StartServer();
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
             WifiSleepManager::GetInstance().HandleInternetConnectivityChange();
-#endif // SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
+#endif // SL_WIFI
 
 #if SILABS_OTA_ENABLED
             ChipLogProgress(AppServer, "Scheduling OTA Requestor initialization");

examples/platform/silabs/MatterConfig.cpp

@@ -49,10 +49,6 @@
 #include <platform/silabs/wifi/wiseconnect-abstraction/WiseconnectInterfaceAbstraction.h>
 #endif // SLI_SI91X_MCU_INTERFACE
 
-// TODO: Add suport for the WF200 in the WifiSleepManager
-#if defined(RS911X_WIFI) || SLI_SI91X_MCU_INTERFACE
-#endif // defined(RS911X_WIFI) || SLI_SI91X_MCU_INTERFACE
-
 #include <crypto/CHIPCryptoPAL.h>
 // If building with the EFR32-provided crypto backend, we can use the
 // opaque keystore

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

@@ -865,15 +865,7 @@ void wfx_dhcp_got_ipv4(uint32_t ip)
 #endif /* CHIP_DEVICE_CONFIG_ENABLE_IPV4 */
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-/**
- * @brief
- *
- * @param sl_si91x_ble_state
- * @param sl_si91x_wifi_state
- * @param listenInterval
- * @param enableBroadcastFilter
- * @return sl_status_t
- */
+
 sl_status_t wfx_power_save(rsi_power_save_profile_mode_t sl_si91x_ble_state, sl_si91x_performance_profile_t sl_si91x_wifi_state,
                            uint32_t listenInterval)
 {
@@ -893,18 +885,4 @@ sl_status_t wfx_power_save(rsi_power_save_profile_mode_t sl_si91x_ble_state, sl_
 
     return status;
 }
-
-sl_status_t ConfigureBroadcastFilter(bool enableBroadcastFilter)
-{
-    sl_status_t status = SL_STATUS_OK;
-
-    uint16_t beaconDropThreshold = (enableBroadcastFilter) ? kTimeToFullBeaconReception : 0;
-    uint8_t filterBcastInTim     = (enableBroadcastFilter) ? 1 : 0;
-
-    status = sl_wifi_filter_broadcast(5000, 1, 1 /* valid till next update*/);
-    VerifyOrReturnError(status == SL_STATUS_OK, status,
-                        ChipLogError(DeviceLayer, "sl_wifi_filter_broadcast failed: 0x%lx", static_cast<uint32_t>(status)));
-
-    return status;
-}
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER

src/platform/silabs/wifi/WifiInterfaceAbstraction.h

@@ -260,15 +260,6 @@ sl_status_t wfx_power_save(rsi_power_save_profile_mode_t sl_si91x_ble_state, sl_
 sl_status_t wfx_power_save();
 #endif /* (SLI_SI91X_MCU_INTERFACE | EXP_BOARD) */
 #endif /* RS911X_WIFI */
-
-/**
- * @brief Configures the broadcast filter.
- *
- * @param[in] enableBroadcastFilter Boolean to enable or disable the broadcast filter.
- * @return sl_status_t Returns the status of the operation.
- */
-sl_status_t ConfigureBroadcastFilter(bool enableBroadcastFilter);
-
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
 void sl_matter_wifi_task(void * arg);

src/platform/silabs/wifi/icd/WifiSleepManager.cpp

@@ -36,14 +36,15 @@ CHIP_ERROR WifiSleepManager::Init()
 
 void WifiSleepManager::HandleCommissioningComplete()
 {
-    TransitionToLowPowerMode();
+    VerifyAndTransitionToLowPowerMode();
 }
 
 void WifiSleepManager::HandleInternetConnectivityChange()
 {
+    // TODO: Centralize the buisness logic in the VerifyAndTransitionToLowPowerMode
     if (!isCommissioningInProgress)
     {
-        TransitionToLowPowerMode();
+        VerifyAndTransitionToLowPowerMode();
     }
 }
 
@@ -69,8 +70,6 @@ CHIP_ERROR WifiSleepManager::RequestHighPerformance()
 #if SLI_SI917 // 917 SoC & NCP
         VerifyOrReturnError(wfx_power_save(RSI_ACTIVE, HIGH_PERFORMANCE, 0) == SL_STATUS_OK, CHIP_ERROR_INTERNAL,
                             ChipLogError(DeviceLayer, "Failed to set Wi-FI configuration to HighPerformance"));
-        VerifyOrReturnError(ConfigureBroadcastFilter(false) == SL_STATUS_OK, CHIP_ERROR_INTERNAL,
-                            ChipLogError(DeviceLayer, "Failed to disable broadcast filter"));
 #endif // SLI_SI917
     }
 
@@ -85,17 +84,15 @@ CHIP_ERROR WifiSleepManager::RemoveHighPerformanceRequest()
 
     mHighPerformanceRequestCounter--;
 
-    if (mHighPerformanceRequestCounter == 0)
-    {
-        ReturnErrorOnFailure(TransitionToLowPowerMode());
-    }
+    // We don't do the mHighPerformanceRequestCounter check here; the check is in TransitionToLowPowerMode function
+    ReturnErrorOnFailure(VerifyAndTransitionToLowPowerMode());
 
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR WifiSleepManager::TransitionToLowPowerMode()
+CHIP_ERROR WifiSleepManager::VerifyAndTransitionToLowPowerMode()
 {
-    VerifyOrReturnError(mHighPerformanceRequestCounter == 0, CHIP_NO_ERROR,
+    VerifyOrReturnValue(mHighPerformanceRequestCounter == 0, CHIP_NO_ERROR,
                         ChipLogDetail(DeviceLayer, "High Performance Requested - Device cannot go to a lower power mode."));
 
 #if SLI_SI917 // 917 SoC & NCP

src/platform/silabs/wifi/icd/WifiSleepManager.h

@@ -74,12 +74,15 @@ class WifiSleepManager
     ~WifiSleepManager() = default;
 
     /**
-     * @brief Transition the device to the Lowest Power State.
+     * @brief Function validates what is the lowest power mode the device can got to and transitions the device to a low pwoer
+     *        state.
+     *        - Unprovisionned and no commissioning in progress: Deep Sleep
+     *        - Otherwise, DTIM based low power mode
      *
      * @return CHIP_ERROR CHIP_NO_ERROR if the device was transitionned to low power
      *         CHIP_ERROR_INTERNAL if an error occured
      */
-    CHIP_ERROR TransitionToLowPowerMode();
+    CHIP_ERROR VerifyAndTransitionToLowPowerMode();
 
     static WifiSleepManager mInstance;
     bool isCommissioningInProgress = false;