Upmerge 05.02.2024

.clang-format

@@ -67,6 +67,7 @@ ForEachMacros:
   - 'Z_GENLIST_FOR_EACH_NODE_SAFE'
   - 'STRUCT_SECTION_FOREACH'
   - 'TYPE_SECTION_FOREACH'
+  - 'K_SPINLOCK'
 IfMacros:
   - 'CHECKIF'
 # Disabled for now, see bug https://github.com/zephyrproject-rtos/zephyr/issues/48520

.github/workflows/assigner.yml

@@ -9,6 +9,7 @@ on:
     - ready_for_review
     branches:
     - main
+    - collab-*
     - v*-branch
   issues:
     types:
@@ -27,7 +28,7 @@ jobs:
         pip3 install -U PyGithub>=1.55 west
 
     - name: Check out source code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Run assignment script
       env:

.github/workflows/backport_issue_check.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Check out source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Python dependencies
         run: |

.github/workflows/bsim-tests.yaml

@@ -20,6 +20,8 @@ on:
       - "include/zephyr/net/openthread.h"
       - "drivers/ieee802154/**"
       - "include/zephyr/net/ieee802154*"
+      - "drivers/serial/*nrfx*"
+      - "tests/drivers/uart/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
@@ -30,20 +32,20 @@ jobs:
     if: github.repository_owner == 'zephyrproject-rtos'
     runs-on: zephyr-runner-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
+      image: ghcr.io/zephyrproject-rtos/ci:v0.26.7
       options: '--entrypoint /bin/bash'
       volumes:
         - /repo-cache/zephyrproject:/github/cache/zephyrproject
     env:
       ZEPHYR_TOOLCHAIN_VARIANT: zephyr
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
       BSIM_OUT_PATH: /opt/bsim/
       BSIM_COMPONENTS_PATH: /opt/bsim/components
       EDTT_PATH: ../tools/edtt
       bsim_bt_52_test_results_file: ./bsim_bt/52_bsim_results.xml
       bsim_bt_53_test_results_file: ./bsim_bt/53_bsim_results.xml
       bsim_bt_53split_test_results_file: ./bsim_bt/53_bsim_split_results.xml
       bsim_net_52_test_results_file: ./bsim_net/52_bsim_results.xml
+      bsim_uart_test_results_file: ./bsim_uart/uart_bsim_results.xml
     steps:
       - name: Apply container owner mismatch workaround
         run: |
@@ -60,7 +62,7 @@ jobs:
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -79,8 +81,10 @@ jobs:
           west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
           west forall -c 'git reset --hard HEAD'
 
+          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
+
       - name: Check common triggering files
-        uses: tj-actions/changed-files@v35
+        uses: tj-actions/changed-files@v41
         id: check-common-files
         with:
           files: |
