[SL-UP] Adds fix for Sleep Manager on RS9116 (#154)

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

Author: rosahay-silabs

examples/platform/silabs/MatterConfig.cpp

@@ -48,12 +48,12 @@
 #include "MemMonitoring.h"
 #endif
 
-#if ((defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1) || defined(EXP_BOARD))
+#if RS911X_WIFI
 #include <platform/silabs/wifi/wiseconnect-abstraction/WiseconnectInterfaceAbstraction.h>
-#if !defined(EXP_BOARD)
+#if (defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1)
 #include <platform/silabs/SiWx917/SiWxPlatformInterface.h>
-#endif //! defined(EXP_BOARD)
-#endif // ( ( defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1 ) || defined(EXP_BOARD) )
+#endif // (defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1)
+#endif // RS911X_WIFI
 
 #include <crypto/CHIPCryptoPAL.h>
 // If building with the EFR32-provided crypto backend, we can use the
@@ -377,9 +377,9 @@ CHIP_ERROR SilabsMatterConfig::InitWiFi(void)
 #endif // SL_WFX_USE_SECURE_LINK
 #endif // WF200_WIFI
 
-#if ((defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1) || defined(EXP_BOARD))
+#if (RS911X_WIFI)
     VerifyOrReturnError(sl_matter_wifi_platform_init() == SL_STATUS_OK, CHIP_ERROR_INTERNAL);
-#endif // ( ( defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1 ) || defined(EXP_BOARD) )
+#endif // (RS911X_WIFI))
 
     return CHIP_NO_ERROR;
 }

src/platform/silabs/rs911x/BLEManagerImpl.cpp

@@ -52,8 +52,6 @@ extern "C" {
 #define BLE_TIMEOUT_MS 400
 #define BLE_SEND_INDICATION_TIMER_PERIOD_MS (5000)
 
-osSemaphoreId_t sl_rs_ble_init_sem;
-
 using namespace ::chip;
 using namespace ::chip::Ble;
 using namespace ::chip::DeviceLayer::Internal;
@@ -234,9 +232,6 @@ void BLEManagerImpl::sl_ble_event_handling_task(void * args)
     sl_status_t status;
     SilabsBleWrapper::BleEvent_t bleEvent;
 
-    //! This semaphore is waiting for wifi module initialization.
-    osSemaphoreAcquire(sl_rs_ble_init_sem, osWaitForever);
-
     // This function initialize BLE and start BLE advertisement.
     sInstance.sl_ble_init();
 
@@ -288,8 +283,6 @@ CHIP_ERROR BLEManagerImpl::_Init()
 {
     CHIP_ERROR err;
 
-    sl_rs_ble_init_sem = osSemaphoreNew(1, 0, NULL);
-
     sBleThread = osThreadNew(sInstance.sl_ble_event_handling_task, NULL, &kBleTaskAttr);
 
     VerifyOrReturnError(sBleThread != nullptr, CHIP_ERROR_INCORRECT_STATE);
@@ -643,10 +636,7 @@ CHIP_ERROR BLEManagerImpl::ConfigureAdvertisingData(void)
         ChipLogError(DeviceLayer, "rsi_ble_set_advertise_data() failed: %ld", result);
         ExitNow();
     }
-    else
-    {
-        ChipLogError(DeviceLayer, "rsi_ble_set_advertise_data() success: %ld", result);
-    }
+
     index                 = 0;
     responseData[index++] = 0x02;                     // length
     responseData[index++] = CHIP_ADV_DATA_TYPE_FLAGS; // AD type : flags
@@ -731,7 +721,10 @@ CHIP_ERROR BLEManagerImpl::StartAdvertising(void)
 
 exit:
     // TODO: Add MapBLEError to return the correct error code
-    ChipLogError(DeviceLayer, "StartAdvertising() End error: %s", ErrorStr(err));
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "StartAdvertising() End error: %s", ErrorStr(err));
+    }
     return err;
 }
 

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

