Merge branch 'master' into Update_Energy_Cluster_XML_For_1_4

.github/workflows/build.yaml

@@ -332,7 +332,7 @@ jobs:
                   scripts/run_in_build_env.sh 'scripts/examples/gn_build_example.sh examples/chip-tool out/'
                   scripts/run_in_build_env.sh 'virtualenv pyenv'
                   source pyenv/bin/activate
-                  pip3 install -r src/setup_payload/python/requirements.txt
+                  pip3 install -r scripts/setup/requirements.setuppayload.txt
                   python3 src/setup_payload/tests/run_python_setup_payload_test.py out/chip-tool
 
     build_linux_python_lighting_device:

.github/workflows/chef.yaml

@@ -98,7 +98,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:54
+            image: ghcr.io/project-chip/chip-build-telink:57
             options: --user root
 
         steps:
@@ -110,7 +110,7 @@ jobs:
                 platform: telink
             # - name: Update Zephyr to specific revision (for developers purpose)
             #   shell: bash
-            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 0e8032dfef7e02498f34ba0b5d5d2df71a62adb1"
+            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
             - name: CI Examples Telink
               shell: bash
               run: |

.github/workflows/examples-efr32.yaml

@@ -33,14 +33,14 @@ jobs:
     name: EFR32
 
     env:
-      SILABS_BOARD: BRD4161A
+      SILABS_BOARD: BRD4187C
       BUILD_TYPE: gn_efr32
 
     runs-on: ubuntu-latest
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-efr32:54
+      image: ghcr.io/project-chip/chip-build-efr32:56
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:

.github/workflows/examples-linux-tv-casting-app.yaml

@@ -61,7 +61,7 @@ jobs:
             - name: Build Linux tv-casting-app
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "scripts/examples/gn_build_example.sh examples/tv-casting-app/linux/ out/tv-casting-app"
+                    "scripts/examples/gn_build_example.sh examples/tv-casting-app/linux/ out/tv-casting-app chip_casting_simplified=true"
 
             - name: Test casting from Linux tv-casting-app to Linux tv-app
               run: |

.github/workflows/examples-telink.yaml

@@ -38,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:54
+            image: ghcr.io/project-chip/chip-build-telink:57
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -57,7 +57,7 @@ jobs:
                 gh-context: ${{ toJson(github) }}
 
             # - name: Update Zephyr to specific revision (for developers purpose)
-            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 0e8032dfef7e02498f34ba0b5d5d2df71a62adb1"
+            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
 
             - name: Build example Telink (B92 retention) Air Quality Sensor App
               run: |

.github/workflows/release_artifacts.yaml

@@ -58,13 +58,13 @@ jobs:
     efr32:
         name: EFR32
         env:
-            SILABS_BOARD: BRD4161A
-            BUILD_DIRECTORY: out/lock_app_debug/BRD4161A
+            SILABS_BOARD: BRD4187C
+            BUILD_DIRECTORY: out/lock_app_debug/BRD4187C
 
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-efr32:54
+            image: ghcr.io/project-chip/chip-build-efr32:56
         steps:
             - name: Checkout
               uses: actions/checkout@v4

.gitmodules

@@ -231,10 +231,10 @@
 	url = https://github.com/SiliconLabs/sdk_support.git
 	branch = main
 	platforms = silabs,silabs_docker
-[submodule "third_party/silabs/gecko_sdk"]
-	path = third_party/silabs/gecko_sdk
-	url = https://github.com/SiliconLabs/gecko_sdk.git
-	branch = v4.4.2
+[submodule "third_party/silabs/simplicity_sdk"]
+	path = third_party/silabs/simplicity_sdk
+	url = https://github.com/SiliconLabs/simplicity_sdk.git
+	branch = v2024.6.0
 	platforms = silabs
 [submodule "third_party/silabs/wiseconnect-wifi-bt-sdk"]
 	path = third_party/silabs/wiseconnect-wifi-bt-sdk
@@ -244,7 +244,7 @@
 [submodule "third_party/silabs/wifi_sdk"]
 	path = third_party/silabs/wifi_sdk
 	url = https://github.com/SiliconLabs/wiseconnect.git
