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

examples/platform/silabs/BaseApplication.cpp

@@ -65,7 +65,7 @@
 
 #ifdef SL_WIFI
 #include <platform/silabs/NetworkCommissioningWiFiDriver.h>
-#include <platform/silabs/wifi/WifiInterface.h>
+#include <platform/silabs/wifi/WifiInterface.h> // nogncheck
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
 #include <platform/silabs/wifi/icd/WifiSleepManager.h> // nogncheck

examples/platform/silabs/MatterConfig.cpp

@@ -25,8 +25,7 @@
 #include <mbedtls/platform.h>
 
 #ifdef SL_WIFI
-#include <platform/silabs/NetworkCommissioningWiFiDriver.h>
-#include <platform/silabs/wifi/WifiInterface.h>
+#include <platform/silabs/wifi/WifiInterface.h> // nogncheck
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
 #include <platform/silabs/wifi/icd/WifiSleepManager.h> // nogncheck

examples/platform/silabs/OTAConfig.cpp

@@ -94,7 +94,7 @@ void OTAConfig::Init()
     // Periodic query timeout must be set prior to requestor being initialized
     gRequestorUser.SetPeriodicQueryTimeout(OTA_PERIODIC_TIMEOUT);
 
-#if CHIP_DEVICE_CONFIG_ENABLE_MULTI_OTA_REQUESTOR
+#if SL_MATTER_ENABLE_MULTI_OTA_REQUESTOR
     auto & imageProcessor = chip::OTAMultiImageProcessorImpl::GetDefaultInstance();
 #else
     auto & imageProcessor = chip::OTAImageProcessorImpl::GetDefaultInstance();

examples/platform/silabs/OTAConfig.h

@@ -23,7 +23,7 @@
 #include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
 
-#if CHIP_DEVICE_CONFIG_ENABLE_MULTI_OTA_REQUESTOR
+#if SL_MATTER_ENABLE_MULTI_OTA_REQUESTOR
 #include <platform/silabs/multi-ota/OTAMultiImageProcessorImpl.h>
 #else
 #include <platform/silabs/OTAImageProcessorImpl.h>

examples/platform/silabs/efr32/BUILD.gn

@@ -18,6 +18,7 @@ import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
 import("${chip_root}/src/app/icd/icd.gni")
 import("${chip_root}/src/lib/lib.gni")
 import("${chip_root}/src/platform/device.gni")
+import("${chip_root}/src/platform/silabs/multi-ota/args.gni")
 import("${silabs_sdk_build_root}/efr32_sdk.gni")
 import("${silabs_sdk_build_root}/silabs_board.gni")
 