@@ -83,7 +83,6 @@ extern "C" {
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
 WfxRsi_t wfx_rsi;
-extern osSemaphoreId_t sl_rs_ble_init_sem;
 
 namespace {
 
@@ -116,7 +115,7 @@ osMessageQueueId_t sWifiEventQueue = nullptr;
 sl_net_wifi_lwip_context_t wifi_client_context;
 sl_wifi_security_t security = SL_WIFI_SECURITY_UNKNOWN;
 
-// TODO : Temporary work-around for wifi-init failure in 917NCP ACX module board(BRD4357A). Can be removed after 
+// TODO : Temporary work-around for wifi-init failure in 917NCP ACX module board(BRD4357A). Can be removed after
 // Wiseconnect fixes region code for all ACX module boards.
 #ifdef EXP_BOARD
 #define REGION_CODE IGNORE_REGION
@@ -284,7 +283,6 @@ sl_status_t sl_wifi_siwx917_init(void)
 #endif // SL_MBEDTLS_USE_TINYCRYPT
 
     wfx_rsi.dev_state.Set(WifiState::kStationInit);
-    osSemaphoreRelease(sl_rs_ble_init_sem);
     return status;
 }
 
@@ -409,11 +407,11 @@ sl_status_t SetWifiConfigurations()
 /**
  * @brief Callback function for the SL_WIFI_JOIN_EVENTS group
  *
- * This callback handler will be invoked when any event within join event group occurs, providing the event details and any associated data
- * The callback doesn't get called when we join a network using the sl net APIs
+ * This callback handler will be invoked when any event within join event group occurs, providing the event details and any
+ * associated data The callback doesn't get called when we join a network using the sl net APIs
+ *
+ * @note In case of failure, the 'result' parameter will be of type sl_status_t, and the 'resultLenght' parameter should be ignored
  *
-  * @note In case of failure, the 'result' parameter will be of type sl_status_t, and the 'resultLenght' parameter should be ignored
-  *
  * @param[in] event sl_wifi_event_t that triggered the callback
  * @param[in] result Pointer to the response data received
  * @param[in] result_length Length of the data received in bytes
@@ -478,7 +476,7 @@ sl_status_t JoinWifiNetwork(void)
     // failure only happens when the firmware returns an error
     ChipLogError(DeviceLayer, "sl_net_up failed: 0x%lx", static_cast<uint32_t>(status));
 
-    //Deactivate the network interface before activating it on the next retry.
+    // Deactivate the network interface before activating it on the next retry.
     if ((status == SL_STATUS_SI91X_SCAN_ISSUED_IN_ASSOCIATED_STATE) || (status == SL_STATUS_SI91X_COMMAND_GIVEN_IN_INVALID_STATE))
     {
         status = sl_net_down((sl_net_interface_t) SL_NET_WIFI_CLIENT_INTERFACE);
@@ -906,7 +904,7 @@ void wfx_dhcp_got_ipv4(uint32_t ip)
     /*
      * Acquire the new IP address
      */
-    wfx_rsi.ip4_addr[0] = (ip) & 0xFF;
+    wfx_rsi.ip4_addr[0] = (ip) &0xFF;
     wfx_rsi.ip4_addr[1] = (ip >> 8) & 0xFF;
     wfx_rsi.ip4_addr[2] = (ip >> 16) & 0xFF;
     wfx_rsi.ip4_addr[3] = (ip >> 24) & 0xFF;
@@ -922,7 +920,7 @@ void wfx_dhcp_got_ipv4(uint32_t ip)
 sl_status_t ConfigurePowerSave(rsi_power_save_profile_mode_t sl_si91x_ble_state, sl_si91x_performance_profile_t sl_si91x_wifi_state,
                                uint32_t listenInterval)
 {
-    int32_t error = rsi_bt_power_save_profile(sl_si91x_ble_state, 0);
+    int32_t error = rsi_bt_power_save_profile(sl_si91x_ble_state, RSI_MAX_PSP);
     VerifyOrReturnError(error == RSI_SUCCESS, SL_STATUS_FAIL,
                         ChipLogError(DeviceLayer, "rsi_bt_power_save_profile failed: %ld", error));
 

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

@@ -32,14 +32,15 @@ namespace {
  */
 CHIP_ERROR ConfigureLIBasedSleep()
 {
+    VerifyOrReturnError(ConfigureBroadcastFilter(true) == SL_STATUS_OK, CHIP_ERROR_INTERNAL,
+                        ChipLogError(DeviceLayer, "Failed to configure broadcasts filter."));
+    
+    // Allowing the device to go to sleep must be the last actions to avoid configuration failures.
     VerifyOrReturnError(ConfigurePowerSave(RSI_SLEEP_MODE_2, ASSOCIATED_POWER_SAVE,
                                            chip::ICDConfigurationData::GetInstance().GetSlowPollingInterval().count()) ==
                             SL_STATUS_OK,
                         CHIP_ERROR_INTERNAL, ChipLogError(DeviceLayer, "Failed to enable LI based sleep."));
 
-    VerifyOrReturnError(ConfigureBroadcastFilter(true) == SL_STATUS_OK, CHIP_ERROR_INTERNAL,
-                        ChipLogError(DeviceLayer, "Failed to configure broadcasts filter."));
-
     return CHIP_NO_ERROR;
 }
 
@@ -51,12 +52,13 @@ CHIP_ERROR ConfigureLIBasedSleep()
  */
 CHIP_ERROR ConfigureDTIMBasedSleep()
 {
-    VerifyOrReturnError(ConfigurePowerSave(RSI_SLEEP_MODE_2, ASSOCIATED_POWER_SAVE, 0) == SL_STATUS_OK, CHIP_ERROR_INTERNAL,
-                        ChipLogError(DeviceLayer, "Failed to enable to enable DTIM basedsleep."));
-
     VerifyOrReturnError(ConfigureBroadcastFilter(false) == SL_STATUS_OK, CHIP_ERROR_INTERNAL,
                         ChipLogError(DeviceLayer, "Failed to configure broadcast filter."));
 
+    // Allowing the device to go to sleep must be the last actions to avoid configuration failures.
+    VerifyOrReturnError(ConfigurePowerSave(RSI_SLEEP_MODE_2, ASSOCIATED_POWER_SAVE, 0) == SL_STATUS_OK, CHIP_ERROR_INTERNAL,
+                        ChipLogError(DeviceLayer, "Failed to enable to enable DTIM basedsleep."));
+
     return CHIP_NO_ERROR;
 }
 

src/platform/silabs/wifi/lwip-support/ethernetif.cpp

@@ -414,7 +414,7 @@ static err_t low_level_output(struct netif * netif, struct pbuf * p)
     status = wfx_rsi_send_data(packet, datalength);
     if (status != 0)
     {
-        ChipLogError(DeviceLayer, "*ERR*EN-RSI:Send fail: %ld", status);
+        ChipLogError(DeviceLayer, "wfx_rsi_send_data failed: %ld", status);
         xSemaphoreGive(ethout_sem);
         return ERR_IF;
     }

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

@@ -77,10 +77,6 @@ bool hasNotifiedIPV4 = false;
 #endif /* CHIP_DEVICE_CONFIG_ENABLE_IPV4 */
 bool hasNotifiedWifiConnectivity = false;
 
-#if (RSI_BLE_ENABLE)
-extern rsi_semaphore_handle_t sl_rs_ble_init_sem;
-#endif
-
 // DHCP Poll timer
 static osTimerId_t sDHCPTimer;
 static osMessageQueueId_t sWifiEventQueue = NULL;
@@ -365,7 +361,7 @@ static int32_t sl_matter_wifi_init(void)
     }
 
     buf[sizeof(buf) - 1] = 0;
-    ChipLogProgress(DeviceLayer, "RSI firmware version: %s", buf);
+
     //! Send feature frame
     if ((status = rsi_send_feature_frame()) != RSI_SUCCESS)
     {
@@ -382,6 +378,7 @@ static int32_t sl_matter_wifi_init(void)
         return status;
     }
 
+    ChipLogProgress(DeviceLayer, "rsi_firmware_version: %s", buf);
     ChipLogDetail(DeviceLayer, "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]);
 
@@ -414,10 +411,6 @@ static int32_t sl_matter_wifi_init(void)
         return status;
     }
 
-#if (RSI_BLE_ENABLE)
-    rsi_semaphore_post(&sl_rs_ble_init_sem);
-#endif
-
     wfx_rsi.dev_state.Set(WifiState::kStationInit);
     return RSI_SUCCESS;
 }
@@ -776,6 +769,12 @@ void ProcessEvent(WifiEvent event)
     }
 }
 
