Pull request project-chip#1813: [MATTER-3569]: Build Fix for the matter 917 soc and ncp

Merge in WMN_TOOLS/matter from bugfix/soc_ncp_fix_1_3 to silabs_slc_1.3

Squashed commit of the following:

commit 73a5bb81a436a993f4c2fa109fc5169ea4f2a08a
Author: chbansal <chirag.bansal@silabs.com>
Date:   Mon May 6 19:58:04 2024 +0530

    addressing review comments

commit cfc854e464a4a8ea718b6f7f0ed9db31d68359f5
Author: chbansal <chirag.bansal@silabs.com>
Date:   Mon May 6 19:07:33 2024 +0530

    Fixing the matter shell and the thermostat app for 917 SoC

commit 6eb346267399db64f123bcc596025c3527ad2ff7
Author: chbansal <chirag.bansal@silabs.com>
Date:   Mon May 6 16:07:05 2024 +0530

    fixing the dishwasher app for 917 sock

... and 6 more commits

Author: chirag-silabs

examples/platform/silabs/FreeRTOSConfig.h

@@ -106,6 +106,7 @@ extern "C" {
 #include <CHIPProjectConfig.h>
 
 #include <stdint.h>
+#include <stdio.h>                  // SLC-FIX
 
 #ifdef SLI_SI91X_MCU_INTERFACE
 #include "si91x_device.h"

examples/platform/silabs/MatterConfig.cpp

@@ -374,7 +374,7 @@ CHIP_ERROR SilabsMatterConfig::InitWiFi(void)
 // ================================================================================
 extern "C" void vApplicationIdleHook(void)
 {
-#if SLI_SI91X_MCU_INTERFACE && CHIP_CONFIG_ENABLE_ICD_SERVER
+#if SI917_M4_SLEEP_ENABLED && CHIP_CONFIG_ENABLE_ICD_SERVER
     sl_wfx_host_si91x_sleep_wakeup();
 #endif
 }

examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.cpp

@@ -274,7 +274,7 @@ sl_status_t join_callback_handler(sl_wifi_event_t event, char * result, uint32_t
 
 #if SL_ICD_ENABLED
 
-#if SLI_SI91X_MCU_INTERFACE
+#if SI917_M4_SLEEP_ENABLED // SLC-FIX
 /******************************************************************
  * @fn   sl_wfx_host_si91x_sleep_wakeup()
  * @brief
@@ -309,7 +309,7 @@ void sl_wfx_host_si91x_sleep_wakeup()
         }
     }
 }
-#endif // SLI_SI91X_MCU_INTERFACE
+#endif // SI917_M4_SLEEP_ENABLED
 
 /******************************************************************
  * @fn   wfx_rsi_power_save()

examples/platform/silabs/SiWx917/SiWx917/sl_wlan_config.h

@@ -19,8 +19,9 @@
 #define RSI_CONFIG_H
 
 #include "ble_config.h"
+#if SLI_SI91X_MCU_INTERFACE // SLC-FIX
 #include "rsi_wisemcu_hardware_setup.h"
-#include "rsi_wlan_defines.h"
+#endif // SLI_SI91X_MCU_INTERFACE
 #include "sl_wifi_device.h"
 
 //! Enable feature

silabs_examples/silabs-sensors/include/AppConfig.h

@@ -24,6 +24,7 @@
 // ---- Lighting Example App Config ----
 
 #define APP_TASK_NAME "Sens"
+#define BLE_DEV_NAME "SiLabs-Sensor"
 
 #ifdef DISPLAY_ENABLED
 #define SENSOR_NAME "Sensor-App"

slc/component/matter-core-sdk/dnssd_wifi.slcc

@@ -77,5 +77,6 @@ source:
 - path: src/lib/dnssd/Resolver_ImplMinimalMdns.cpp
 - path: src/lib/dnssd/ServiceNaming.cpp
 - path: src/lib/dnssd/TxtFields.cpp
+- path: src/lib/dnssd/ResolverProxy.cpp
 ui_hints:
   visibility: never

slc/component/matter-core-sdk/siwx917_common.slcc

@@ -31,7 +31,6 @@ include:
     -   path: PigweedLogger.h
     -   path: FreeRTOSConfig.h
     -   path: Rpc.h
-    -   path: heap_4_silabs.h
     -   path: TemperatureSensor.h
     -   path: silabs_creds.h
     -   path: SilabsTestEventTriggerDelegate.h
@@ -53,7 +52,6 @@ source:
 -   path: examples/platform/silabs/LEDWidget.cpp
 -   path: examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.cpp
 -   path: examples/platform/silabs/SiWx917/SiWx917/wfx_rsi_host.cpp
--   path: examples/platform/silabs/heap_4_silabs.c
 -   path: examples/platform/silabs/syscalls_stubs.cpp
 -   path: src/platform/silabs/SiWx917/wifi/dhcp_client.cpp
 -   path: src/platform/silabs/SiWx917/wifi/ethernetif.cpp

slc/component/matter-platform/matter_platform_siwx917.slcc

@@ -12,6 +12,7 @@ config_file:
     path: examples/platform/silabs/FreeRTOSConfig.h
 
 requires:
+  - name: sl_system
   - name: matter_provision
   - name: matter_siwx917
   - name: matter_siwx917_common
@@ -20,10 +21,12 @@ requires:
   - name: si91x_debug
   - name: sl_system_init
   - name: nvm3_default
+  - name: memory_manager
+  - name: memory_manager_pool_light
+  - name: freertos_heap_3
 
 provides:
   - name: matter_platform_siwx917
-  - name: freertos_heap
   - name: device
   - name: wiseconnect_toolchain_gcc_override
   - name: matter_si91x_common_flash_nvm3_enabled
@@ -36,7 +39,6 @@ include:
   - path: silabs_utils.h
   - path: LEDWidget.h
   - path: MatterConfig.h
-  - path: heap_4_silabs.h
   - path: OTAConfig.h
   - path: matter_shell.h
   - path: MemMonitoring.h
@@ -45,7 +47,6 @@ include:
 source:
   - path: examples/platform/silabs/BaseApplication.cpp
   - path: examples/platform/silabs/silabs_utils.cpp
-  - path: examples/platform/silabs/heap_4_silabs.c
   - path: examples/platform/silabs/MatterConfig.cpp
   - path: examples/platform/silabs/SoftwareFaultReports.cpp
 define:
@@ -81,3 +82,5 @@ toolchain_settings:
     value: -Wno-unused-variable
   - option: gcc_compiler_option
     value: -Wno-unused-function
+  - option: gcc_compiler_option
+    value: -Wno-unused-parameter

slc/component/matter-wifi/rs911x/siwx917_ncp_extension.slcc

@@ -52,3 +52,6 @@ define:
 - name: SL_WIFI_COMPONENT_INCLUDED
 - name: __WEAK
   value: "__attribute__((weak))"
+toolchain_settings:
+- option: gcc_compiler_option
+  value: -Wno-unused-parameter

slc/sample-app/dishwasher-app/siwx917/dishwasher-app-917-soc.slcp

@@ -83,6 +83,10 @@ component:
     from: matter
   - id: matter_power_source
     from: matter
+  - id: matter_ota_support
+    from: matter
+  - id: matter_fw_upgrade_917
+    from: matter
 
   - id: sl_si91x_common_flash_nvm3
     from: wiseconnect3_sdk
@@ -110,6 +114,8 @@ component:
     from: wiseconnect3_sdk
   - id: ble
     from: wiseconnect3_sdk
+  - id: sl_si91x_soc_soft_reset
+    from: wiseconnect3_sdk
   - id: network_manager
     from: wiseconnect3_sdk
   - id: sl_si91x_button_917

slc/sample-app/thermostat/siwx917/thermostat-917-soc.slcp

@@ -70,6 +70,8 @@ component:
     from: matter
   - id: matter_ota_requestor
     from: matter
+  - id: matter_ota_support
+    from: matter
   - id: matter_software_diagnostics
     from: matter
   - id: matter_thermostat

src/platform/silabs/BLEManagerImpl.h

@@ -80,7 +80,7 @@ class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePla
 
 #if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
 #if (SLI_SI91X_ENABLE_BLE || RSI_BLE_ENABLE)
-    static void HandleC3ReadRequest(void);
+    static void HandleC3ReadRequest(rsi_ble_read_req_t * rsi_ble_read_req);
 #else
 #if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
     static void HandleC3ReadRequest(volatile sl_bt_msg_t * evt);

src/platform/silabs/SiWx917/wifi/wfx_notify.cpp

@@ -203,12 +203,12 @@ void wfx_ip_changed_notify(int got_ip)
  ********************************************************************************************/
 void wfx_retry_interval_handler(bool is_wifi_disconnection_event, uint16_t retryJoin)
 {
-#if SL_ICD_ENABLED
+#if SI917_M4_SLEEP_ENABLED
     if (m4_alarm_initialization_done == false)
     {
         initialize_m4_alarm();
     }
-#endif // SL_ICD_ENABLED
+#endif // SI917_M4_SLEEP_ENABLED
     if (!is_wifi_disconnection_event)
     {
         /* After the reboot or a commissioning time device failed to connect with AP.
@@ -217,7 +217,7 @@ void wfx_retry_interval_handler(bool is_wifi_disconnection_event, uint16_t retry
         if (retryJoin < MAX_JOIN_RETRIES_COUNT)
         {
             SILABS_LOG("wfx_retry_interval_handler : Next attempt after %d Seconds", CONVERT_MS_TO_SEC(WLAN_RETRY_TIMER_MS));
-#if SL_ICD_ENABLED
+#if SI917_M4_SLEEP_ENABLED
             // TODO: cleanup the retry logic MATTER-1921
             if (!chip::Server::GetInstance().GetCommissioningWindowManager().IsCommissioningWindowOpen())
             {
@@ -232,7 +232,7 @@ void wfx_retry_interval_handler(bool is_wifi_disconnection_event, uint16_t retry
             }
 #else
             vTaskDelay(pdMS_TO_TICKS(WLAN_RETRY_TIMER_MS));
-#endif // SL_ICD_ENABLED
+#endif // SI917_M4_SLEEP_ENABLED
         }
         else
         {
@@ -251,14 +251,14 @@ void wfx_retry_interval_handler(bool is_wifi_disconnection_event, uint16_t retry
             retryInterval = WLAN_MAX_RETRY_TIMER_MS;
         }
         SILABS_LOG("wfx_retry_interval_handler : Next attempt after %d Seconds", CONVERT_MS_TO_SEC(retryInterval));
-#if SL_ICD_ENABLED
+#if SI917_M4_SLEEP_ENABLED
         set_alarm_interrupt_timer(retryInterval / 1000);
         wfx_rsi_power_save(RSI_SLEEP_MODE_8, STANDBY_POWER_SAVE_WITH_RAM_RETENTION);
         // TODO: remove this once TICKLESS_IDLE is applied. MATTER-3134
         sl_wfx_host_si91x_sleep_wakeup();
 #else
         vTaskDelay(pdMS_TO_TICKS(retryInterval));
-#endif // SL_ICD_ENABLED
+#endif // SI917_M4_SLEEP_ENABLED
         retryInterval += retryInterval;
     }
 }

src/platform/silabs/rs911x/ble_config.h

@@ -0,0 +1,19 @@
+/*******************************************************************************
+* @file  ble_config.h
+* @brief
+*******************************************************************************
+* # License
+* <b>Copyright 2020 Silicon Laboratories Inc. www.silabs.com</b>
+*******************************************************************************
+*
+* The licensor of this software is Silicon Laboratories Inc. Your use of this
+* software is governed by the terms of Silicon Labs Master Software License
+* Agreement (MSLA) available at
+* www.silabs.com/about-us/legal/master-software-license-agreement. This
+* software is distributed to you in Source Code format and is governed by the
+* sections of the MSLA applicable to Source Code.
+*
+******************************************************************************/
+ 
+// SLC-FIX 
+#include <rsi_ble_config.h>