[Telink] Zephyr 3.3 & 3.7 support (project-chip#37582)

* [Telink] Zephyr v3.7 update changes

Adopted changes for Telink B9x board series for
upcoming update of Zephyr version.

Fixed err output from InitChipStack in mainCommon.
Tested advertisement tested manually.

* [Telink] Manual Zephyr SDK update to check CI jobs

* [Telink] Fix build errors:
- STREAM_FLASH_ERASE has direct dependencies STREAM_FLASH
- GETOPT_LONG multiple definition error

* [Telink] CONFIG_BOOT_MAX_IMG_SECTORS_AUTO used

* [Telink] Fix build errors

* [Telink] Reduce mcuboot partition size to 60Kb
- Apply change for flash overlays <=2Mb
- Possible after reducing CONFIG_BOOT_MAX_IMG_SECTORS

* [Telink] Reduce NET_BUF_*_COUNT (to be tested)

* [Telink] avoid using NEWLIB_LIBC (use PICOLIB)

* Restyled by whitespace

* Restyled by clang-format

* [Telink] Update Zephyr revision & SDK

* [Telink] Adopt TL3218 to latest Zephyr version

* [Telink] Use 4mb flash for (B92) Light Switch App target build

* [Telink] Fix W91 target build

* [Telink] Fix B91 Mars target build

* [Telink] Use correct if SOC_RISCV_TELINK_TL321X

* [Telink] Fix retention target builds

* [Telink] fixed W91 WiFi interface init

reverted GetWifiInterface in InetUtils changes,
added syntax fixes to Kconfigs.default

* [Telink] Update to latest zephyr (develop_new_matter_fixes) hash

* [Telink] memory layout and default config changes

Reduced mcuboot partition by 0x1000 and removed two other partitions
getting 0x3000 to distribute 0x4000 between slot0 and slot 1.

Kconfig.defaults changes to reduce ROM usage on B92 lighting OTA.
To be improved

[Telink] reduced MCUboot partition for most targets

increase of slot0,1, bootloader config changes

[Telink] Fixed B9x platform startup

Lack of MBEDTLS_ZEPHYR_ENTROPY config in defaults
which led to InitChipStack 172 error.
As result entropy failed in src/platform/Zephyr/PlatformManagerImpl.cpp

[Telink] fixed B9x commissioning

Reverted network buffers configs

[Telink] TL3218 commissioning fixes

Changes to fix TLx commissioning on new Zephyr

[Telink] Zephyr revision update

After merge updates.
Kconfig change to fix TL3218 commissioning
Reduced RAM usage to build TL3218 by
COMMON_LIBC_MALLOC_ARENA_SIZE changing

[Telink] zephyr version change, cleanup

Changed MCUBOOT logs config, same for LZMA

* [Telink] W91 OTA, Factory data commissioning fix

Fixes full config target commissioning for W91.
Been failing on `SendAttestationRequest` step,
finished with `general error 0x01`.

Tested manually with chip-tool on RPi on tlsr9118bdk40d

* [Telink] W91 stacks increase

Increased NET_MGMT_EVENT_STACK_SIZE by 122 B
and IPC_SERVICE_BACKEND_ICMSG_WQ_STACK_SIZE by 256 B
so that net_mgmt and icmsg_workq stack were used <90%.
Jenkins reported thread analyzer warnings on that.

* [Telink] review changes draft

Reverted NET_BUF_RX/TX_COUNT

* [Telink] Add tl7218 board.

* [Telink] Fix compilation warnings.

* [Telink] Fix config option.

* [Telink] Cleanup MbedTLS configuration.

* [Telink] Update tl721x default Kconfig

- update the default values for BT_RX_STACK_SIZE and COMMON_LIBC_MALLOC_ARENA_SIZE for TL721X

Signed-off-by: Jinmiao Yu <jinmiao.yu@telink-semi.com>

* [Telink] Remove unused files

* [Telink] Update Zephyr revision

* [Telink] Clean config types

* [Telink] Update Zephyr revision

* [Telink] Increase BLE_CTRL_THREAD_STACK_SIZE (B92 SoC retention test)

* [Telink] Fix compilation warninig

* [Telink] TL7218 upgrade to support version A2

* [Telink] Remove unused file after resolve merge conflict

* [Telink] Add tl7218_retention target

* riscv: telink: seperate ram for tl3218x .

- use retention mode to seperate ram.
- reserve more ram for ilm.

Signed-off-by: Haiwen Xia <haiwen.xia@telink-semi.com>

* [Telink] Fix broken GitHub CI after adding tl721x target

* [Telink] remove temporary LZMA for tl321x due to bug

* [Telink] Fix TELINK_TLX_MATTER_RETENTION_LAYOUT typo for BOARD_TL3218

* [Telink] Add GPIO/PWM required for TL721X
telink-semi/hal_telink@62edeab

* [Telink] Temporary disable B95 OTA failed build
B95 will be removed fully in next commits

* [Telink] Add missed clean out build output step

* [Telink] adopt WiFi driver

* [Telink] remove b95 SoC / TLSR9258a board (replaced by TL721x)

* [Telink] Revert InetUtils.cpp Telink dependency

* [Telink] zephyr versions compatibility changes (project-chip#382)

* [Telink] zephyr versions compatibility changes

* [Telink] Change Window Covering App default SoC
W91 doesn't support PM

* [Telink] Update Zephyr revision

* [Telink] sync B92 flash layout

* [Telink] Remove temp b92 4mb change

* [Telink] Avoid main stack owerflow for w91

* [Telink] Update Zephyr revision

* [Telink] manual sync after merge master

* [Telink] Increase Main Stack size for W91
Update Zephyr revision

* [Telink] Zephyr 3.3 backward compatibility support

* riscv: telink: fix insufficient RAM when config LZMA (project-chip#384)

 - adjust the zephyr hash to 930b6d4 .

Signed-off-by: Fengtai Xie <fengtai.xie@telink-semi.com>

* riscv: telink: add retention mode for buteo (project-chip#385)

* riscv: telink: Update Zephyr hash

 - adjust the zephyr hash to 9e39d9f .
 - add tl3218x_retention target .

Signed-off-by: Fengtai Xie <fengtai.xie@telink-semi.com>

* riscv: telink: remove retention build target for buteo

Signed-off-by: Fengtai Xie <fengtai.xie@telink-semi.com>

* [Telink] Add comment

---------

Signed-off-by: Fengtai Xie <fengtai.xie@telink-semi.com>
Co-authored-by: Alex Tsitsiura <s07641069@gmail.com>

* [Telink] Fix commisioning issue due to missed MbedTLS module
TODO: fix compilation warnings

* telink: tl7218x: fix tercel retention (Update Zephyr hash)

* [Telink] Optimize add MbedTLS definitions for Zephyr 3.3 without warnings

* [Telink] Use latest hash for Zephyr 3.3

* [Telink] Disable debug part

---------

Signed-off-by: Jinmiao Yu <jinmiao.yu@telink-semi.com>
Signed-off-by: Haiwen Xia <haiwen.xia@telink-semi.com>
Signed-off-by: Fengtai Xie <fengtai.xie@telink-semi.com>
Co-authored-by: interfer <diman1436@gmail.com>
Co-authored-by: Restyled.io <commits@restyled.io>
Co-authored-by: Dmytro Huz <75682372+interfer@users.noreply.github.com>
Co-authored-by: Andrii Bilynskyi <andrii.bilynskyi@telink-semi.com>
Co-authored-by: Haiwen Xia <haiwen.xia@telink-semi.com>
Co-authored-by: Serhii Salamakha <serhii.salamakha@gmail.com>
Co-authored-by: fengtai-telink <fengtai.xie@telink-semi.com>

Author: 7 people

.github/workflows/examples-telink.yaml

@@ -175,6 +175,9 @@ jobs:
                     out/telink-tl3218x-light-ota-compress-lzma-shell-factory-data/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
+            - name: clean out build output (keep tools)
+              run: rm -rf ./out/telink*
+
             - name: Build example Telink (tl321x_retention) Light Switch App with OTA, Shell, Factory Data
               # Run test for master and all PRs
               run: |
@@ -311,19 +314,21 @@ jobs:
             - name: clean out build output
               run: rm -rf ./out
 
-            - name: Build example Telink (B91 Mars) Temperature Measurement App with OTA
-              # Run test for master and s07641069 PRs
-              if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
-              run: |
-                  ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-temperature-measurement-mars-ota' build"
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tlsr9518adk80d temperature-measurement-app-mars-ota \
-                    out/telink-tlsr9518adk80d-temperature-measurement-mars-ota/zephyr/zephyr.elf \
-                    /tmp/bloat_reports/
-
-            - name: clean out build output
-              run: rm -rf ./out
+            # B91 Mars adopted only for Zephyr 3.7
+            # Will be uncommented in next commits
+            # - name: Build example Telink (B91 Mars) Temperature Measurement App with OTA
+            #   # Run test for master and s07641069 PRs
+            #   if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
+            #   run: |
+            #       ./scripts/run_in_build_env.sh \
+            #         "./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-temperature-measurement-mars-ota' build"
+            #       .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+            #         telink tlsr9518adk80d temperature-measurement-app-mars-ota \
+            #         out/telink-tlsr9518adk80d-temperature-measurement-mars-ota/zephyr/zephyr.elf \
+            #         /tmp/bloat_reports/
+
+            # - name: clean out build output
+            #   run: rm -rf ./out
 
             - name: Build example Telink (B91) Thermostat App
               # Run test for master and s07641069 PRs

config/telink/app/bootloader.conf

@@ -29,6 +29,7 @@ CONFIG_BOOT_SWAP_USING_SCRATCH=n
 # With disabled option the only image magic is validated
 CONFIG_BOOT_VALIDATE_SLOT0=y
 
+# Required for Zephyr 3.3 and replased with CONFIG_BOOT_MAX_IMG_SECTORS_AUTO in new versions
 # Maximum number of image sectors supported by the bootloader.
 # Maximum signed image size: 512 * 4096 = 2M Bytes
 CONFIG_BOOT_MAX_IMG_SECTORS=512
@@ -40,3 +41,5 @@ CONFIG_BOOT_MAX_IMG_SECTORS=512
 #  - INFO,  LOG_LEVEL_INF
 #  - DEBUG, LOG_LEVEL_DBG
 CONFIG_MCUBOOT_LOG_LEVEL_INF=y
+
+CONFIG_PICOLIBC=y

config/telink/app/bootloader_compress_lzma.conf

@@ -22,6 +22,7 @@ CONFIG_BOOT_UPGRADE_ONLY=y
 # With disabled option the only image magic is validated
 CONFIG_BOOT_VALIDATE_SLOT0=y
 
+# Required for Zephyr 3.3 and replased with CONFIG_BOOT_MAX_IMG_SECTORS_AUTO in new versions
 # Maximum number of image sectors supported by the bootloader.
 # Maximum signed image size: 512 * 4096 = 2M Bytes
 CONFIG_BOOT_MAX_IMG_SECTORS=512
@@ -42,3 +43,5 @@ CONFIG_SIZE_OPTIMIZATIONS=y
 
 # Enable support LZMA compression
 CONFIG_COMPRESS_LZMA=y
+
+CONFIG_PICOLIBC=y

config/telink/chip-module/CMakeLists.txt

@@ -56,6 +56,7 @@ endif()
 matter_add_flags(-DNL_ASSERT_USE_FLAGS_DEFAULT=1)
 
 zephyr_include_directories(${CHIP_ROOT}/src/platform/telink/)
+zephyr_include_directories(${CHIP_ROOT}/src/platform/telink/wifi/${ZEPHYR_VERSION_STRING})
 
 zephyr_get_compile_flags(ZEPHYR_CFLAGS_C C)
 matter_add_cflags("${ZEPHYR_CFLAGS_C}")
@@ -64,7 +65,7 @@ matter_add_cxxflags("${ZEPHYR_CFLAGS_CC}")
 zephyr_get_gnu_cpp_standard(ZEPHYR_GNU_CPP_STD)
 matter_add_cxxflags(${ZEPHYR_GNU_CPP_STD})
 
-matter_add_flags(-DMBEDTLS_USER_CONFIG_FILE=<telink-mbedtls-config.h>)
+matter_add_flags(-DMBEDTLS_USER_CONFIG_FILE=<${CONFIG_MBEDTLS_CFG_FILE}>)
 
 # Set up custom OpenThread configuration
 

config/telink/chip-module/Kconfig

@@ -46,7 +46,7 @@ config BOOTLOADER_MCUBOOT
 	select IMG_MANAGER
 	select STREAM_FLASH
 	select STREAM_FLASH_ERASE
-	select TELINK_W91_N22_MATTER_OTA_LAYOUT if BOARD_TLSR9118BDK40D
+	select TELINK_W91_N22_MATTER_OTA_LAYOUT if BOARD_TLSR9118BDK40D || BOARD_TLSR9118BDK40D_V1
 
 config CHIP_OTA_REQUESTOR_BUFFER_SIZE
 	int "OTA Requestor image buffer size"

config/telink/chip-module/Kconfig.defaults

@@ -24,6 +24,10 @@ config CHIP_PROJECT_CONFIG
     string "Project configuration file for Matter"
     default "include/CHIPProjectConfig.h"
 
+config ZEPHYR_VERSION_3_3
+    bool "Using Zephyr version 3.3"
+    default n
+
 config LOG
     default y
 
@@ -62,6 +66,7 @@ config POSIX_MAX_FDS
 # Application stack size
 config MAIN_STACK_SIZE
     default 3240 if PM || SOC_RISCV_TELINK_TL321X
+    default 4608 if SOC_RISCV_TELINK_W91 && !ZEPHYR_VERSION_3_3
     default 4096
 
 config INIT_STACKS
@@ -79,11 +84,12 @@ config SYSTEM_WORKQUEUE_STACK_SIZE
     default 616 if PM
 
 config HEAP_MEM_POOL_SIZE
-    default 256
+    default 256 if ZEPHYR_VERSION_3_3
+    default 1280
 
 config COMMON_LIBC_MALLOC_ARENA_SIZE
-    default 20716 if SOC_RISCV_TELINK_TL321X || SOC_SERIES_RISCV_TELINK_B9X_RETENTION
-    default 16384 if SOC_RISCV_TELINK_TL721X
+    default 20716 if SOC_SERIES_RISCV_TELINK_B9X_RETENTION || (SOC_RISCV_TELINK_TL321X && ZEPHYR_VERSION_3_3)
+    default 16384 if SOC_RISCV_TELINK_TL721X || (SOC_RISCV_TELINK_TL321X && !ZEPHYR_VERSION_3_3)
     default 12288
 
 config NET_IPV6_MLD
@@ -171,7 +177,8 @@ config BT_DEVICE_NAME_GATT_WRITABLE
 if SOC_RISCV_TELINK_B9X || SOC_RISCV_TELINK_TLX
 
 config TL_BLE_CTRL_THREAD_STACK_SIZE
-    default 648
+    default 648 if ZEPHYR_VERSION_3_3
+    default 680
 
 config TL_BLE_CTRL_MASTER_MAX_NUM
     default 0
@@ -193,13 +200,9 @@ endif # SOC_RISCV_TELINK_B9X || SOC_RISCV_TELINK_TLX
 
 endif # BT
 
-# Board retention config
-# Cut down the ram cost by matter's change,it can keep ramcode (driver).
-# No need load the ramcode every time in thread mode (retention mode).
-# If the ram is not enough , can change it back , initial setting is n.
 if BOARD_TLSR9528A_RETENTION || BOARD_TLSR9518ADK80D_RETENTION
 config SOC_SERIES_RISCV_TELINK_B9X_NON_RETENTION_RAM_CODE
-    default n if PM
+    default y if PM
 
 config TELINK_B9X_MATTER_RETENTION_LAYOUT
     default y if PM
@@ -236,7 +239,7 @@ config CHIP_OTA_REQUESTOR
     default y
 
 config MCUBOOT_SIGNATURE_KEY_FILE
-    default "bootloader/mcuboot/root-ec-p256.pem" if BOARD_TLSR9118BDK40D
+    default "bootloader/mcuboot/root-ec-p256.pem" if BOARD_TLSR9118BDK40D || BOARD_TLSR9118BDK40D_V1
     depends on BOOTLOADER_MCUBOOT
 
 # In current config/zephyr/Kconfig
@@ -350,6 +353,8 @@ config CHIP_WIFI
     select NET_IPV6_ND # enable Neighbor Discovery to handle Router Advertisements
     select NET_IPV6_NBR_CACHE
     select NET_STATISTICS_USER_API
+    imply MBEDTLS_ENTROPY_C
+    imply MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
 
 if CHIP_WIFI
 
@@ -404,7 +409,14 @@ config CHIP_WIFI_CONNECTION_RECOVERY_JITTER
       within range [-JITTER; +JITTER].
 
 config NET_MGMT_EVENT_STACK_SIZE
-    default 1128
+    default 1128 if ZEPHYR_VERSION_3_3
+    default 1250
+
+if !ZEPHYR_VERSION_3_3
+config IPC_SERVICE_BACKEND_ICMSG_WQ_STACK_SIZE
+    int "Size of RX work queue stack"
+    default 2304 if TELINK_W91_IPC_DISPATCHER
+endif
 
 endif # CHIP_WIFI
 
@@ -419,12 +431,9 @@ config CHIP_ENABLE_PAIRING_AUTOSTART
 config MBEDTLS
     default y
 
-config MBEDTLS_USER_CONFIG_ENABLE
+config MBEDTLS_CIPHER_AES_ENABLED
     default y
 
-config MBEDTLS_USER_CONFIG_FILE
-    default "telink-mbedtls-config.h"
-
 config MBEDTLS_CIPHER_CCM_ENABLED
     default y
 
@@ -443,10 +452,29 @@ config MBEDTLS_ECDH_C
 config MBEDTLS_ECDSA_C
     default y
 
-# getopt version
-config GETOPT_LONG
+config MBEDTLS_PKCS5_C
+    default y
+
+config MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
+    default y
+
+if !ZEPHYR_VERSION_3_3
+config MBEDTLS_ENTROPY_POLL_ZEPHYR
+    bool "Provide entropy data to Mbed TLS through entropy driver or random generator"
+    default y
+
+config MBEDTLS_HKDF_C
+    bool "HMAC-based Extract-and-Expand Key Derivation Function"
     default y
 
+config MBEDTLS_X509_CSR_WRITE_C
+    bool "X.509 Certificate Signing Requests writing"
+    default y
+endif # !ZEPHYR_VERSION_3_3
+
+config GETOPT_LONG
+    default y if ZEPHYR_VERSION_3_3
+
 # Disable not used shell modules
 
 config SHELL_WILDCARD

examples/platform/telink/common.cmake

@@ -13,6 +13,27 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+# Generate Zephyr version files for backward compatibility
+file(STRINGS "$ENV{ZEPHYR_BASE}/VERSION" ZEPHYR_VERSION_STRING REGEX "[0-9]+")
+string(REGEX REPLACE "[^0-9;]" "" ZEPHYR_VERSION_STRING "${ZEPHYR_VERSION_STRING}")
+string(REPLACE ";" "." ZEPHYR_VERSION_STRING "${ZEPHYR_VERSION_STRING}")
+file(WRITE "${CMAKE_BINARY_DIR}/modules/chip-module/zephyr_version.gni" "ZEPHYR_VERSION_STRING = \"${ZEPHYR_VERSION_STRING}\"\n")
+if(${ZEPHYR_VERSION_STRING} MATCHES "^3\\.3")
+  set(ZEPHYR_VERSION_OVERLAY_FILE "${CMAKE_BINARY_DIR}/zephyr_version.conf")
+  file(WRITE ${ZEPHYR_VERSION_OVERLAY_FILE} "CONFIG_ZEPHYR_VERSION_3_3=y\n")
+
+  function(add_compile_definitions)
+    foreach(flag IN LISTS ARGN)
+      add_definitions(-D${flag})
+      list(APPEND MATTER_CFLAGS "-D${flag}")
+    endforeach()
+    set(MATTER_CFLAGS "${MATTER_CFLAGS}" PARENT_SCOPE)
+  endfunction()
+
+  # Add required MbedTLS defines for Zephyr 3.3
+  add_compile_definitions(MBEDTLS_HKDF_C MBEDTLS_X509_CREATE_C MBEDTLS_X509_CSR_WRITE_C)
+endif()
+
 string(REPLACE "_retention" "" BASE_BOARD ${BOARD})
 string(REGEX REPLACE "_v[0-9]+" "" BASE_BOARD ${BASE_BOARD})
 
@@ -117,7 +138,7 @@ else()
 endif()
 
 if(NOT CONF_FILE)
-  set(CONF_FILE ${USB_CONF_OVERLAY_FILE} ${MARS_CONF_OVERLAY_FILE} prj.conf)
+  set(CONF_FILE ${USB_CONF_OVERLAY_FILE} ${MARS_CONF_OVERLAY_FILE} ${ZEPHYR_VERSION_OVERLAY_FILE} prj.conf)
 endif()
 
 # Load NCS/Zephyr build system

src/platform/Zephyr/InetUtils.cpp

@@ -43,15 +43,15 @@ net_if * GetInterface(Inet::InterfaceId ifaceId)
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
 net_if * GetWiFiInterface()
 {
-// TODO: Remove dependency after Telink Zephyr update
-// net_if_get_first_wifi() is not available in Zephyr 3.3.99
-#if !defined(CONFIG_SOC_RISCV_TELINK_W91)
-    return net_if_get_first_wifi();
-#else
+// TODO: Remove dependency after Telink Zephyr 3.3 support is removed
+// net_if_get_first_wifi() is not available in Zephyr 3.3
+#if defined(CONFIG_SOC_RISCV_TELINK_W91) && defined(CONFIG_ZEPHYR_VERSION_3_3)
     return GetInterface();
+#else
+    return net_if_get_first_wifi();
 #endif
 }
-#endif
+#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
 } // namespace InetUtils
 } // namespace DeviceLayer

src/platform/telink/BLEManagerImpl.cpp

@@ -40,7 +40,11 @@
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/drivers/flash.h>
+#if defined(CONFIG_ZEPHYR_VERSION_3_3)
 #include <zephyr/random/rand32.h>
+#else
+#include <zephyr/random/random.h>
+#endif
 #include <zephyr/storage/flash_map.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/util.h>

src/platform/telink/BUILD.gn

@@ -96,14 +96,15 @@ static_library("telink") {
   }
 
   if (chip_enable_wifi) {
+    import("$root_build_dir/zephyr_version.gni")
     sources += [
       "OTAImageProcessorImplWiFi.h",
-      "wifi/ConnectivityManagerImplWiFi.cpp",
+      "wifi/" + ZEPHYR_VERSION_STRING + "/ConnectivityManagerImplWiFi.cpp",
       "wifi/ConnectivityManagerImplWiFi.h",
-      "wifi/TelinkWiFiDriver.cpp",
+      "wifi/" + ZEPHYR_VERSION_STRING + "/TelinkWiFiDriver.cpp",
       "wifi/TelinkWiFiDriver.h",
-      "wifi/WiFiManager.cpp",
-      "wifi/WiFiManager.h",
+      "wifi/" + ZEPHYR_VERSION_STRING + "/WiFiManager.cpp",
+      "wifi/" + ZEPHYR_VERSION_STRING + "/WiFiManager.h",
     ]
   }
 

src/platform/telink/ConnectivityManagerImpl.cpp

@@ -23,6 +23,7 @@
 #include <platform/ConnectivityManager.h>
 #include <platform/Zephyr/InetUtils.h>
 #include <platform/internal/BLEManager.h>
+#include <zephyr/net/net_if.h>
 
 #include <platform/internal/GenericConnectivityManagerImpl_UDP.ipp>
 
@@ -76,7 +77,11 @@ CHIP_ERROR JoinLeaveMulticastGroup(net_if * iface, const Inet::IPAddress & addre
 
         if (maddr && !net_if_ipv6_maddr_is_joined(maddr))
         {
+#if defined(CONFIG_ZEPHYR_VERSION_3_3)
             net_if_ipv6_maddr_join(maddr);
+#else
+            net_if_ipv6_maddr_join(iface, maddr);
+#endif
         }
     }
     else if (operation == UDPEndPointImplSockets::MulticastOperation::kLeave)

src/platform/telink/FactoryDataParser.c

@@ -43,7 +43,11 @@ static inline bool uint16_decode(zcbor_state_t * states, uint16_t * value)
 bool ParseFactoryData(uint8_t * buffer, uint16_t bufferSize, struct FactoryData * factoryData)
 {
     memset(factoryData, 0, sizeof(*factoryData));
+#if defined(CONFIG_ZEPHYR_VERSION_3_3)
     ZCBOR_STATE_D(states, MAX_FACTORY_DATA_NESTING_LEVEL, buffer, bufferSize, 1);
+#else
+    ZCBOR_STATE_D(states, MAX_FACTORY_DATA_NESTING_LEVEL, buffer, bufferSize, 1, 0);
+#endif
 
     bool res = zcbor_map_start_decode(states);
     struct zcbor_string currentString;

src/platform/telink/SystemPlatformConfig.h

@@ -55,10 +55,15 @@ struct ChipDeviceEvent;
 #define CHIP_SYSTEM_CONFIG_USE_SOCKETS 1
 
 // Reduce packet buffer pool size (default 15) to reduce ram consumption
-#if defined CONFIG_PM || defined CONFIG_SOC_RISCV_TELINK_TL321X
+#if defined(CONFIG_PM) || defined(CONFIG_SOC_RISCV_TELINK_TL321X)
 #define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 0
 #else
 #define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 8
 #endif
 
 // ========== Platform-specific Configuration Overrides =========
+
+// Disable Zephyr Socket extensions module, as the Zephyr RTOS now implements recvmsg()
+#if !defined(CONFIG_ZEPHYR_VERSION_3_3)
+#define CHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKET_EXTENSIONS 0
+#endif