[Silabs] Fix 917 init sequence (#40178)

* TA and WiFi task must run before reading wifi credential in nvm

* handle/return possible error of the networkcommissioning Init

* Address comments and move some init to regroup them and reduce #ifdefs

Author: jmartinez-silabs

examples/platform/silabs/MatterConfig.cpp

@@ -91,7 +91,7 @@ static chip::DeviceLayer::Internal::Efr32PsaOperationalKeystore gOperationalKeys
 #include <platform/silabs/platformAbstraction/SilabsPlatform.h>
 #include <platform/silabs/tracing/SilabsTracingMacros.h>
 #if MATTER_TRACING_ENABLED
-#include <platform/silabs/tracing/BackendImpl.h>
+#include <platform/silabs/tracing/BackendImpl.h> // nogncheck
 #include <tracing/registry.h>
 #endif // MATTER_TRACING_ENABLED
 
@@ -248,13 +248,6 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
 {
     using namespace chip::DeviceLayer::Silabs;
 
-    CHIP_ERROR err;
-#ifdef SL_WIFI
-    // Because OpenThread needs to use memory allocation during its Key operations, we initialize the memory management for thread
-    // and set the allocation functions inside sl_ot_create_instance, which is called by sl_system_init in the OpenThread stack
-    // initialization.
-    mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);
-#endif
     ChipLogProgress(DeviceLayer, "==================================================");
     ChipLogProgress(DeviceLayer, "%s starting", appName);
     ChipLogProgress(DeviceLayer, "==================================================");
@@ -274,9 +267,11 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
 
 #ifdef SL_WIFI
     // Init Chip memory management before the stack
-    // See comment above about OpenThread memory allocation as to why this is WIFI only here.
+    // Because OpenThread needs to use memory allocation during its Key operations, we initialize the memory management for thread
+    // and set the allocation functions inside sl_ot_create_instance, which is called earlier by sl_system_init.
+    mbedtls_platform_set_calloc_free(CHIPPlatformMemoryCalloc, CHIPPlatformMemoryFree);
     ReturnErrorOnFailure(chip::Platform::MemoryInit());
-    ReturnErrorOnFailure(InitWiFi());
+    ReturnErrorOnFailure(WifiInterface::GetInstance().InitWiFiStack());
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
     ReturnErrorOnFailure(WifiSleepManager::GetInstance().Init(&WifiInterface::GetInstance(), &WifiInterface::GetInstance()));
@@ -294,17 +289,29 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
     SetCommissionableDataProvider(&provision.GetStorage());
     ChipLogProgress(DeviceLayer, "Provision mode %s", provision.IsProvisionRequired() ? "ENABLED" : "disabled");
 
+    // Create initParams with SDK example defaults here
+    // TODO: replace with our own init param to avoid double allocation in examples
+    static chip::CommonCaseDeviceServerInitParams initParams;
+
 #if CHIP_ENABLE_OPENTHREAD
     ReturnErrorOnFailure(InitOpenThread());
+
+    // Set up OpenThread configuration when OpenThread is included
+    chip::Inet::EndPointStateOpenThread::OpenThreadEndpointInitParam nativeParams;
+    nativeParams.lockCb                = LockOpenThreadTask;
+    nativeParams.unlockCb              = UnlockOpenThreadTask;
+    nativeParams.openThreadInstancePtr = chip::DeviceLayer::ThreadStackMgrImpl().OTInstance();
+    initParams.endpointNativeParams    = static_cast<void *>(&nativeParams);
+#endif
+#ifdef SL_WIFI
+    // This must be initialized after InitWiFiStack and InitChipStack which enable communication between the TA an M4
+    // This is required for TA nvm access used by the sWifiNetworkDriver.
+    ReturnErrorOnFailure(sWifiNetworkDriver.Init());
 #endif
 
     // Stop Matter event handling while setting up resources
     chip::DeviceLayer::PlatformMgr().LockChipStack();
 
-    // Create initParams with SDK example defaults here
-    // TODO: replace with our own init param to avoid double allocation in examples
-    static chip::CommonCaseDeviceServerInitParams initParams;
-
     // Report scheduler and timer delegate instance
     static DefaultTimerDelegate sTimerDelegate;
 #if CHIP_CONFIG_SYNCHRONOUS_REPORTS_ENABLED
@@ -330,19 +337,11 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
 #endif
 
     // Initialize the remaining (not overridden) providers to the SDK example defaults
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    ReturnErrorOnFailure(initParams.InitializeStaticResourcesBeforeServerInit());
     initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
+    initParams.appDelegate       = &BaseApplication::sAppDelegate;
 
-#if CHIP_ENABLE_OPENTHREAD
-    // Set up OpenThread configuration when OpenThread is included
-    chip::Inet::EndPointStateOpenThread::OpenThreadEndpointInitParam nativeParams;
-    nativeParams.lockCb                = LockOpenThreadTask;
-    nativeParams.unlockCb              = UnlockOpenThreadTask;
-    nativeParams.openThreadInstancePtr = chip::DeviceLayer::ThreadStackMgrImpl().OTInstance();
-    initParams.endpointNativeParams    = static_cast<void *>(&nativeParams);
-#endif
-
-    initParams.appDelegate = &BaseApplication::sAppDelegate;
+    CHIP_ERROR err = CHIP_NO_ERROR;
 
     // [sl-only]: Configure Wi-Fi App Sleep Manager
 #if SL_MATTER_ENABLE_APP_SLEEP_MANAGER
@@ -383,14 +382,6 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
     return CHIP_NO_ERROR;
 }
 
-#ifdef SL_WIFI
-CHIP_ERROR SilabsMatterConfig::InitWiFi(void)
-{
-    sWifiNetworkDriver.Init();
-    return WifiInterface::GetInstance().InitWiFiStack();
-}
-#endif // SL_WIFI
-
 // ================================================================================
 // FreeRTOS Callbacks
 // ================================================================================

examples/platform/silabs/MatterConfig.h

@@ -31,5 +31,4 @@ class SilabsMatterConfig
 
 private:
     static CHIP_ERROR InitOpenThread(void);
-    static CHIP_ERROR InitWiFi(void);
 };