Merge branch 'master' into update_zephyr_3.7

Author: s07641069

.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/docker_img.yaml

@@ -105,6 +105,7 @@ jobs:
                     - "-nxp-zephyr"
                     - "-nrf-platform"
                     - "-telink"
+                    - "-telink-zephyr_3_3"
                     - "-ti"
                     - "-tizen"
                     - "-openiotsdk"

.github/workflows/examples-linux-standalone.yaml

@@ -238,7 +238,17 @@ jobs:
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     linux debug camera-app \
                     out/linux-x64-camera/chip-camera-app \
-                    /tmp/bloat_reports/                                     
+                    /tmp/bloat_reports/
+            - name: Build example Camera Controller App
+              run: |
+                  ./scripts/run_in_build_env.sh \
+                     "./scripts/build/build_examples.py \
+                        --target linux-x64-camera-controller \
+                        build"
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    linux debug camera-controller \
+                    out/linux-x64-camera-controller/camera-controller \
+                    /tmp/bloat_reports/                                                     
             - name: Uploading Size Reports
               uses: ./.github/actions/upload-size-reports
               if: ${{ !env.ACT }}

.github/workflows/examples-telink.yaml

@@ -315,19 +315,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/
+            # 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: clean out build output
+            #   run: rm -rf ./out
 
             - name: Build example Telink (B91) Thermostat App
               # Run test for master and s07641069 PRs

.github/workflows/zap_regeneration.yaml

@@ -28,7 +28,7 @@ jobs:
     zap_regeneration:
         name: ZAP Regeneration
 
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
         container:
             image: ghcr.io/project-chip/chip-build:119
         defaults:

.github/workflows/zap_templates.yaml

@@ -33,7 +33,7 @@ jobs:
     zap_templates:
         name: ZAP templates generation
 
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
         container:
             image: ghcr.io/project-chip/chip-build:119
         defaults:

.vscode/launch.json

@@ -550,6 +550,25 @@
             "runToEntryPoint": "main",
             "preLaunchTask": "Debug Open IoT SDK unit-tests",
             "showDevDebugOutput": "parsed"
