Added changes for the wifi multi-ota feature

Author: shgutte

examples/platform/silabs/SiWx917/BUILD.gn

@@ -91,6 +91,10 @@ config("siwx917-common-config") {
     defines += [ "HEAP_MONITORING" ]
   }
 
+  if (chip_enable_multi_ota_requestor) {
+    defines += [ "CHIP_DEVICE_CONFIG_ENABLE_MULTI_OTA_REQUESTOR=1" ]
+  }
+
   ldflags = [ "-Wl,--no-warn-rwx-segment" ]
 }
 

src/platform/silabs/SiWx917/BUILD.gn

@@ -77,7 +77,17 @@ static_library("SiWx917") {
     "SiWxPlatformInterface.h",
   ]
 
-  if (chip_enable_ota_requestor) {
+  if (chip_enable_multi_ota_requestor) {
+    sources += [
+      "${silabs_platform_dir}/multi-ota/OTAMultiImageProcessorImpl.cpp",
+      "${silabs_platform_dir}/multi-ota/OTAMultiImageProcessorImpl.h",
+      "${silabs_platform_dir}/multi-ota/OTATlvProcessor.cpp",
+      "${silabs_platform_dir}/multi-ota/OTATlvProcessor.h",
+      "${silabs_platform_dir}/multi-ota/SiWx917/OTAWiFiFirmwareProcessor.cpp",
+      "${silabs_platform_dir}/multi-ota/SiWx917/OTAWiFiFirmwareProcessor.h",
+      "${silabs_platform_dir}/multi-ota/OTAHooks.cpp",
+    ]
+  } else if (chip_enable_ota_requestor) { {
     sources += [
       "${silabs_platform_dir}/OTAImageProcessorImpl.h",
       "OTAImageProcessorImpl.cpp",

src/platform/silabs/efr32/BUILD.gn

@@ -104,10 +104,12 @@ static_library("efr32") {
       "${silabs_platform_dir}/multi-ota/OTATlvProcessor.cpp",
       "${silabs_platform_dir}/multi-ota/OTATlvProcessor.h",
     ]
-  } else if (chip_enable_ota_requestor) {
+  }
+
+  if (chip_enable_wifi) {
     sources += [
-      "${silabs_platform_dir}/OTAImageProcessorImpl.h",
-      "OTAImageProcessorImpl.cpp",
+      "${silabs_platform_dir}/multi-ota/SiWx917/OTAWiFiFirmwareProcessor.cpp",
+      "${silabs_platform_dir}/multi-ota/SiWx917/OTAWiFiFirmwareProcessor.h",
     ]
   }
 

src/platform/silabs/multi-ota/OTAHooks.cpp

@@ -22,16 +22,28 @@
 #include <app/clusters/ota-requestor/OTARequestorInterface.h>
 
 #include <platform/silabs/multi-ota/OTAFactoryDataProcessor.h>
+#ifndef SLI_SI91X_MCU_INTERFACE
 #include <platform/silabs/multi-ota/OTAFirmwareProcessor.h>
+#endif
 
+#if SL_WIFI
+#include <platform/silabs/multi-ota/SiWx917/OTAWiFiFirmwareProcessor.h>
+#endif
 #if OTA_TEST_CUSTOM_TLVS
 #include <platform/silabs/multi-ota/OTACustomProcessor.h>
 #endif
 
 CHIP_ERROR chip::OTAMultiImageProcessorImpl::ProcessDescriptor(void * descriptor)
 {
+#ifndef SLI_SI91X_MCU_INTERFACE
     [[maybe_unused]] auto desc = static_cast<chip::OTAFirmwareProcessor::Descriptor *>(descriptor);
     ChipLogDetail(SoftwareUpdate, "Descriptor: %ld, %s, %s", desc->version, desc->versionString, desc->buildDate);
+#endif
+
+#if SL_WIFI
+    [[maybe_unused]] auto descWiFi = static_cast<chip::OTAWiFiFirmwareProcessor::Descriptor *>(descriptor);
+    ChipLogDetail(SoftwareUpdate, "Descriptor: %ld, %s, %s", descWiFi->version, descWiFi->versionString, descWiFi->buildDate);
+#endif
 
     return CHIP_NO_ERROR;
 }

src/platform/silabs/multi-ota/OTAMultiImageProcessorImpl.cpp

@@ -22,7 +22,6 @@
 #include <platform/DiagnosticDataProvider.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 #include <platform/internal/GenericConfigurationManagerImpl.h>
-
 #include <platform/silabs/multi-ota/OTAMultiImageProcessorImpl.h>
 
 using namespace chip::DeviceLayer;
@@ -35,7 +34,9 @@ static chip::OTAMultiImageProcessorImpl gImageProcessor;
 #endif // SL_WIFI
 
 extern "C" {
-#include "btl_interface.h"
+#ifndef SLI_SI91X_MCU_INTERFACE // required for 917 NCP
+    #include "btl_interface.h"
+#endif // SLI_SI91X_MCU_INTERFACE
 #include "sl_core.h"
 }
 
@@ -202,6 +203,7 @@ CHIP_ERROR OTAMultiImageProcessorImpl::SelectProcessor(ByteSpan & block)
 
 CHIP_ERROR OTAMultiImageProcessorImpl::RegisterProcessor(uint32_t tag, OTATlvProcessor * processor)
 {
+    ChipLogDetail(SoftwareUpdate, "RegisterProcessor with tag: %ld", tag);
     auto pair = mProcessorMap.find(tag);
     if (pair != mProcessorMap.end())
     {
@@ -422,7 +424,9 @@ void OTAMultiImageProcessorImpl::HandleApply(intptr_t context)
     ChipLogProgress(SoftwareUpdate, "HandleApply: Finished");
 
     // This reboots the device
+    #ifndef SLI_SI91X_MCU_INTERFACE // required for 917 NCP
     CORE_CRITICAL_SECTION(bootloader_rebootAndInstall();)
+    #endif
 }
 
 CHIP_ERROR OTAMultiImageProcessorImpl::ReleaseBlock()

src/platform/silabs/multi-ota/OTATlvProcessor.h

@@ -62,12 +62,13 @@ struct OTATlvHeader
     uint32_t length;
 };
 
-// TLV tags synced with ota files generate by scripts/tools/silabs/ota/ota_image_tool.py
+// TLV tags synced with ota files generated by scripts/tools/silabs/ota/ota_image_tool.py
 enum class OTAProcessorTag
 {
     kApplicationProcessor = 1,
     kBootloaderProcessor  = 2,
-    kFactoryDataProcessor = 3
+    kFactoryDataProcessor = 3,
+    kWiFiProcessor = 4
 };
 
 /**

third_party/silabs/efr32_sdk.gni

@@ -550,8 +550,14 @@ template("efr32_sdk") {
       defines += [ "SL_MATTER_ENABLE_OTA_ENCRYPTION=1" ]
     }
 
-    if (chip_enable_ota_custom_tlv_testing && chip_enable_multi_ota_requestor) {
-      defines += [ "OTA_TEST_CUSTOM_TLVS=1" ]
+    if (chip_enable_multi_ota_requestor) {
+      if(chip_enable_multi_ota_encryption) {
+        defines += [ "SL_MATTER_ENABLE_OTA_ENCRYPTION=1" ]
+      }
+
+      if (chip_enable_ota_custom_tlv_testing) {
+        defines += [ "OTA_TEST_CUSTOM_TLVS=1" ]
+      }
     }
 
     if (defined(invoker.chip_enable_wifi) && invoker.chip_enable_wifi) {
@@ -880,6 +886,15 @@ template("efr32_sdk") {
       "${silabs_gen_folder}/autogen/sl_event_handler.c",
       "${silabs_gen_folder}/autogen/sl_iostream_handles.c",
     ]
+
+    if (chip_enable_multi_ota_requestor) {
+      if (use_SiWx917) {
+        sources += [
+        "${wifi_sdk_root}/components/device/silabs/si91x/wireless/firmware_upgrade/firmware_upgradation.c",
+        ]
+      }
+    }
+
     if (enable_dic) {
       sources += [
         "${chip_root}/third_party/silabs/mqtt/stack/mqtt.c",