@@ -95,7 +99,7 @@ jobs:
             tests/bsim/*
 
       - name: Check if Bluethooth files changed
-        uses: tj-actions/changed-files@v35
+        uses: tj-actions/changed-files@v41
         id: check-bluetooth-files
         with:
           files: |
@@ -104,7 +108,7 @@ jobs:
             subsys/bluetooth/**
 
       - name: Check if Networking files changed
-        uses: tj-actions/changed-files@v35
+        uses: tj-actions/changed-files@v41
         id: check-networking-files
         with:
           files: |
@@ -116,10 +120,20 @@ jobs:
             drivers/ieee802154/**
             include/zephyr/net/ieee802154*
 
+      - name: Check if UART files changed
+        uses: tj-actions/changed-files@v41
+        id: check-uart-files
+        with:
+          files: |
+            tests/bsim/drivers/uart/**
+            drivers/serial/*nrfx*
+            tests/drivers/uart/**
+
       - name: Update BabbleSim to manifest revision
         if: >
           steps.check-bluetooth-files.outputs.any_changed == 'true'
           || steps.check-networking-files.outputs.any_changed == 'true'
+          || steps.check-uart-files.outputs.any_changed == 'true'
           || steps.check-common-files.outputs.any_changed == 'true'
         run: |
           export BSIM_VERSION=$( west list bsim -f {revision} )
@@ -163,22 +177,37 @@ jobs:
           RESULTS_FILE=${ZEPHYR_BASE}/${bsim_net_52_test_results_file} \
           SEARCH_PATH=tests/bsim/net/ tests/bsim/run_parallel.sh
 
+      - name: Run UART Tests with BSIM
+        if: steps.check-uart-files.outputs.any_changed == 'true' || steps.check-common-files.outputs.any_changed == 'true'
+        run: |
+          echo "UART: Single device tests"
+          ./scripts/twister -T tests/drivers/uart/ --force-color --inline-logs -v -M -p nrf52_bsim \
+            --fixture gpio_loopback -- -uart0_loopback
+          echo "UART: Multi device tests"
+          export ZEPHYR_BASE=${PWD}
+          WORK_DIR=${ZEPHYR_BASE}/bsim_uart nice tests/bsim/drivers/uart/compile.sh
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_uart_test_results_file} \
+          SEARCH_PATH=tests/bsim/drivers/uart/ tests/bsim/run_parallel.sh
+
       - name: Upload Test Results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bsim-test-results
           path: |
             ./bsim_bt/52_bsim_results.xml
             ./bsim_bt/53_bsim_results.xml
             ./bsim_bt/53_bsim_split_results.xml
             ./bsim_net/52_bsim_results.xml
+            ./bsim_uart/uart_bsim_results.xml
+            ./twister-out/twister.xml
+            ./twister-out/twister.json
             ${{ github.event_path }}
           if-no-files-found: warn
 
       - name: Upload Event Details
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: event
           path: |

.github/workflows/bug_snapshot.yaml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Install Python dependencies
       run: |

.github/workflows/clang.yaml

@@ -10,17 +10,16 @@ jobs:
   clang-build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
+      image: ghcr.io/zephyrproject-rtos/ci:v0.26.7
       options: '--entrypoint /bin/bash'
       volumes:
         - /repo-cache/zephyrproject:/github/cache/zephyrproject
     strategy:
       fail-fast: false
       matrix:
-        platform: ["native_posix"]
+        platform: ["native_sim"]
         subset: [1, 2, 3, 4, 5]
     env:
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
       LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-16
       COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
       BASE_REF: ${{ github.base_ref }}
@@ -43,7 +42,7 @@ jobs:
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
@@ -67,6 +66,8 @@ jobs:
           # west caching).
           west update --path-cache /github/cache/zephyrproject 2>&1 1> west.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west2.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
 
+          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
+
       - name: Check Environment
         run: |
           cmake --version
@@ -136,7 +137,7 @@ jobs:
 
       - name: Upload Unit Test Results
         if: always() && steps.twister.outputs.report_needed != 0
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Unit Test Results (Subset ${{ matrix.subset }})
           path: twister-out/twister.xml
@@ -148,7 +149,7 @@ jobs:
     if: (success() || failure() ) && needs.clang-build.outputs.report_needed != 0
     steps:
       - name: Download Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
       - name: Merge Test Results
@@ -159,7 +160,7 @@ jobs:
 
       - name: Upload Unit Test Results in HTML
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: HTML Unit Test Results
           if-no-files-found: ignore

.github/workflows/codecov.yaml

@@ -2,7 +2,7 @@ name: Code Coverage with codecov
 
 on:
   schedule:
-    - cron: '25 */3 * * 1-5'
+    - cron: '25 06,18 * * 1-5'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
@@ -13,16 +13,14 @@ jobs:
     if: github.repository == 'zephyrproject-rtos/zephyr'
     runs-on: zephyr-runner-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
+      image: ghcr.io/zephyrproject-rtos/ci:v0.26.7
       options: '--entrypoint /bin/bash'
       volumes:
         - /repo-cache/zephyrproject:/github/cache/zephyrproject
     strategy:
       fail-fast: false
       matrix:
-        platform: ["native_posix", "qemu_x86", "unit_testing"]
-    env:
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
+        platform: ["mps2_an385", "native_sim", "qemu_x86", "unit_testing"]
     steps:
       - name: Apply container owner mismatch workaround
         run: |