+        },
+        {
+            "name": "Zephyr native tests",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/out/nrf-native-sim-tests/nrfconnect/zephyr/zephyr.exe",
+            "args": ["-testargs"],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}/out/nrf-native-sim-tests/nrfconnect",
+            "environment": [],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
         }
     ],
     "inputs": [

CODEOWNERS

@@ -67,5 +67,6 @@ stm32/                           @STYoannZamaron
 
 telink/                          @s07641069
 chip-build-telink/               @s07641069
+chip-build-telink-zephyr_3_3/    @s07641069
 
 webos/                           @joonhaengHeo

CONTRIBUTING.md

@@ -175,7 +175,7 @@ be useful for quick filtering like `[TC-ABC-1.2]` to tag test changes.
 Examples of descriptive titles:
 
 -   `[Silabs] Fix compile of SiWx917 if LED and BUTTON are disabled`
--   `[Telink] Update build Dockerfile with new Zeprhy SHA: c05c4.....`
+-   `[Telink] Update build Dockerfile with new Zephyr SHA: c05c4.....`
 -   `General Commissioning Cluster: use AttributeAccessInterface/CommandHandlerInterface for processing`
 -   `Scenes Management/CopyScene: set access as manage instead of default to match the spec`
 -   `Fix build errors due to ChipDeviceEvent default constructor not being available`

SECURITY.md

@@ -0,0 +1,11 @@
+# Security Policy
+
+Thank you for helping us keep the Matter SDK secure!
+
+## Reporting a Vulnerability
+
+To report a security vulnerability, please follow the instructions at
+[Report a Vulnerability | How to Report - CSA-IOT](https://csa-iot.org/vulnerability-reporting/).
+
+We appreciate responsible disclosure and will work to address any issues
+promptly.

build/config/compiler/BUILD.gn

@@ -671,3 +671,10 @@ config("specs_default") {
     ldflags = cflags
   }
 }
+
+config("link_as_needed") {
+  # ld64.lld on clang used by Apple does not have a --as-needed option
+  if (current_os != "mac" && current_os != "ios") {
+    ldflags = [ "-Wl,--as-needed" ]
+  }
+}

build/config/defaults.gni

@@ -61,6 +61,10 @@ declare_args() {
   # Defaults configs for pie.
   default_configs_pie = [ "${build_root}/config/compiler:pie_default" ]
 
+  # Default configs for GNU ld --as-needed
+  default_configs_link_as_needed =
+      [ "${build_root}/config/compiler:link_as_needed" ]
+
   # Defaults configs for warnings.
   default_configs_warnings =
       [ "${build_root}/config/compiler:warnings_default" ]
@@ -124,3 +128,4 @@ default_configs += default_configs_extra
 
 executable_default_configs = []
 executable_default_configs += default_configs_pie
+executable_default_configs += default_configs_link_as_needed

config/common/cmake/chip_gn.cmake

@@ -36,6 +36,10 @@ if (NOT CHIP_ROOT)
     get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../.. REALPATH)
 endif()
 
+if (NOT CHIP_APP_ZAP_DIR)
+    get_filename_component(CHIP_APP_ZAP_DIR ${CHIP_ROOT}/zzz_generated/app-common REALPATH)
+endif()
+
 # ==============================================================================
 # Find required programs
 # ==============================================================================
@@ -165,7 +169,7 @@ macro(matter_build target)
         ${CHIP_ROOT}/third_party/nlassert/repo/include
         ${CHIP_ROOT}/third_party/nlio/repo/include
         ${CHIP_ROOT}/third_party/nlfaultinjection/include
-        ${CHIP_ROOT}/zzz_generated/app-common
+        ${CHIP_APP_ZAP_DIR}
         ${CMAKE_CURRENT_BINARY_DIR}/gen/include
     )
 

config/nrfconnect/chip-module/CMakeLists.txt

@@ -41,6 +41,11 @@ include(generate_factory_data.cmake)
 if (NOT CHIP_ROOT)
     get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../.. REALPATH)
 endif()
+
+if (NOT CHIP_APP_ZAP_DIR)
+    get_filename_component(CHIP_APP_ZAP_DIR ${CHIP_ROOT}/zzz_generated/app-common REALPATH)
+endif()
+
 get_filename_component(GN_ROOT_TARGET ${CHIP_ROOT}/config/nrfconnect/chip-gn REALPATH)
 get_filename_component(COMMON_CMAKE_SOURCE_DIR ${CHIP_ROOT}/config/common/cmake REALPATH)
 
@@ -132,6 +137,7 @@ matter_common_gn_args(
 matter_add_gn_arg_string("zephyr_ar"                              ${CMAKE_AR})
 matter_add_gn_arg_string("zephyr_cc"                              ${CMAKE_C_COMPILER})
 matter_add_gn_arg_string("zephyr_cxx"                             ${CMAKE_CXX_COMPILER})
+matter_add_gn_arg_string("chip_app_zap_dir"                       ${CHIP_APP_ZAP_DIR})
 matter_add_gn_arg_bool  ("chip_logging"                           CONFIG_LOG)
 matter_add_gn_arg_bool  ("chip_enable_openthread"                 CONFIG_NET_L2_OPENTHREAD)
 matter_add_gn_arg_bool  ("chip_openthread_ftd"                    CONFIG_OPENTHREAD_FTD)

config/telink/chip-module/Kconfig.defaults

@@ -90,6 +90,7 @@ config HEAP_MEM_POOL_SIZE
 config COMMON_LIBC_MALLOC_ARENA_SIZE
     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 13568 if SOC_RISCV_TELINK_W91
     default 12288
 
 config NET_IPV6_MLD