-	branch = v3.1.3-matter-hotfix.4
+	branch = v3.3.0
 	platforms = silabs
 [submodule "editline"]
 	path = third_party/editline/repo

.vscode/tasks.json

@@ -557,54 +557,18 @@
                 "bouffalolab-xt-zb6-devkit-light",
                 "bouffalolab-xt-zb6-devkit-light-rpc-115200",
                 "bouffalolab-bl706-night-light-light",
-                "efr32-brd4161a-light",
-                "efr32-brd4163a-light",
-                "efr32-brd4164a-light",
-                "efr32-brd4166a-light",
-                "efr32-brd4170a-light",
-                "efr32-brd4186a-light",
-                "efr32-brd4187a-light",
-                "efr32-brd4304a-light",
-                "efr32-brd4161a-light-rpc",
-                "efr32-brd4163a-light-rpc",
-                "efr32-brd4164a-light-rpc",
-                "efr32-brd4166a-light-rpc",
-                "efr32-brd4170a-light-rpc",
-                "efr32-brd4186a-light-rpc",
-                "efr32-brd4187a-light-rpc",
-                "efr32-brd4304a-light-rpc",
-                "efr32-brd4161a-lock",
-                "efr32-brd4163a-lock",
-                "efr32-brd4164a-lock",
-                "efr32-brd4166a-lock",
-                "efr32-brd4170a-lock",
-                "efr32-brd4186a-lock",
-                "efr32-brd4187a-lock",
-                "efr32-brd4304a-lock",
-                "efr32-brd4161a-unit-test",
-                "efr32-brd4163a-unit-test",
-                "efr32-brd4164a-unit-test",
-                "efr32-brd4166a-unit-test",
-                "efr32-brd4170a-unit-test",
-                "efr32-brd4186a-unit-test",
-                "efr32-brd4187a-unit-test",
-                "efr32-brd4304a-unit-test",
-                "efr32-brd4161a-switch",
-                "efr32-brd4163a-switch",
-                "efr32-brd4164a-switch",
-                "efr32-brd4166a-switch",
-                "efr32-brd4170a-switch",
-                "efr32-brd4186a-switch",
-                "efr32-brd4187a-switch",
-                "efr32-brd4304a-switch",
-                "efr32-brd4161a-window-covering",
-                "efr32-brd4163a-window-covering",
-                "efr32-brd4164a-window-covering",
-                "efr32-brd4166a-window-covering",
-                "efr32-brd4170a-window-covering",
-                "efr32-brd4186a-window-covering",
-                "efr32-brd4187a-window-covering",
-                "efr32-brd4304a-window-covering",
+                "efr32-brd4186c-light",
+                "efr32-brd4186c-light-rpc",
+                "efr32-brd4186c-lock",
+                "efr32-brd4186c-unit-test",
+                "efr32-brd4186c-switch",
+                "efr32-brd4186c-window-covering",
+                "efr32-brd4187c-light",
+                "efr32-brd4187c-light-rpc",
+                "efr32-brd4187c-lock",
+                "efr32-brd4187c-unit-test",
+                "efr32-brd4187c-switch",
+                "efr32-brd4187c-window-covering",
                 "efr32-brd4338a-light-wifi-917_soc-skip_rps_generation",
                 "esp32-c3devkit-all-clusters",
                 "esp32-devkitc-all-clusters",

BUILD.gn

@@ -161,6 +161,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
         "${chip_root}/examples/shell/standalone:chip-shell",
         "${chip_root}/src/app/tests/integration:chip-im-initiator",
         "${chip_root}/src/app/tests/integration:chip-im-responder",
+        "${chip_root}/src/inet/tests:inet-layer-test-tool",
         "${chip_root}/src/lib/address_resolve:address-resolve-tool",
         "${chip_root}/src/messaging/tests/echo:chip-echo-requester",
         "${chip_root}/src/messaging/tests/echo:chip-echo-responder",

build/chip/chip_test_suite.gni