@@ -43,7 +41,7 @@ jobs:
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -52,11 +50,14 @@ jobs:
           west init -l . || true
           west update 1> west.update.log || west update 1> west.update-2.log
 
-      - name: Check Environment
+      - name: Environment Setup
         run: |
           cmake --version
           gcc --version
           ls -la
+
+          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
+
       - name: Prepare ccache keys
         id: ccache_cache_prop
         shell: cmake -P {0}
@@ -88,27 +89,25 @@ jobs:
           export ZEPHYR_BASE=${PWD}
           export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
           mkdir -p coverage/reports
-          ./scripts/twister --force-color -N -v --filter runnable -p ${{ matrix.platform }} --coverage -T tests
-
-      - name: Generate Coverage Report
-        run: |
-          mv twister-out/coverage.info lcov.pre.info
-          lcov -q --remove lcov.pre.info mylib.c --remove lcov.pre.info tests/\* \
-            --remove lcov.pre.info samples/\* --remove lcov.pre.info ext/\* \
-            --remove lcov.pre.info *generated*  \
-            -o coverage/reports/${{ matrix.platform }}.info --rc lcov_branch_coverage=1
+          pip3 install gcovr==6.0
+          ./scripts/twister -i --force-color -N -v --filter runnable -p ${{ matrix.platform }} --coverage -T tests --coverage-tool gcovr -xCONFIG_TEST_EXTRA_STACK_SIZE=4096 -e nano
 
       - name: ccache stats post
         run: |
           ccache -s
           ccache -p
 
+      - name: Rename coverage files
+        if: always()
+        run: |
+          cp twister-out/coverage.json coverage/reports/${{ matrix.platform }}.json
+
       - name: Upload Coverage Results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Coverage Data (Subset ${{ matrix.platform }})
-          path: coverage/reports/${{ matrix.platform }}.info
+          path: coverage/reports/${{ matrix.platform }}.json
 
   codecov-results:
     name: "Publish Coverage Results"
@@ -119,24 +118,24 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Download Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: coverage/reports
 
       - name: Move coverage files
         run: |
-          mv ./coverage/reports/*/*.info ./coverage/reports
+          mv ./coverage/reports/*/*.json ./coverage/reports
           ls -la ./coverage/reports
 
       - name: Generate list of coverage files
         id: get-coverage-files
         shell: cmake -P {0}
         run: |
-          file(GLOB INPUT_FILES_LIST  "coverage/reports/*.info")
+          file(GLOB INPUT_FILES_LIST  "coverage/reports/*.json")
           set(MERGELIST "")
           set(FILELIST "")
           foreach(ITEM ${INPUT_FILES_LIST})
@@ -150,7 +149,7 @@ jobs:
           foreach(ITEM ${INPUT_FILES_LIST})
             get_filename_component(f ${ITEM} NAME)
             if(MERGELIST STREQUAL "")
-              set(MERGELIST "-a ${f}")
+              set(MERGELIST "--add-tracefile ${f}")
             else()
               set(MERGELIST "${MERGELIST} -a ${f}")
             endif()
@@ -160,10 +159,19 @@ jobs:
 
       - name: Merge coverage files
         run: |
-          sudo apt-get update
-          sudo apt-get install -y lcov
           cd ./coverage/reports
-          lcov ${{ steps.get-coverage-files.outputs.mergefiles }} -o merged.info --rc lcov_branch_coverage=1
+          pip3 install gcovr==6.0
+          gcovr ${{ steps.get-coverage-files.outputs.mergefiles }}  --merge-mode-functions=separate --json merged.json
+          gcovr ${{ steps.get-coverage-files.outputs.mergefiles }} --merge-mode-functions=separate --cobertura merged.xml
+
+      - name: Upload Merged Coverage Results
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: Merged Coverage Data
+          path: |
+            coverage/reports/merged.json
+            coverage/reports/merged.xml
 
       - name: Upload coverage to Codecov
         if: always()
@@ -173,4 +181,4 @@ jobs:
           env_vars: OS,PYTHON
           fail_ci_if_error: false
           verbose: true
-          files: merged.info
+          files: merged.xml