Inital multi OTA work WIP

Author: mykrupp

examples/platform/silabs/OTAConfig.cpp

@@ -18,6 +18,7 @@
 
 #include "OTAConfig.h"
 #include <app/server/Server.h>
+#include "silabs_utils.h"
 
 #ifndef SIWX_917
 
@@ -81,7 +82,6 @@ chip::DefaultOTARequestor gRequestorCore;
 chip::DefaultOTARequestorStorage gRequestorStorage;
 chip::DeviceLayer::DefaultOTARequestorDriver gRequestorUser;
 chip::BDXDownloader gDownloader;
-chip::OTAImageProcessorImpl gImageProcessor;
 
 void OTAConfig::Init()
 {
@@ -93,12 +93,18 @@ void OTAConfig::Init()
 
     // Periodic query timeout must be set prior to requestor being initialized
     gRequestorUser.SetPeriodicQueryTimeout(OTA_PERIODIC_TIMEOUT);
-    gRequestorUser.Init(&gRequestorCore, &gImageProcessor);
 
-    gImageProcessor.SetOTAImageFile("test.txt");
-    gImageProcessor.SetOTADownloader(&gDownloader);
+    auto & imageProcessor = chip::OTAImageProcessorImpl::GetDefaultInstance();
+    gRequestorUser.Init(&gRequestorCore, &imageProcessor);
+
+    CHIP_ERROR err = imageProcessor.Init(&gDownloader);
+    if (err != CHIP_NO_ERROR)
+    {
+        SILABS_LOG("Image processor init failed");
+        assert(err == CHIP_NO_ERROR);
+    }
 
     // Connect the Downloader and Image Processor objects
-    gDownloader.SetImageProcessorDelegate(&gImageProcessor);
+    gDownloader.SetImageProcessorDelegate(&imageProcessor);
     // Initialize and interconnect the Requestor and Image Processor objects -- END
 }

examples/platform/silabs/OTAConfig.h

@@ -22,7 +22,12 @@
 #include <app/clusters/ota-requestor/DefaultOTARequestor.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
+
+#ifdef CHIP_DEVICE_CONFIG_ENABLE_MULTI_OTA_REQUESTOR
+#include <platform/silabs/multi-ota/MultiOTAImageProcessorImpl.h>
+#else
 #include <platform/silabs/OTAImageProcessorImpl.h>