@@ -94,9 +94,12 @@ template("chip_test_suite") {
 
     deps = [ dir_pw_unit_test ]
 
-    if (current_os != "zephyr" && current_os != "mbed") {
+    if (current_os != "zephyr" && current_os != "mbed" &&
+        chip_device_platform != "efr32") {
       # Depend on stdio logging, and have it take precedence over the default platform backend
-      public_deps += [ "${chip_root}/src/platform/logging:force_stdio" ]
+      public_deps += [ "${chip_root}/src/platform/logging:stdio" ]
+    } else {
+      public_deps += [ "${chip_root}/src/platform/logging:default" ]
     }
   }
   if (chip_link_tests) {

build/chip/tests.gni

@@ -15,8 +15,14 @@
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
 
+import("${chip_root}/build/chip/tools.gni")
 import("${chip_root}/src/platform/device.gni")
 
+declare_args() {
+  # Build monolithic test library.
+  chip_monolithic_tests = false
+}
+
 declare_args() {
   # Enable building tests.
   chip_build_tests = current_os != "freertos"
@@ -40,6 +46,6 @@ declare_args() {
 }
 
 declare_args() {
-  # Enable use of nlfaultinjection.
-  chip_with_nlfaultinjection = chip_build_tests
+  # Enable use of nlfaultinjection when building tests or when building tools.
+  chip_with_nlfaultinjection = chip_build_tests || chip_build_tools
 }

config/common/cmake/chip_gn.cmake

@@ -77,6 +77,7 @@ macro(matter_build target)
         LIB_PW_RPC
         LIB_MBEDTLS
         DEVICE_INFO_EXAMPLE_PROVIDER
+        FORCE_LOGGING_STDIO
     )
     set(multiValueArgs GN_DEPENDENCIES)
 
@@ -85,7 +86,11 @@ macro(matter_build target)
     set(MATTER_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/lib)
 
     # Prepare Matter libraries that the application should be linked with
-    set(MATTER_LIBRARIES -lCHIP)
+    if (FORCE_LOGGING_STDIO)
+        set(MATTER_LIBRARIES -lCHIPWithStdioLogging)
+    else()
+        set(MATTER_LIBRARIES -lCHIP)
+    endif()
 
     if (ARG_LIB_MBEDTLS)
         list(APPEND MATTER_LIBRARIES -lmbedtls)
@@ -158,6 +163,7 @@ macro(matter_build target)
         ${CHIP_ROOT}/src/include
         ${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
         ${CMAKE_CURRENT_BINARY_DIR}/gen/include
     )

config/nxp/chip-module/CMakeLists.txt

@@ -237,7 +237,7 @@ if (CONFIG_CHIP_OTA_REQUESTOR)
         COMMAND
         cp ${PROJECT_BINARY_DIR}/../modules/connectedhomeip/build_mcuboot/zephyr/zephyr.bin ${PROJECT_BINARY_DIR}/zephyr.mcuboot.bin
     )
-
+    add_dependencies(build_mcuboot ${ZEPHYR_FINAL_EXECUTABLE})
     set(BLOCK_SIZE "1024")
     dt_nodelabel(dts_partition_path NODELABEL "boot_partition")
     dt_reg_size(mcuboot_size PATH ${dts_partition_path})
@@ -249,7 +249,7 @@ if (CONFIG_CHIP_OTA_REQUESTOR)
         COMMAND
         dd if=${PROJECT_BINARY_DIR}/${ZEPHYR_OUTPUT_NAME}.bin of=${PROJECT_BINARY_DIR}/zephyr_full.bin bs=${BLOCK_SIZE} seek=${boot_blocks}
     )
