Merge branch 'main' of https://github.com/nrfconnect/sdk-nrf into WEZEN-2900-wzn-add-support-for-systemoff-twister-tests

Author: dhsu-nordic

.github/test-spec.yml

@@ -126,6 +126,7 @@
   - "include/modem/pdn.h"
   - "include/modem/at_params.h"
   - "include/modem/modem_key_mgmt.h"
+  - "subsys/dfu/dfu_target/**/*"
 
 "CI-dfu-test":
   - "include/bl*"
@@ -381,6 +382,8 @@
   - "drivers/wifi/**/*"
   - "modules/hostap/**/*"
   - "modules/lib/hostap/**/*"
+  - "subsys/net/lib/nrf70_fw_ext/**/*"
+  - "subsys/net/lib/hostap_crypto/**/*"
   - "subsys/mpsl/**/*"
   - "subsys/ieee802154/**/*"
   - "subsys/bootloader/**/*"
@@ -525,6 +528,8 @@
   - "samples/wifi/**/*"
   - "modules/hostap/**/*"
   - "modules/lib/hostap/**/*"
+  - "subsys/net/lib/nrf70_fw_ext/**/*"
+  - "subsys/net/lib/hostap_crypto/**/*"
 
 "CI-cloud-test":
   - "include/caf/**/*"
@@ -591,8 +596,8 @@
 
 "CI-test-low-level":
   - "applications/hpf/**/*"
-  - "boards/nordic/nrf54lm20apdk/**/*"
-  - "boards/nordic/nrf54lv10apdk/**/*"
+  - "boards/nordic/nrf54lm20pdk/**/*"
+  - "boards/nordic/nrf54lv10dk/**/*"
   - "drivers/gpio/**/*"
   - "dts/bindings/gpio/**/*"
   - "include/drivers/gpio/**/*"

.github/workflows/compliance.yml

@@ -66,7 +66,9 @@ jobs:
         git log --pretty=oneline | head -n 10
         # For now we run KconfigBasic, but we should transition to Kconfig
         $ZEPHYR_BASE/scripts/ci/check_compliance.py --annotate -e Kconfig \
-        -e KconfigBasicNoModules -e ClangFormat -e Ruff -c origin/${BASE_REF}..
+        -e KconfigBasicNoModules -e ClangFormat -e Ruff \
+        -e SysbuildKconfig -e SysbuildKconfigBasic -e SysbuildKconfigBasicNoModules \
+        -c origin/${BASE_REF}..
 
     - name: upload-results
       uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4

.github/workflows/docbuild.yml

@@ -66,8 +66,8 @@ jobs:
       - name: Build documentation
         working-directory: ncs/nrf
         run: |
-          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            BUILD_CONF="-DNO_DTS_BINDINGS=ON"
+          if [[ "${{ github.event_name }}" == "push" ]]; then
+            BUILD_CONF="-DDTS_BINDINGS=ON -DHW_FEATURES=ON"
           fi
 
           cmake -GNinja -Bdoc/_build -Sdoc -DSPHINXOPTS_EXTRA="-q" ${BUILD_CONF}
@@ -135,7 +135,7 @@ jobs:
 
             # Patch links from Sphinx to Doxygen APIs
             find doc/_build/html/$docset -type f -name "*.html" -exec \
-              sed -ri "/href=\"([^\"]+)\/doxygen\/html\/([^\"]+)\"/{s//href=\"\1\/..\/..\/..\/$docset-apis-$VERSION\/page\/\2\"/g; :a s/__/_/g;ta; }" {} \;
+              sed -ri "/href=\"([^\"]+)\/([a-z]+)\/doxygen\/html\/([^\"]+)\"/{s//href=\"..\/..\/\1\/\2-apis-$VERSION\/page\/\3\"/g; :a s/__/_/g;ta; }" {} \;
 
             pushd "$OUTDIR"
             ARCHIVE="$docset-apis-$VERSION.zip"

.github/workflows/docker.yml

@@ -4,6 +4,12 @@ on:
   push:
     tags:
       - 'v*'
+    branches: # Trigger on push to main and release branches
+      - main
+      - 'v*-branch'
+
+env:
+  IMAGE_NAME: ghcr.io/${{ github.repository }}-toolchain
 
 jobs:
   build:
@@ -23,9 +29,31 @@ jobs:
           username: NordicBuilder
           password: ${{ secrets.NCS_GITHUB_PKG_WRITE_TOKEN }}
 
-      - name: Build and push Docker image
+      - name: Check if Docker image exists
+        id: check-image
         run: |
-          TOOLCHAIN_ID=$(../print_toolchain_checksum.sh)
-          docker build -t ghcr.io/${{ github.repository }}-toolchain:${{ github.ref_name }} --build-arg VERSION=$TOOLCHAIN_ID .
-          docker push ghcr.io/${{ github.repository }}-toolchain:${{ github.ref_name }}
+          TOOLCHAIN_ID=$(./scripts/print_toolchain_checksum.sh)
+          echo "TOOLCHAIN_ID=$TOOLCHAIN_ID" >> $GITHUB_OUTPUT
+          if docker manifest inspect ${IMAGE_NAME}:$TOOLCHAIN_ID > /dev/null 2>&1; then
+            echo "exists=true" >> $GITHUB_OUTPUT
+          else
+            echo "exists=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Build and push Docker image
+        if: steps.check-image.outputs.exists == 'false'
         working-directory: scripts/docker
+        run: |
+          docker build -t ${IMAGE_NAME}:${{steps.check-image.outputs.TOOLCHAIN_ID}} --build-arg VERSION=${{steps.check-image.outputs.TOOLCHAIN_ID}} .
+          docker push ${IMAGE_NAME}:${{steps.check-image.outputs.TOOLCHAIN_ID}}
+          if [[ ${{ github.ref_name }} == "main" ]]; then
+            docker tag ${IMAGE_NAME}:${{steps.check-image.outputs.TOOLCHAIN_ID}} ${IMAGE_NAME}:latest
+            docker push ${IMAGE_NAME}:latest
+          fi
+
+      - name: Tag and push Docker image for tags
+        if: github.event_name == 'push' && github.ref_type == 'tag'
+        run: |
+          docker pull ${IMAGE_NAME}:${{steps.check-image.outputs.TOOLCHAIN_ID}}
+          docker tag ${IMAGE_NAME}:${{steps.check-image.outputs.TOOLCHAIN_ID}} ${IMAGE_NAME}:${{ github.ref_name }}
+          docker push ${IMAGE_NAME}:${{ github.ref_name }}

.github/workflows/scripts-test.yml

@@ -25,4 +25,4 @@ jobs:
       - name: Install packages
         run: python -m pip install -r scripts/requirements-test.txt
       - name: Run tests
-        run: python -m pytest scripts
+        run: python -m pytest scripts --ignore=scripts/ci/test_plan.py

CODEOWNERS

@@ -14,7 +14,6 @@
 /CMakeLists.txt                           @nrfconnect/ncs-co-build-system
 /CODEOWNERS                               @nrfconnect/ncs-code-owners
 /Jenkinsfile                              @nrfconnect/ncs-ci
-/ncs_version.h.in                         @nrfconnect/ncs-code-owners
 /LICENSE                                  @carlescufi
 /README.rst                               @carlescufi @nrfconnect/ncs-doc-leads
 /VERSION                                  @nrfconnect/ncs-code-owners
@@ -34,7 +33,7 @@
 /applications/matter_weather_station/     @nrfconnect/ncs-matter
 /applications/nrf5340_audio/              @nrfconnect/ncs-audio
 /applications/nrf_desktop/                @nrfconnect/ncs-si-bluebagel
-/applications/hpf/                        @nrfconnect/ncs-ll-ursus
+/applications/hpf/                        @nrfconnect/ncs-ll-ursus @ncs-lowlevel-doc
 /applications/serial_lte_modem/           @nrfconnect/ncs-co-networking @nrfconnect/ncs-lr-slm
 /applications/serial_lte_modem/src/lwm2m_carrier/ @nrfconnect/ncs-carrier
 /applications/connectivity_bridge/*.rst   @nrfconnect/ncs-cia-doc
@@ -44,15 +43,15 @@
 /applications/matter_weather_station/*.rst @nrfconnect/ncs-matter-doc
 /applications/nrf5340_audio/**/*.rst      @nrfconnect/ncs-audio-doc
 /applications/nrf_desktop/**/*.rst        @nrfconnect/ncs-si-bluebagel-doc
