Merge branch 'master' into link_as_needed

Author: enkiusz

.devcontainer/Dockerfile

@@ -22,7 +22,7 @@ LABEL org.opencontainers.image.source https://github.com/project-chip/connectedh
 ARG USERNAME=vscode
 ARG USER_UID=1000
 ARG USER_GID=$USER_UID
-ENV LANG en_US.utf8
+ENV LANG=en_US.utf8
 
 
 # These are installed for terminal/dev convenience. If more tooling for build is required, please
@@ -81,17 +81,17 @@ RUN sed -i '/^TIZEN_SDK_DATA_PATH/d' $TIZEN_SDK_ROOT/sdk.info \
     && ln -sf /home/$USERNAME/.tizen-cli-config $TIZEN_SDK_ROOT/tools/.tizen-cli-config \
     && : # last line
 
-ENV TIZEN_ROOTFS /tizen_rootfs
+ENV TIZEN_ROOTFS=/tizen_rootfs
 
 # Fast Model GDB plugins path for debugging support
-ENV FAST_MODEL_PLUGINS_PATH /opt/FastModelsPortfolio_11.16/plugins/Linux64_GCC-9.3
+ENV FAST_MODEL_PLUGINS_PATH=/opt/FastModelsPortfolio_11.16/plugins/Linux64_GCC-9.3
 
 # Set up ccache as a pigweed command launcher when using the scripts/build/build_examples.py
 # script. Also, set up icecc as the command prefix for ccache. Such setup allows to benefit
 # from compilation caching and distributed compilation at the same time.
 #
 # NOTE: In order to use distributed compilation with icecc, one should run
 #       "scripts/icecc.sh start" before starting the build.
-ENV CHIP_PW_COMMAND_LAUNCHER ccache
-ENV CCACHE_PREFIX icecc
-ENV PATH /usr/lib/ccache:$PATH
+ENV CHIP_PW_COMMAND_LAUNCHER=ccache
+ENV CCACHE_PREFIX=icecc
+ENV PATH=/usr/lib/ccache:$PATH

.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

docs/requirements.txt

@@ -1,5 +1,5 @@
 docutils==0.21.2
-Sphinx==8.2.0
+Sphinx==8.2.3
 sphinx-book-theme
 myst-parser>=2.0.0
 breathe>=4.34

examples/energy-management-app/energy-management-common/energy-management-app.matter

@@ -2576,7 +2576,8 @@ provisional cluster DeviceEnergyManagementMode = 159 {
 }
 
 endpoint 0 {
-  device type ma_rootdevice = 22, version 1;
+  device type ma_rootdevice = 22, version 3;
+  device type ma_otarequestor = 18, version 1;
 
   binding cluster OtaSoftwareUpdateProvider;
 
@@ -2786,8 +2787,8 @@ endpoint 0 {
 endpoint 1 {
   device type ma_powersource = 17, version 1;
   device type ma_electricalsensor = 1296, version 1;
-  device type energy_evse = 1292, version 1;
-  device type device_energy_management = 1293, version 1;
+  device type energy_evse = 1292, version 2;
+  device type device_energy_management = 1293, version 2;
 
 
   server cluster Identify {

examples/energy-management-app/energy-management-common/energy-management-app.zap

@@ -51,13 +51,22 @@
           "label": "MA-rootdevice",
           "name": "MA-rootdevice",
           "deviceTypeOrder": 0
+        },
+        {
+          "code": 18,
+          "profileId": 259,
+          "label": "MA-otarequestor",
+          "name": "MA-otarequestor",
+          "deviceTypeOrder": 1
         }
       ],
       "deviceVersions": [
+        3,
         1
       ],
       "deviceIdentifiers": [
-        22
+        22,
+        18
       ],
       "deviceTypeName": "MA-rootdevice",
       "deviceTypeCode": 22,
@@ -1606,7 +1615,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": null,
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -2561,9 +2570,9 @@
         }
       ],
       "deviceVersions": [
+        2,
         1,
-        1,
-        1,
+        2,
         1
       ],
       "deviceIdentifiers": [

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

integrations/docker/images/stage-2/chip-build-java/Dockerfile

@@ -19,5 +19,5 @@ RUN set -x \
     && rm -f kotlinc/bin/*.bat \
     && : # last line
 
-ENV PATH $PATH:/usr/lib/kotlinc/bin
+ENV PATH=$PATH:/usr/lib/kotlinc/bin
 ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64