+#endif
 
 class OTAConfig
 {

src/platform/BUILD.gn

@@ -151,6 +151,10 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
     defines += [
       "CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR=${chip_enable_ota_requestor}",
     ]
+    # TODO: add this to silabs platform specific code
+    defines += [
+      "CHIP_DEVICE_CONFIG_ENABLE_MULTI_OTA_REQUESTOR=${chip_enable_multi_ota_requestor}",
+    ]
 
     if (chip_device_project_config_include != "") {
       defines += [ "CHIP_DEVICE_PROJECT_CONFIG_INCLUDE=${chip_device_project_config_include}" ]

src/platform/device.gni

@@ -87,6 +87,8 @@ declare_args() {
 
   # Enable OTA requestor support
   chip_enable_ota_requestor = false
+  # TODO: add this to silabs platform specific code
+  chip_enable_multi_ota_requestor = false
 
   # Select DNS-SD implementation
   if (chip_device_platform == "linux" || chip_device_platform == "esp32" ||

src/platform/silabs/OTAImageProcessorImpl.h

@@ -40,7 +40,8 @@ class OTAImageProcessorImpl : public OTAImageProcessorInterface
     CHIP_ERROR ConfirmCurrentImage() override;
 
     void SetOTADownloader(OTADownloader * downloader) { mDownloader = downloader; }
-    void SetOTAImageFile(const char * imageFile) { mImageFile = imageFile; }
+    CHIP_ERROR Init(OTADownloader * downloader);
+    static OTAImageProcessorImpl & GetDefaultInstance();
 
 private:
     //////////// Actual handlers for the OTAImageProcessorInterface ///////////////
@@ -68,7 +69,6 @@ class OTAImageProcessorImpl : public OTAImageProcessorInterface
     MutableByteSpan mBlock;
     OTADownloader * mDownloader;
     OTAImageHeaderParser mHeaderParser;
-    const char * mImageFile                 = nullptr;
     static constexpr size_t kAlignmentBytes = 64;
     // Intermediate, word-aligned buffer for writing to the bootloader storage.
     // Bootloader storage API requires the buffer size to be a multiple of 4.

src/platform/silabs/efr32/BUILD.gn

@@ -77,10 +77,25 @@ static_library("efr32") {
     sources += [ "BLEManagerImpl.cpp" ]
   }
 
-  if (chip_enable_ota_requestor) {
+  if (chip_enable_multi_ota_requestor) {
+    sources += [
+      "${silabs_platform_dir}/multi-ota/MultiOTAImageProcessorImpl.h",
+      "${silabs_platform_dir}/multi-ota/MultiOTAImageProcessorImpl.cpp",
+      "${silabs_platform_dir}/multi-ota/OTATlvProcessor.h",
+      "${silabs_platform_dir}/multi-ota/OTATlvProcessor.cpp",
+      #"${silabs_platform_dir}/multi-ota/efr32/OTAFactoryDataProcessor.h",
+      #"${silabs_platform_dir}/multi-ota/efr32/OTAFactoryDataProcessor.cpp",
+      "${silabs_platform_dir}/multi-ota/efr32/OTAFirmwareProcessor.h",
+      "${silabs_platform_dir}/multi-ota/efr32/OTAFirmwareProcessor.cpp",
+      "${silabs_platform_dir}/multi-ota/efr32/OTAHooks.cpp",
+
+    ]
+  }
+  else if (chip_enable_ota_requestor) {
     sources += [
       "${silabs_platform_dir}/OTAImageProcessorImpl.h",
-      "OTAImageProcessorImpl.cpp",
+      "${silabs_platform_dir}/efr32/OTAImageProcessorImpl.cpp",
+
     ]
   }
 

src/platform/silabs/efr32/OTAImageProcessorImpl.cpp

@@ -33,6 +33,8 @@ extern "C" {
 /// No error, operation OK
 #define SL_BOOTLOADER_OK 0L
 
+static chip::OTAImageProcessorImpl gImageProcessor;
+
 namespace chip {
 
 // Define static memebers
@@ -41,6 +43,15 @@ uint32_t OTAImageProcessorImpl::mWriteOffset
 uint16_t OTAImageProcessorImpl::writeBufOffset                                          = 0;
 uint8_t OTAImageProcessorImpl::writeBuffer[kAlignmentBytes] __attribute__((aligned(4))) = { 0 };
 
+CHIP_ERROR OTAImageProcessorImpl::Init(OTADownloader * downloader)
+{
+    ReturnErrorCodeIf(downloader == nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+
+    gImageProcessor.SetOTADownloader(downloader);
+
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR OTAImageProcessorImpl::PrepareDownload()
 {
     DeviceLayer::PlatformMgr().ScheduleWork(HandlePrepareDownload, reinterpret_cast<intptr_t>(this));
@@ -204,6 +215,7 @@ void OTAImageProcessorImpl::HandleApply(intptr_t context)
     ChipLogProgress(SoftwareUpdate, "HandleApply: started");
 
     // Force KVS to store pending keys such as data from StoreCurrentUpdateInfo()
+    // TODO: Make sure this call gets put in MultiOTAImageProcessorImpl::HandleApply
     chip::DeviceLayer::PersistedStorage::KeyValueStoreMgrImpl().ForceKeyMapSave();
 #if SL_BTLCTRL_MUX
     err = sl_wfx_host_pre_bootloader_spi_transfer();
@@ -271,6 +283,7 @@ void OTAImageProcessorImpl::HandleAbort(intptr_t context)
     imageProcessor->ReleaseBlock();
 }
 
+// TODO: Put this in ProcessInternal for efr32 Application image Processor
 void OTAImageProcessorImpl::HandleProcessBlock(intptr_t context)
 {
     uint32_t err          = SL_BOOTLOADER_OK;
@@ -400,4 +413,9 @@ CHIP_ERROR OTAImageProcessorImpl::ReleaseBlock()
     return CHIP_NO_ERROR;
 }
 
+OTAImageProcessorImpl & OTAImageProcessorImpl::GetDefaultInstance()
+{
+    return gImageProcessor;
+}
+
 } // namespace chip

src/platform/silabs/efr32/args.gni

@@ -32,7 +32,6 @@ if (chip_crypto == "") {
 }
 
 chip_device_platform = "efr32"
-
 #Net work configuration OpenThread
 lwip_platform = "silabs"
 chip_mdns = "platform"
@@ -42,6 +41,7 @@ chip_system_config_use_open_thread_inet_endpoints = true
 chip_with_lwip = false
 
 chip_build_tests = false
+chip_enable_multi_ota_requestor = false
 
 # Transitional CommissionableDataProvider not used anymore
 # examples/platform/silabs/efr32/SilabsDeviceDataProvider is now used.