-/applications/hpf/**/*.rst                @annwoj
+/applications/hpf/**/*.rst                @ncs-lowlevel-doc
 /applications/serial_lte_modem/**/*.rst   @nrfconnect/ncs-iot-oulu-tampere-doc
 /applications/serial_lte_modem/doc/CARRIER_AT_commands.rst @nrfconnect/ncs-carrier-doc
 
 # Boards
 /boards/nordic/nrf7120pdk/                @nrfconnect/ncs-co-boards @rob-robinson-14 @Hi-Im-David
 /boards/nordic/nrf54l*/                   @nrfconnect/ncs-co-boards @kl-cruz
 /boards/nordic/nrf52*                     @nrfconnect/ncs-co-boards @nrfconnect/ncs-si-bluebagel
-/boards/nordic/thingy91*                  @nrfconnect/ncs-co-boards @nrfconnect/ncs-cia
+/boards/nordic/thingy91*/                 @nrfconnect/ncs-co-boards @nrfconnect/ncs-cia
 /boards/shields/coverage_support/         @nrfconnect/ncs-low-level-test
 /boards/shields/nrf2220ek/                @nrfconnect/ncs-radio-sw
 /boards/shields/nrf2240ek/                @nrfconnect/ncs-radio-sw
@@ -101,7 +100,7 @@
 /doc/nrf/drivers/suit_flash_ipuc.rst      @nrfconnect/ncs-charon-doc
 /doc/nrf/drivers/images/flash_ipuc/*      @nrfconnect/ncs-charon-doc
 /doc/nrf/drivers/hw_cc3xx.rst             @nrfconnect/ncs-aegir-doc
-/doc/nrf/drivers/mspi_sqspi.rst           @annwoj
+/doc/nrf/drivers/mspi_sqspi.rst           @ncs-lowlevel-doc
 /doc/nrf/drivers/paw3212.rst              @nrfconnect/ncs-si-bluebagel-doc
 /doc/nrf/drivers/pmw3360.rst              @nrfconnect/ncs-si-bluebagel-doc
 /doc/nrf/drivers/sensor_sim.rst           @nrfconnect/ncs-cia-doc
@@ -187,7 +186,7 @@
 /doc/nrf/libraries/nrf_rpc/index.rst      @nrfconnect/ncs-si-muffin-doc
 /doc/nrf/libraries/nrf_rpc/nrf_rpc_ipc.rst @nrfconnect/ncs-si-muffin-doc
 /doc/nrf/libraries/nrf_rpc/nrf_rpc_uart.rst @nrfconnect/ncs-terahertz-doc
-/doc/nrf/libraries/nrf_rpc/nrf_rpc_dev_info.rst @nrfconnect/ncs-terahertz-doc
+/doc/nrf/libraries/nrf_rpc/nrf_rpc_utils.rst @nrfconnect/ncs-terahertz-doc
 
 /doc/nrf/libraries/others/adp536x.rst     @nrfconnect/ncs-cia-doc
 /doc/nrf/libraries/others/app_event_manager.rst @nrfconnect/ncs-si-muffin-doc @nrfconnect/ncs-si-bluebagel-doc
@@ -543,7 +542,7 @@
 /samples/openthread/                      @nrfconnect/ncs-co-networking @nrfconnect/ncs-thread
 /samples/peripheral/802154_phy_test/      @nrfconnect/ncs-radio-sw
 /samples/peripheral/802154_sniffer/       @e-rk
-/samples/peripheral/lpuart/               @nordic-krch
+/samples/peripheral/lpuart/               @nordic-krch @nrfconnect/ncs-low-level-test
 /samples/peripheral/radio_test/           @nrfconnect/ncs-si-muffin
 /samples/pmic/native/                     @nordic-auko
 /samples/sensor/bh1749/                   @nrfconnect/ncs-co-drivers @nrfconnect/ncs-cia
@@ -696,9 +695,11 @@
 
 # Scripts
 /scripts/docker/                          @nrfconnect/ncs-ci
+/scripts/ci/test_plan.py                  @nordic-piks @PerMac @katgiadla @nrfconnect/ncs-test-leads
 /scripts/ci/tags.yaml                     @nordic-piks @PerMac @katgiadla @nrfconnect/ncs-test-leads
 /scripts/ci/tags_sdk_zephyr.yaml          @nordic-piks @PerMac @katgiadla @nrfconnect/ncs-test-leads
 /scripts/ci/twister_ignore.txt            @nordic-piks @PerMac @katgiadla @nrfconnect/ncs-test-leads
+/scripts/ci/twister_ignore_sdk_zephyr.txt @nordic-piks @PerMac @katgiadla @nrfconnect/ncs-test-leads
 /scripts/quarantine*.yaml                 @nrfconnect/ncs-test-leads
 /scripts/hid_configurator/                @nrfconnect/ncs-si-bluebagel
 /scripts/nrf_profiler/                    @nrfconnect/ncs-si-bluebagel
@@ -790,8 +791,8 @@
 /subsys/event_manager_proxy/              @nrfconnect/ncs-si-muffin
 /subsys/fw_info/                          @nrfconnect/ncs-pluto
 /subsys/gazell/                           @leewkb4567
-/subsys/ieee802154/                       @nrfconnect/ncs-co-networking @nrfconnect/ncs-radio-sw
 /subsys/logging/                          @nrfconnect/ncs-protocols-serialization
+/subsys/mcuboot/                          @nrfconnect/ncs-charon
 /subsys/mgmt/                             @nrfconnect/ncs-pluto
 /subsys/mgmt/suitfu/                      @nrfconnect/ncs-charon
 /subsys/mpsl/                             @nrfconnect/ncs-dragoon
@@ -824,6 +825,7 @@
 /subsys/partition_manager/                @nordicjm @tejlmand
 /subsys/pcd/                              @nrfconnect/ncs-pluto
 /subsys/sdfw_services/                    @nrfconnect/ncs-aurora
+/subsys/secure_storage/                   @nrfconnect/ncs-aegir
 /subsys/settings/                         @nrfconnect/ncs-pluto @rghaddab
 /subsys/sdfw_services/services/extmem/    @nrfconnect/ncs-charon
 /subsys/sdfw_services/services/suit_service/ @nrfconnect/ncs-charon
@@ -858,8 +860,10 @@
 /tests/drivers/flash/flash_rpc/           @nrfconnect/ncs-pluto
 /tests/drivers/flash_patch/               @nrfconnect/ncs-pluto
 /tests/drivers/fprotect/                  @nrfconnect/ncs-pluto
+/tests/drivers/grtc/                      @nrfconnect/ncs-low-level-test
 /tests/drivers/lpuart/                    @nordic-krch @nrfconnect/ncs-low-level-test
 /tests/drivers/mspi/app_fault_timer/      @nrfconnect/ncs-low-level-test @nrfconnect/ncs-ll-ursus
+/tests/drivers/mspi/error_cases/          @nrfconnect/ncs-low-level-test @nrfconnect/ncs-ll-ursus
 /tests/drivers/mspi/mspi_with_spis/       @nrfconnect/ncs-low-level-test
 /tests/drivers/mspi/trap_handler/         @nrfconnect/ncs-low-level-test @nrfconnect/ncs-ll-ursus
 /tests/drivers/nrf_wifi/                  @sachinthegreen @krish2718
@@ -943,6 +947,7 @@
 /tests/subsys/pcd/                        @nrfconnect/ncs-pluto
 /tests/subsys/sdfw_services/              @nrfconnect/ncs-aurora
 /tests/subsys/suit/                       @nrfconnect/ncs-charon
+/tests/subsys/usb/negotiated_speed/       @nrfconnect/ncs-low-level-test
 /tests/tfm/                               @nrfconnect/ncs-aegir @magnev
 /tests/unity/                             @nordic-krch
 /tests/zephyr/boards/nrf/                 @nrfconnect/ncs-low-level-test
@@ -957,7 +962,7 @@
 /tests/zephyr/drivers/i2c/i2c_bme688/     @nrfconnect/ncs-low-level-test
 /tests/zephyr/drivers/i2c/i2c_target_api/ @nrfconnect/ncs-low-level-test
 /tests/zephyr/drivers/i2s/                @nrfconnect/ncs-low-level-test
-/tests/zephyr/drivers/mspi/api/           @nrfconnect/ncs-low-level-test @nrfconnect/ncs-ll-ursus
+/tests/zephyr/drivers/mspi/               @nrfconnect/ncs-low-level-test @nrfconnect/ncs-ll-ursus
 /tests/zephyr/drivers/pwm/                @nrfconnect/ncs-low-level-test
 /tests/zephyr/drivers/retained_mem/       @nrfconnect/ncs-low-level-test
 /tests/zephyr/drivers/sensor/             @nrfconnect/ncs-low-level-test
@@ -966,7 +971,7 @@
 /tests/zephyr/drivers/uart/               @nrfconnect/ncs-low-level-test
 /tests/zephyr/drivers/watchdog/           @nrfconnect/ncs-low-level-test
 /tests/zephyr/kernel/timer/timer_behavior/ @nrfconnect/ncs-low-level-test
-/tests/subsys/usb/negotiated_speed/       @nrfconnect/ncs-low-level-test
+/tests/zephyr/subsys/secure_storage/      @nrfconnect/ncs-aegir
 /tests/zephyr/subsys/settings/performance/ @nrfconnect/ncs-pluto @rghaddab
 
 /tests/benchmarks/multicore/idle/*.rst    @nrfconnect/ncs-si-bluebagel-doc

Kconfig.nrf

@@ -80,10 +80,6 @@ config MCUMGR_TRANSPORT_NETBUF_SIZE
 	default 2475 if MCUMGR_TRANSPORT_BT_REASSEMBLY
 	default 1024 if UPDATEABLE_IMAGE_NUMBER > 1
 
-# When using HCI on the nRF5340 we need a larger command buffer.
-config BT_BUF_CMD_TX_COUNT
-	default 10 if SOC_COMPATIBLE_NRF5340_CPUAPP || SOC_COMPATIBLE_NRF5340_CPUNET
-
 config INIT_ARCH_HW_AT_BOOT
 	default y
 	help
@@ -104,24 +100,21 @@ config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE
 	  chosen Zephyr flash devicetree node to ensure that swapping can be
 	  performed.
 
-config GETOPT
-	default n
-
 # Temporary hack to be able to build samples and tests on the nRF51L15/nRF54L09 Eng A/nRF54L20 Eng A/nRF7120 FLPR core
 config FLASH_BASE_ADDRESS
 	hex
 	depends on PARTITION_MANAGER_ENABLED
-	depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
-	default 0x0 if SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR
+	depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR|| SOC_NRF7120_ENGA_CPUFLPR
+	default 0x0 if SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR
 	default 0x2C0000 if SOC_NRF7120_ENGA_CPUFLPR
 
 config FLASH_SIZE
 	int
 	depends on PARTITION_MANAGER_ENABLED
-	depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
-	default 1012 if SOC_NRF54L09_ENGA_CPUFLPR
+	depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
+	default 1012 if SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR
 	default 1524 if SOC_NRF54L15_CPUFLPR
-	default 2036 if SOC_NRF54L20_ENGA_CPUFLPR
+	default 2036 if SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR
 	default 128 if SOC_NRF7120_ENGA_CPUFLPR
 
 config NRF_SECURITY_ENABLER

applications/connectivity_bridge/boards/thingy91_nrf52840.conf

@@ -18,6 +18,7 @@ CONFIG_BT_NUS=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_SMP=y
 CONFIG_BT_CTLR_RX_BUFFERS=10
+CONFIG_BT_BUF_EVT_RX_COUNT=11
 CONFIG_BT_BUF_ACL_TX_COUNT=10
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
@@ -37,4 +38,7 @@ CONFIG_DP_DRIVER=y
 CONFIG_CMSIS_DAP_DEVICE_VENDOR="Nordic Semiconductor ASA"
 CONFIG_CMSIS_DAP_DEVICE_NAME="nrf91"
 
-CONFIG_USB_CDC_ACM_RINGBUF_SIZE=15360
+CONFIG_USB_CDC_ACM_RINGBUF_SIZE=12280
+
+# Reduce logging to save flash space
+CONFIG_LOG_MAX_LEVEL=1

applications/connectivity_bridge/boards/thingy91x_nrf5340_cpuapp.conf

@@ -17,6 +17,7 @@ CONFIG_BT_BUF_ACL_RX_SIZE=251
 CONFIG_BT_NUS=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_SMP=y
+CONFIG_BT_BUF_EVT_RX_COUNT=11
 CONFIG_BT_BUF_ACL_TX_COUNT=10
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251