@@ -110,10 +111,6 @@ config("efr32-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",
     "-fno-lto",

examples/platform/silabs/provision/ProvisionStorageDefault.cpp

@@ -687,9 +687,44 @@ CHIP_ERROR Storage::GetProvisionRequest(bool & value)
 #ifdef SL_MATTER_ENABLE_OTA_ENCRYPTION
 CHIP_ERROR Storage::SetOtaTlvEncryptionKey(const ByteSpan & value)
 {
-    chip::DeviceLayer::Silabs::OtaTlvEncryptionKey::OtaTlvEncryptionKey key;
+#if defined(SL_MBEDTLS_USE_TINYCRYPT)
+    // Tinycrypt doesn't support the key ID, so we need to store the key as a binary blob
+    return SilabsConfig::WriteConfigValueBin(SilabsConfig::kOtaTlvEncryption_KeyId, value.data(), value.size());
+#else  // MBEDTLS_USE_PSA_CRYPTO
+    Silabs::OtaTlvEncryptionKey key;
     ReturnErrorOnFailure(key.Import(value.data(), value.size()));
     return SilabsConfig::WriteConfigValue(SilabsConfig::kOtaTlvEncryption_KeyId, key.GetId());
+#endif // SL_MBEDTLS_USE_TINYCRYPT
+}
+
+CHIP_ERROR Storage::GetOtaTlvEncryptionKeyId(uint32_t & keyId)
+{
+#if defined(SL_MBEDTLS_USE_TINYCRYPT)
+    // Tinycrypt doesn't support the key ID
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+#else  // MBEDTLS_USE_PSA_CRYPTO
+    // Read the key ID from the config
+    return SilabsConfig::ReadConfigValue(SilabsConfig::kOtaTlvEncryption_KeyId, keyId);
+#endif // SL_MBEDTLS_USE_TINYCRYPT
+}
+
+CHIP_ERROR Storage::DecryptUsingOtaTlvEncryptionKey(MutableByteSpan & block, uint32_t & ivOffset)
+{
+#if defined(SL_MBEDTLS_USE_TINYCRYPT)
+    uint8_t keyBuffer[kOTAEncryptionKeyLength] = { 0 };
+    size_t keyLen                              = 0;
+
+    // Read the key from the provisioning storage
+    MutableByteSpan keySpan = MutableByteSpan(keyBuffer);
+
+    SilabsConfig::ReadConfigValueBin(SilabsConfig::kOtaTlvEncryption_KeyId, keySpan.data(), keySpan.size());
+    VerifyOrReturnError(keySpan.size() == kOTAEncryptionKeyLength, CHIP_ERROR_INVALID_ARGUMENT);
+
+    Silabs::OtaTlvEncryptionKey::Decrypt((const ByteSpan) keySpan, block, ivOffset);
+    return CHIP_NO_ERROR;
+#else  // MBEDTLS_USE_PSA_CRYPTO
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+#endif // SL_MBEDTLS_USE_TINYCRYPT
 }
 #endif // SL_MATTER_ENABLE_OTA_ENCRYPTION
 

examples/platform/silabs/provision/ProvisionStorageFlash.cpp

@@ -748,7 +748,45 @@ CHIP_ERROR Storage::GetProvisionRequest(bool & value)
 #ifdef SL_MATTER_ENABLE_OTA_ENCRYPTION
 CHIP_ERROR Storage::SetOtaTlvEncryptionKey(const ByteSpan & value)
 {
-    return CHIP_ERROR_NOT_IMPLEMENTED;
+#if defined(SL_MBEDTLS_USE_TINYCRYPT)
+    // Tinycrypt doesn't support the key ID, so we need to store the key as a binary blob
+    return Flash::Set(Parameters::ID::kOtaTlvEncryptionKey, value.data(), value.size());
+#else  // MBEDTLS_USE_PSA_CRYPTO
+    Silabs::OtaTlvEncryptionKey key;
+    ReturnErrorOnFailure(key.Import(value.data(), value.size()));
+    return Flash::Set(Parameters::ID::kOtaTlvEncryptionKey, key.GetId());
+#endif // SL_MBEDTLS_USE_TINYCRYPT
+}
+
+CHIP_ERROR Storage::GetOtaTlvEncryptionKeyId(uint32_t & keyId)
+{
+#if defined(SL_MBEDTLS_USE_TINYCRYPT)
+    // Tinycrypt doesn't support the key ID
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+#else  // MBEDTLS_USE_PSA_CRYPTO
+    return Flash::Get(Parameters::ID::kOtaTlvEncryptionKey, keyId);
+#endif // SL_MBEDTLS_USE_TINYCRYPT
+}
+
+CHIP_ERROR Storage::DecryptUsingOtaTlvEncryptionKey(MutableByteSpan & block, uint32_t & ivOffset)
+{
+#if defined(SL_MBEDTLS_USE_TINYCRYPT)
+    uint8_t keyBuffer[Silabs::OtaTlvEncryptionKey::kOTAEncryptionKeyLength] = { 0 };
+    size_t keyLen                                                           = 0;
+
+    // Read the key from the provisioning storage
+    MutableByteSpan keySpan = MutableByteSpan(keyBuffer);
+
+    ReturnErrorOnFailure(Flash::Get(Parameters::ID::kOtaTlvEncryptionKey, keySpan.data(), keySpan.size(), keyLen));
+    keySpan.reduce_size(keyLen);
+
+    VerifyOrReturnError(keySpan.size() == Silabs::OtaTlvEncryptionKey::kOTAEncryptionKeyLength, CHIP_ERROR_INVALID_ARGUMENT);
+
+    Silabs::OtaTlvEncryptionKey::Decrypt((const ByteSpan) keySpan, block, ivOffset);
+    return CHIP_NO_ERROR;
+#else  // MBEDTLS_USE_PSA_CRYPTO
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+#endif // SL_MBEDTLS_USE_TINYCRYPT
 }
 #endif // SL_MATTER_ENABLE_OTA_ENCRYPTION
 

scripts/tools/silabs/ota/ota_multi_image_tool.py

@@ -52,6 +52,7 @@
 from default import InputArgument  # noqa: E402 isort:skip
 
 OTA_APP_TLV_TEMP = os.path.join(os.path.dirname(__file__), "ota_temp_app_tlv.bin")
+OTA_WIFI_TA_TLV_TEMP = os.path.join(os.path.dirname(__file__), "ota_temp_wifi_ta_tlv.bin")
 OTA_BOOTLOADER_TLV_TEMP = os.path.join(os.path.dirname(__file__), "ota_temp_ssbl_tlv.bin")
 OTA_FACTORY_TLV_TEMP = os.path.join(os.path.dirname(__file__), "ota_temp_factory_tlv.bin")
 
@@ -62,6 +63,7 @@ class TAG:
     APPLICATION = 1
     BOOTLOADER = 2
     FACTORY_DATA = 3
+    WIFI_TA = 4
 
 
 def set_logger():
@@ -163,6 +165,32 @@ def generate_app(args: object):
         return [OTA_APP_TLV_TEMP, args.app_input_file]
 
 
+def generate_wifi_ta_image(args: object):
+    """
+    Generate WiFi TA image payload with descriptor. If a certain option is not specified, use the default values.
+    """
+    logging.info("WiFi TA descriptor information:")
+
+    descriptor = generate_descriptor(args.wifi_ta_version, args.wifi_ta_version_str, args.wifi_ta_build_date)
+    logging.info(f"WiFi TA encryption enable: {args.enc_enable}")
+    if args.enc_enable:
+        inputFile = open(args.wifi_ta_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_TA, len(descriptor) + file_size) + descriptor + enc_file1
+    else:
+        file_size = os.path.getsize(args.wifi_ta_input_file)
+        logging.info(f"file size: {file_size}")
+        payload = generate_header(TAG.WIFI_TA, len(descriptor) + file_size) + descriptor
+
+    write_to_temp(OTA_WIFI_TA_TLV_TEMP, payload)
+    if args.enc_enable:
+        return [OTA_WIFI_TA_TLV_TEMP]
+    else:
+        return [OTA_WIFI_TA_TLV_TEMP, args.wifi_ta_input_file]
+
+
 def generate_bootloader(args: object):
     """
     Generate SSBL payload with descriptor. If a certain option is not specified, use the default values.
@@ -259,6 +287,9 @@ def create_image(args: object):
     if args.app_input_file:
         input_files += generate_app(args)
 
+    if args.wifi_ta_input_file:
+        input_files += generate_wifi_ta_image(args)
+
     if len(input_files) == 0:
         print("Please specify an input option.")
         sys.exit(1)
@@ -319,6 +350,15 @@ def any_base_int(s): return int(s, 0)
     create_parser.add_argument('--app-build-date', type=str,
                                help='Application build date (string)')
 
+    create_parser.add_argument('-tai', "--wifi_ta_input_file",
+                               help='Path to OTA image for 917 wifi TA')
+    create_parser.add_argument('--wifi-ta-version', type=any_base_int,
+                               help='WiFi TA Software version (numeric)')
+    create_parser.add_argument('--wifi-ta-version-str', type=str,
+                               help='WiFi TA Software version (string)')
+    create_parser.add_argument('--wifi-ta-build-date', type=str,
+                               help='WiFi TA build date (string)')
+
     create_parser.add_argument('-bl', '--bl-input-file',
                                help='Path to input bootloader image payload file')
     create_parser.add_argument('--bl-version', type=any_base_int,

src/platform/silabs/CHIPDevicePlatformEvent.h

@@ -26,7 +26,7 @@
 
 #include <platform/CHIPDeviceEvent.h>
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
-#include <platform/silabs/wifi/WifiInterface.h>
+#include <platform/silabs/wifi/WifiInterface.h> //nogncheck
 #endif
 
 namespace chip {

src/platform/silabs/ConfigurationManagerImpl.cpp

@@ -31,7 +31,7 @@
 #include <platform/silabs/platformAbstraction/SilabsPlatform.h>
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
-#include <platform/silabs/wifi/WifiInterface.h>
+#include <platform/silabs/wifi/WifiInterface.h> //nogncheck
 #endif
 
 namespace chip {

src/platform/silabs/PlatformManagerImpl.cpp

@@ -32,8 +32,8 @@
 #include <platform/silabs/DiagnosticDataProviderImpl.h>
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
-#include <platform/silabs/wifi/WifiInterface.h>
-#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
+#include <platform/silabs/wifi/WifiInterface.h> //nogncheck
+#endif                                          // CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
 
 #if defined(SL_MBEDTLS_USE_TINYCRYPT)
 #include "tinycrypt/ecc.h"

src/platform/silabs/PlatformManagerImpl.h

@@ -26,7 +26,7 @@
 
 #include <platform/internal/GenericPlatformManagerImpl_CMSISOS.h>
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
-#include <platform/silabs/wifi/WifiInterface.h>
+#include <platform/silabs/wifi/WifiInterface.h> //nogncheck
 #endif
 #include <cmsis_os2.h>
 

src/platform/silabs/SiWx917/BUILD.gn

@@ -13,16 +13,14 @@
 # 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/device.gni")
+import("${chip_root}/src/platform/silabs/multi-ota/args.gni")
 import("${chip_root}/src/platform/silabs/wifi/args.gni")
 import("${chip_root}/third_party/silabs/SiWx917_sdk.gni")
 import("${chip_root}/third_party/silabs/silabs_board.gni")
 import("${matter_support_root}/provision/args.gni")
-
 silabs_platform_dir = "${chip_root}/src/platform/silabs"
 
 assert(chip_device_platform == "SiWx917")
@@ -65,9 +63,6 @@ static_library("SiWx917") {
     "${silabs_platform_dir}/SilabsConfig.cpp",
     "${silabs_platform_dir}/SilabsConfig.h",
     "${silabs_platform_dir}/SystemPlatformConfig.h",
-    "${silabs_platform_dir}/platformAbstraction/SilabsPlatform.h",
-    "${silabs_platform_dir}/platformAbstraction/SilabsPlatformBase.h",
-    "${silabs_platform_dir}/platformAbstraction/WiseMcuSpam.cpp",
     "../../FreeRTOS/SystemTimeSupport.cpp",
     "../../SingletonConfigurationManager.cpp",
     "../rs911x/BLEManagerImpl.cpp",
@@ -77,23 +72,26 @@ static_library("SiWx917") {
     "SiWxPlatformInterface.h",
   ]
 
-  if (chip_enable_ota_requestor) {
-    sources += [
-      "${silabs_platform_dir}/OTAImageProcessorImpl.h",
-      "OTAImageProcessorImpl.cpp",
-    ]
-  }
-
   public_deps = [
     "${chip_root}/src/app/icd/server:icd-server-config",
     "${chip_root}/src/platform:platform_base",
+    "${silabs_platform_dir}/platformAbstraction:wisemcu",
   ]
   deps = [
     "${chip_root}/src/app/common:ids",
     "${chip_root}/src/platform/logging:headers",
     "${sl_provision_root}:headers",
   ]
 
+  if (chip_enable_multi_ota_requestor) {
+    public_deps += [ "${silabs_platform_dir}/multi-ota:multi-ota-siwx" ]
+  } else if (chip_enable_ota_requestor) {
+    sources += [
+      "${silabs_platform_dir}/OTAImageProcessorImpl.h",
+      "OTAImageProcessorImpl.cpp",
+    ]
+  }
+
   # Add platform crypto implementation
   if (chip_crypto == "platform") {
     if (sl_si91x_crypto_flavor == "tinycrypt") {