[Silabs] [WiFi] Added changes for the 917 Wi-Fi multi-ota feature

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" ]
 }
 

scripts/tools/silabs/ota/ota_multi_image_tool.py

@@ -50,6 +50,7 @@
 from chip.tlv import TLVWriter  # noqa: E402 isort:skip
 from custom import CertDeclaration, DacCert, DacPKey, PaiCert  # noqa: E402 isort:skip
 from default import InputArgument  # noqa: E402 isort:skip
+from generate import set_logger  # noqa: E402 isort:skip
 
 OTA_APP_TLV_TEMP = os.path.join(os.path.dirname(__file__), "ota_temp_app_tlv.bin")
 OTA_BOOTLOADER_TLV_TEMP = os.path.join(os.path.dirname(__file__), "ota_temp_ssbl_tlv.bin")
@@ -62,7 +63,9 @@ class TAG:
     APPLICATION = 1
     BOOTLOADER = 2
     FACTORY_DATA = 3
-
+    WIFI_917_NCP_TA = 4
+    WIFI_917_SOC_COMBINED = 5
+    WIFI_917_NCP_COMBINED = 6
 
 def set_logger():
     stdout_handler = logging.StreamHandler(stream=sys.stdout)
@@ -72,7 +75,6 @@ def set_logger():
         handlers=[stdout_handler]
     )
 
-
 def write_to_temp(path: str, payload: bytearray):
     with open(path, "wb") as _handle:
         _handle.write(payload)
@@ -163,6 +165,32 @@ def generate_app(args: object):
         return [OTA_APP_TLV_TEMP, args.app_input_file]
 
 