+sl_status_t sl_matter_wifi_platform_init(void)
+{
+    VerifyOrReturnError(sl_matter_wifi_init() == RSI_SUCCESS, SL_STATUS_FAIL);
+    return SL_STATUS_OK;
+}
+
 /*********************************************************************************
  * @fn  void sl_matter_wifi_task(void *arg)
  * @brief
@@ -790,12 +789,6 @@ void ProcessEvent(WifiEvent event)
 void sl_matter_wifi_task(void * arg)
 {
     (void) arg;
-    uint32_t rsi_status = sl_matter_wifi_init();
-    if (rsi_status != RSI_SUCCESS)
-    {
-        ChipLogError(DeviceLayer, "sl_matter_wifi_task: sl_matter_wifi_init failed: %ld", rsi_status);
-        return;
-    }
     WifiEvent event;
     sl_matter_lwip_start();
     sl_matter_wifi_task_started();
@@ -928,7 +921,7 @@ int32_t wfx_rsi_send_data(void * p, uint16_t len)
     return status;
 }
 
-#if SL_ICD_ENABLED
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
 /*********************************************************************
  * @fn  sl_status_t ConfigurePowerSave(void)
  * @brief
@@ -959,4 +952,4 @@ sl_status_t ConfigurePowerSave(void)
     ChipLogDetail(DeviceLayer, "Powersave Config Success");
     return SL_STATUS_OK;
 }
-#endif /* SL_ICD_ENABLED */
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER

src/platform/silabs/wifi/rs911x/platform/efx32_ncp_host.c

@@ -26,16 +26,16 @@
 #include "sl_constants.h"
 #include "sl_rsi_utility.h"
 #include "sl_si91x_host_interface.h"
-#include "sl_si91x_status.h"
 #include "sl_si91x_ncp_utility.h"
+#include "sl_si91x_status.h"
+#include "sl_spidrv_exp_config.h"
+#include "sl_spidrv_instances.h"
 #include "sl_status.h"
 #include "sl_wifi_constants.h"
+#include "spidrv.h"
 #include <platform/silabs/wifi/wf200/platform/spi_multiplex.h>
 #include <stdbool.h>
 #include <string.h>
-#include "sl_spidrv_exp_config.h"
-#include "sl_spidrv_instances.h"
-#include "spidrv.h"
 
 #if defined(SL_CATLOG_POWER_MANAGER_PRESENT)
 #include "sl_power_manager.h"
@@ -45,15 +45,14 @@
 #include "sl_board_control.h"
 #endif // SL_BOARD_NAME
 
-
 #define LDMA_MAX_TRANSFER_LENGTH 4096
 #define LDMA_DESCRIPTOR_ARRAY_LENGTH (LDMA_MAX_TRANSFER_LENGTH / 2048)
 #define SPI_HANDLE sl_spidrv_exp_handle
 #define MAX_DATA_PACKET_SIZE 1800
 
 // use SPI handle for EXP header (configured in project settings)
 extern SPIDRV_Handle_t sl_spidrv_exp_handle;
-static uint8_t dummy_buffer[MAX_DATA_PACKET_SIZE] = { 0 };
+static uint8_t dummy_buffer[MAX_DATA_PACKET_SIZE]   = { 0 };
 static sl_si91x_host_init_configuration init_config = { 0 };
 
 uint32_t rx_ldma_channel;