-    add_dependencies(merge_mcuboot ${ZEPHYR_FINAL_EXECUTABLE})
+    add_dependencies(merge_mcuboot build_mcuboot)
 
     if (CONFIG_CHIP_OTA_IMAGE_BUILD)
         chip_ota_image(chip-ota-image

config/nxp/chip-module/Kconfig.defaults

@@ -205,7 +205,7 @@ config BT_BUF_ACL_TX_SIZE
 
 config BT_RX_STACK_SIZE
 	default 2048 if NO_OPTIMIZATIONS && DEBUG
-	default 1536
+	default 1600
 
 config BT_DEVICE_NAME_GATT_WRITABLE
 	bool
@@ -217,6 +217,9 @@ config HCI_NXP_ENABLE_AUTO_SLEEP
 config CHIP_OTA_REQUESTOR
 	default n
 
+config CHIP_DEVICE_SOFTWARE_VERSION
+	default 1
+
 # Enable extended discovery
 config CHIP_EXTENDED_DISCOVERY
 	default y
@@ -225,7 +228,7 @@ config NVS_LOOKUP_CACHE
 	default y
 
 config NVS_LOOKUP_CACHE_SIZE
-	default 512
+	default 1024
 
 if CHIP_WIFI
 

config/openiotsdk/CMakeLists.txt

@@ -79,6 +79,7 @@ matter_build(chip
     LIB_SHELL   ${CONFIG_CHIP_LIB_SHELL}
     LIB_TESTS   ${CONFIG_CHIP_LIB_TESTS}
     GN_DEPENDENCIES ${CONFIG_GN_DEPENDENCIES}
+    FORCE_LOGGING_STDIO ${CONFIG_CHIP_FORCE_LOGGING_STDIO}
 )
 
 target_link_libraries(chip INTERFACE

config/openiotsdk/cmake/chip.cmake

@@ -27,6 +27,7 @@ set(CONFIG_CHIP_PROJECT_CONFIG_INCLUDE_DIRS "" CACHE STRING "")
 set(CONFIG_CHIP_LIB_TESTS NO CACHE BOOL "")
 set(CONFIG_CHIP_LIB_SHELL NO CACHE BOOL "")
 
+set(CONFIG_CHIP_FORCE_LOGGING_STDIO NO CACHE BOOL "Enable stdio logging backend")
 set(CONFIG_CHIP_DETAIL_LOGGING YES CACHE BOOL "Enable logging at detail level")
 set(CONFIG_CHIP_PROGRESS_LOGGING YES CACHE BOOL "Enable logging at progress level")
 set(CONFIG_CHIP_AUTOMATION_LOGGING YES CACHE BOOL "Enable logging at automation level")

config/telink/chip-module/CMakeLists.txt

@@ -95,39 +95,40 @@ 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)
 matter_add_gn_arg_bool  ("chip_config_network_layer_ble"          CONFIG_BT)
-matter_add_gn_arg_bool  ("chip_inet_config_enable_ipv4"           CONFIG_NET_IPV4)
+matter_add_gn_arg_bool  ("chip_inet_config_enable_ipv4"           CONFIG_CHIP_IPV4)
 matter_add_gn_arg_bool  ("chip_enable_nfc"                        CONFIG_CHIP_NFC_COMMISSIONING)
 matter_add_gn_arg_bool  ("chip_enable_ota_requestor"              CONFIG_CHIP_OTA_REQUESTOR)
-matter_add_gn_arg_bool  ("chip_inet_config_enable_tcp_endpoint"   CONFIG_CHIP_BUILD_TESTS)
+matter_add_gn_arg_bool  ("chip_inet_config_enable_tcp_endpoint"   FALSE)
 matter_add_gn_arg_bool  ("chip_error_logging"                     CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 1)
 matter_add_gn_arg_bool  ("chip_progress_logging"                  CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 3)
 matter_add_gn_arg_bool  ("chip_detail_logging"                    CONFIG_MATTER_LOG_LEVEL GREATER_EQUAL 4)
 matter_add_gn_arg_bool  ("chip_automation_logging"                FALSE)
 matter_add_gn_arg_bool  ("chip_enable_wifi"                       CONFIG_WIFI_W91)
 matter_add_gn_arg_bool  ("chip_enable_icd_server"                 CONFIG_CHIP_ENABLE_ICD_SUPPORT)
+matter_add_gn_arg_bool  ("chip_enable_factory_data"               CONFIG_CHIP_FACTORY_DATA)
+matter_add_gn_arg_bool  ("chip_mdns_minimal"                      CONFIG_WIFI_W91)
+matter_add_gn_arg_bool  ("chip_mdns_platform"                     CONFIG_NET_L2_OPENTHREAD)
 
 if (CONFIG_CHIP_ENABLE_ICD_SUPPORT)
-    matter_add_gn_arg_bool  ("chip_enable_icd_lit"                      CONFIG_CHIP_ICD_LIT_SUPPORT)
-    matter_add_gn_arg_bool  ("chip_enable_icd_checkin"                  CONFIG_CHIP_ICD_CHECK_IN_SUPPORT)
-    matter_add_gn_arg_bool  ("chip_enable_icd_user_active_mode_trigger" CONFIG_CHIP_ICD_UAT_SUPPORT)
+    matter_add_gn_arg_bool  ("chip_enable_icd_lit"                       CONFIG_CHIP_ICD_LIT_SUPPORT)
+    matter_add_gn_arg_bool  ("chip_enable_icd_checkin"                   CONFIG_CHIP_ICD_CHECK_IN_SUPPORT)
+    matter_add_gn_arg_bool  ("chip_enable_icd_user_active_mode_trigger"  CONFIG_CHIP_ICD_UAT_SUPPORT)
 endif()
 
-if (CONFIG_CHIP_FACTORY_DATA)
-    matter_add_gn_arg_bool  ("chip_use_transitional_commissionable_data_provider"  "false")
-    matter_add_gn_arg_bool  ("chip_enable_factory_data"                            "true")
-elseif (CONFIG_CHIP_FACTORY_DATA_CUSTOM_BACKEND)
-    matter_add_gn_arg_bool  ("chip_use_transitional_commissionable_data_provider"  "false")
+if (CONFIG_CHIP_FACTORY_DATA OR CONFIG_CHIP_FACTORY_DATA_CUSTOM_BACKEND)
+    matter_add_gn_arg_bool("chip_use_transitional_commissionable_data_provider"  FALSE)
+    matter_add_gn_arg_bool("chip_use_transitional_device_instance_info_provider" FALSE)
 endif()
 
 if (CONFIG_CHIP_ROTATING_DEVICE_ID)
-    matter_add_gn_arg_bool("chip_enable_rotating_device_id"          "true")
-    matter_add_gn_arg_bool("chip_enable_additional_data_advertising" "true")
+    matter_add_gn_arg_bool("chip_enable_rotating_device_id"          TRUE)
+    matter_add_gn_arg_bool("chip_enable_additional_data_advertising" TRUE)
 endif()
 
-if (CONFIG_NET_L2_OPENTHREAD)
-    matter_add_gn_arg_string("chip_mdns" "platform")
-elseif(CONFIG_WIFI_W91)
+if(CONFIG_WIFI_W91)
     matter_add_gn_arg_string("chip_mdns" "minimal")
+elseif (CONFIG_NET_L2_OPENTHREAD)
+    matter_add_gn_arg_string("chip_mdns" "platform")
 else()
     matter_add_gn_arg_string("chip_mdns" "none")
 endif()

config/telink/chip-module/Kconfig

@@ -178,9 +178,18 @@ config CHIP_LOG_SIZE_OPTIMIZATION
 	  full configuration enabled by this option in the
 	  platform/telink/CHIPPlatformConfig.h file.
 
+config CHIP_IPV4
+	bool "IPv4 support for Matter"
+	default n
+	depends on NET_IPV4
+	help
+	  If disabled, it allows to build Telink SDK application
+	  with IPv4 support independently of the Matter stack still
+	  running over IPv6.
+
 config CHIP_BUTTON_MANAGER_IRQ_MODE
 	bool "Use GPIO in an IRQ mode instead of polling the GPIO"
-	default PM || BOARD_TLSR9118BDK40D
+	default PM
 	help
 	  Use GPIO in an IRQ mode to avoid button polling loop and extend the battery lifetime by waking up by GPIO event. 
 	  GPIO events are working only with GPIO IRQ. This option changes button matrix configuration.