+def generate_wifi_image(args: object):
+    """
+    Generate app payload with descriptor. If a certain option is not specified, use the default values.
+    """
+    logging.info("App descriptor information:")
+
+    descriptor = generate_descriptor(args.app_version, args.app_version_str, args.app_build_date)
+    logging.info(f"App encryption enable: {args.enc_enable}")
+    if args.enc_enable:
+        inputFile = open(args.wifi_input_file, "rb")
+        enc_file = crypto_utils.encryptData(inputFile.read(), args.input_ota_key, INITIALIZATION_VECTOR)
+        enc_file1 = bytes([ord(x) for x in enc_file])
+        file_size = len(enc_file1)
+        payload = generate_header(TAG.WIFI_917_TA_M4, len(descriptor) + file_size) + descriptor + enc_file1
+    else:
+        file_size = os.path.getsize(args.wifi_input_file)
+        logging.info(f"file size: {file_size}")
+        payload = generate_header(TAG.WIFI_917_TA_M4, len(descriptor) + file_size) + descriptor
+
+    write_to_temp(OTA_APP_TLV_TEMP, payload)
+    if args.enc_enable:
+        return [OTA_APP_TLV_TEMP]
+    else:
+        return [OTA_APP_TLV_TEMP, args.wifi_input_file]
+
+
 def generate_bootloader(args: object):
     """
     Generate SSBL payload with descriptor. If a certain option is not specified, use the default values.
@@ -257,7 +285,10 @@ def create_image(args: object):
         input_files += generate_bootloader(args)
 
     if args.app_input_file:
-        input_files += generate_app(args)
+        input_files += generate_app(args)    
+
+    if args.wifi_input_file:
+        input_files += generate_wifi_image(args)
 
     if len(input_files) == 0:
         print("Please specify an input option.")
@@ -312,6 +343,8 @@ def any_base_int(s): return int(s, 0)
 
     create_parser.add_argument('-app', "--app-input-file",
                                help='Path to application input file')
+    create_parser.add_argument('-wifi', "--wifi-input-file",
+                               help='Path to OTA image for SiWx917 (TA/M4/Combined file)')
     create_parser.add_argument('--app-version', type=any_base_int,
                                help='Application Software version (numeric)')
     create_parser.add_argument('--app-version-str', type=str,

src/platform/silabs/SiWx917/BUILD.gn

@@ -13,9 +13,7 @@
 # limitations under the License.
 
 import("//build_overrides/chip.gni")
-
 import("${chip_root}/src/platform/device.gni")
-
 import("${chip_root}/build/chip/buildconfig_header.gni")
 import("${chip_root}/src/crypto/crypto.gni")
 import("${chip_root}/src/platform/silabs/wifi/args.gni")
@@ -77,7 +75,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,6 +104,13 @@ static_library("efr32") {
       "${silabs_platform_dir}/multi-ota/OTATlvProcessor.cpp",
       "${silabs_platform_dir}/multi-ota/OTATlvProcessor.h",
     ]
+
+    if (chip_enable_wifi) {
+      sources += [
+        "${silabs_platform_dir}/multi-ota/SiWx917/OTAWiFiFirmwareProcessor.cpp",
+        "${silabs_platform_dir}/multi-ota/SiWx917/OTAWiFiFirmwareProcessor.h",
+      ]
+    }
   } else if (chip_enable_ota_requestor) {
     sources += [
       "${silabs_platform_dir}/OTAImageProcessorImpl.h",

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

@@ -22,33 +22,43 @@
 #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
+    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;
 }
 
 CHIP_ERROR chip::OTAMultiImageProcessorImpl::OtaHookInit()
 {
-    static chip::OTAFirmwareProcessor sApplicationProcessor;
-    static chip::OTAFactoryDataProcessor sFactoryDataProcessor;
-
-    sApplicationProcessor.RegisterDescriptorCallback(ProcessDescriptor);
-    sFactoryDataProcessor.RegisterDescriptorCallback(ProcessDescriptor);
 
     auto & imageProcessor = chip::OTAMultiImageProcessorImpl::GetDefaultInstance();
-    ReturnErrorOnFailure(
-        imageProcessor.RegisterProcessor(static_cast<uint32_t>(OTAProcessorTag::kApplicationProcessor), &sApplicationProcessor));
-    ReturnErrorOnFailure(
-        imageProcessor.RegisterProcessor(static_cast<uint32_t>(OTAProcessorTag::kFactoryDataProcessor), &sFactoryDataProcessor));
+
+#ifndef SLI_SI91X_MCU_INTERFACE
+    static chip::OTAFirmwareProcessor sApplicationProcessor;
+    sApplicationProcessor.RegisterDescriptorCallback(ProcessDescriptor);
+    ReturnErrorOnFailure(imageProcessor.RegisterProcessor(APPLICATION, &sApplicationProcessor));
+#endif
 
 #if OTA_TEST_CUSTOM_TLVS
     static chip::OTACustomProcessor customProcessor1;
@@ -63,5 +73,12 @@ CHIP_ERROR chip::OTAMultiImageProcessorImpl::OtaHookInit()
     ReturnErrorOnFailure(imageProcessor.RegisterProcessor(9, &customProcessor2));
     ReturnErrorOnFailure(imageProcessor.RegisterProcessor(10, &customProcessor3));
 #endif
+
+#ifdef SL_WIFI
+    static chip::OTAWiFiFirmwareProcessor sWifiFirmwareProcessor;
+    sWifiFirmwareProcessor.RegisterDescriptorCallback(ProcessDescriptor);
+    ReturnErrorOnFailure(imageProcessor.RegisterProcessor(static_cast<uint32_t>(OTAProcessorTag::kWiFiProcessor), &sWifiFirmwareProcessor));
+#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,8 +34,18 @@ static chip::OTAMultiImageProcessorImpl gImageProcessor;
 #endif // SL_WIFI
 
 extern "C" {
+#if SL_BTLCTRL_MUX
 #include "btl_interface.h"
 #include "sl_core.h"
+#endif // SL_BTLCTRL_MUX
+#include "em_bus.h" // For CORE_CRITICAL_SECTION
+#ifndef SLI_SI91X_MCU_INTERFACE // required for 917 NCP
+#include "spi_multiplex.h"
+#include "btl_interface.h"
+#endif // SLI_SI91X_MCU_INTERFACE
+#ifdef CHIP_9117
+#include "spi_multiplex.h"
+#endif // CHIP_9117
 }
 
 namespace chip {
@@ -59,7 +68,6 @@ void OTAMultiImageProcessorImpl::Clear()
     mParams.totalFileBytes  = 0;
     mParams.downloadedBytes = 0;
     mCurrentProcessor       = nullptr;
-
     ReleaseBlock();
 }
 
@@ -115,7 +123,9 @@ void OTAMultiImageProcessorImpl::HandlePrepareDownload(intptr_t context)
 
     ChipLogProgress(SoftwareUpdate, "HandlePrepareDownload: started");
 
+#ifndef SLI_SI91X_MCU_INTERFACE // required for 917 NCP
     CORE_CRITICAL_SECTION(bootloader_init();)
+#endif
 
     imageProcessor->mParams.downloadedBytes = 0;
 
@@ -202,6 +212,8 @@ 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())
     {
@@ -420,9 +432,12 @@ void OTAMultiImageProcessorImpl::HandleApply(intptr_t context)
     imageProcessor->mAccumulator.Clear();
 
     ChipLogProgress(SoftwareUpdate, "HandleApply: Finished");
-
     // This reboots the device
+    // TODO: check where to put this
+#ifndef SLI_SI91X_MCU_INTERFACE // required for 917 NCP
     CORE_CRITICAL_SECTION(bootloader_rebootAndInstall();)
+#endif
+    // ConfigurationManagerImpl().StoreSoftwareUpdateCompleted();
 }
 
 CHIP_ERROR OTAMultiImageProcessorImpl::ReleaseBlock()

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

@@ -31,7 +31,17 @@ using namespace ::chip::DeviceLayer::Internal;
 
 namespace chip {
 
-#ifdef SL_MATTER_ENABLE_OTA_ENCRYPTION
+typedef enum
+{
+    APPLICATION,
+    BOOTLOADER,
+    FACTORY_DATA,
+    WIFI_917_NCP_TA,
+    WIFI_917_SOC_TA, /* This is used as scan result and start */
+    WIFI_917_NCP_COMBINED
+} OTAImageType;
+
+#if SL_MATTER_ENABLE_OTA_ENCRYPTION
 constexpr uint8_t au8Iv[] = { 0x00, 0x00, 0x00, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x00, 0x00, 0x00, 0x00 };
 #endif
 CHIP_ERROR OTATlvProcessor::Process(ByteSpan & block)
@@ -57,7 +67,6 @@ CHIP_ERROR OTATlvProcessor::Process(ByteSpan & block)
             }
         }
     }
-
     return status;
 }
 

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

@@ -62,12 +62,16 @@ 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
+    kApplicationProcessor = 1, 
+    kBootloaderProcessor = 2 ,
+    kFactoryDataProcessor = 3,
+    kWiFiProcessor = 4,
+    kCustomProcessor1 = 8,
+    kCustomProcessor2 = 9,
+    kCustomProcessor3 = 10,
 };
 
 /**

src/platform/silabs/multi-ota/SiWx917/OTAHooks917.cpp

@@ -0,0 +1,47 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <include/platform/CHIPDeviceLayer.h>
+#include <platform/silabs/multi-ota/OTAMultiImageProcessorImpl.h>
+
+#include <app/clusters/ota-requestor/OTARequestorInterface.h>
+
+#include <platform/silabs/multi-ota/SiWx917/OTAFirmwareProcessor917.h>
+#if OTA_TEST_CUSTOM_TLVS
+#include <platform/silabs/multi-ota/OTACustomProcessor.h>
+#endif
+
+CHIP_ERROR chip::OTAMultiImageProcessorImpl::ProcessDescriptor(void * descriptor)
+{
+    auto desc = static_cast<chip::OTAFirmwareProcessor::Descriptor *>(descriptor);
+    ChipLogDetail(SoftwareUpdate, "Descriptor: %ld, %s, %s", desc->version, desc->versionString, desc->buildDate);
+
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR chip::OTAMultiImageProcessorImpl::OtaHookInit()
+{
+    static chip::OTAFirmwareProcessor sApplicationProcessor;
+
+    sApplicationProcessor.RegisterDescriptorCallback(ProcessDescriptor);
+
+    auto & imageProcessor = chip::OTAMultiImageProcessorImpl::GetDefaultInstance();
+    ReturnErrorOnFailure(imageProcessor.RegisterProcessor(1, &sApplicationProcessor));
+
+    return CHIP_NO_ERROR;
+}