Merge pull request zephyrproject-rtos#12 from FrameworkComputer/marigold.upstream-merge

Marigold: Upstream merge

Author: JohnAZoidberg

.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/ISSUE_TEMPLATE/005_hardware_support.md

@@ -8,12 +8,12 @@ updates:
   - The most recent release, and the release prior to that.
   - Active LTS releases.
 
-At this time, with the latest release of v3.3, the supported
+At this time, with the latest release of v3.6, the supported
 versions are:
 
   - v2.7: Current LTS
-  - v3.2: Prior release
-  - v3.3: Current release
+  - v3.5: Prior release
+  - v3.6: Current release
 
 ## Reporting process
 

.github/SECURITY.md

@@ -9,7 +9,11 @@ on:
     - ready_for_review
     branches:
     - main
+    - collab-*
     - v*-branch
+  issues:
+    types:
+    - labeled
 
 jobs:
   assignment:
@@ -21,18 +25,28 @@ jobs:
     - name: Install Python dependencies
       run: |
         sudo pip3 install -U setuptools wheel pip
-        pip3 install -U PyGithub>=1.55
+        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_TOKEN: ${{ secrets.ZB_GITHUB_TOKEN }}
       run: |
-        python3 scripts/set_assignees.py \
-          -v \
-          -o ${{ github.event.repository.owner.login }} \
-          -r ${{ github.event.repository.name }} \
-          -M MAINTAINERS.yml \
-          -P ${{ github.event.pull_request.number }}
+        FLAGS="-v"
+        FLAGS+=" -o ${{ github.event.repository.owner.login }}"
+        FLAGS+=" -r ${{ github.event.repository.name }}"
+        FLAGS+=" -M MAINTAINERS.yml"
+        if [ "${{ github.event_name }}" = "pull_request_target" ]; then
+            FLAGS+=" -P ${{ github.event.pull_request.number }}"
+        elif [ "${{ github.event_name }}" = "issues" ]; then
+            FLAGS+=" -I ${{ github.event.issue.number }}"
+        elif [ "${{ github.event_name }}" = "schedule" ]; then
+            FLAGS+=" --modules"
+        else
+          echo "Unknown event: ${{ github.event_name }}"
+          exit 1
+        fi
+
+        python3 scripts/set_assignees.py $FLAGS

.github/workflows/assigner.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/backport_issue_check.yml

@@ -12,12 +12,16 @@ on:
       - "boards/posix/**"
       - "soc/posix/**"
       - "arch/posix/**"
+      - "include/zephyr/arch/posix/**"
+      - "scripts/native_simulator/**"
       - "samples/net/sockets/echo_*/**"
       - "modules/openthread/**"
       - "subsys/net/l2/openthread/**"
       - "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 }}
@@ -26,20 +30,21 @@ concurrency:
 jobs:
   bsim-test:
     if: github.repository_owner == 'zephyrproject-rtos'
-    runs-on: zephyr-runner-linux-x64-4xlarge
+    runs-on:
+      group: zephyr-runner-v2-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.4
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.9.20240223
       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.1
       BSIM_OUT_PATH: /opt/bsim/
       BSIM_COMPONENTS_PATH: /opt/bsim/components
       EDTT_PATH: ../tools/edtt
-      bsim_bluetooth_test_results_file: ./bsim_bluetooth/bsim_results.xml
-      bsim_networking_test_results_file: ./bsim_net/bsim_results.xml
+      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: |
@@ -49,14 +54,20 @@ jobs:
           #        GitHub comes up with a fundamental fix for this problem.
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
+      - name: Print cloud service information
+        run: |
+          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
+          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
+          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
+
       - name: Clone cached Zephyr repository
         continue-on-error: true
         run: |
-          git clone --shared /github/cache/zephyrproject/zephyr .
+          git clone --shared /repo-cache/zephyrproject/zephyr .
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -72,11 +83,13 @@ jobs:
           west init -l . || true
           west config manifest.group-filter -- +ci
           west config --global update.narrow true
-          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 update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /repo-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: |
@@ -86,10 +99,12 @@ jobs:
             boards/posix/**
             soc/posix/**
             arch/posix/**
+            include/zephyr/arch/posix/**
+            scripts/native_simulator/**
             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: |
@@ -98,7 +113,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: |
@@ -110,51 +125,93 @@ 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} )
           echo "Manifest points to bsim sha $BSIM_VERSION"
           cd /opt/bsim_west/bsim
           git fetch -n origin ${BSIM_VERSION}
-          git config --global advice.detachedHead false
-          git checkout ${BSIM_VERSION}
+          git -c advice.detachedHead=false checkout ${BSIM_VERSION}
           west update
           make everything -s -j 8
 
       - name: Run Bluetooth Tests with BSIM
         if: steps.check-bluetooth-files.outputs.any_changed == 'true' || steps.check-common-files.outputs.any_changed == 'true'
         run: |
           export ZEPHYR_BASE=${PWD}
-          WORK_DIR=${ZEPHYR_BASE}/bsim_bluetooth tests/bsim/bluetooth/compile.sh
-          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bluetooth_test_results_file} \
-          SEARCH_PATH=tests/bsim/bluetooth/ tests/bsim/run_parallel.sh
+          export WORK_DIR=${ZEPHYR_BASE}/bsim_bt
+          # Build and run the BT tests for nrf52_bsim:
+          nice tests/bsim/bluetooth/compile.sh
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_52_test_results_file} \
+          TESTS_FILE=tests/bsim/bluetooth/tests.nrf52bsim.txt tests/bsim/run_parallel.sh
+          # Build and run the BT controller tests also for the nrf5340bsim_nrf5340_cpunet
+          BOARD=nrf5340bsim_nrf5340_cpunet \
+          nice tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpunet.sh
+          BOARD=nrf5340bsim_nrf5340_cpunet \
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_53_test_results_file} \
+          TESTS_FILE=tests/bsim/bluetooth/tests.nrf5340bsim_nrf5340_cpunet.txt \
+          tests/bsim/run_parallel.sh
+          # Build and run the nrf5340 split stack tests set
+          BOARD=nrf5340bsim_nrf5340_cpuapp \
+          nice tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpuapp.sh
+          BOARD=nrf5340bsim_nrf5340_cpuapp \
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_53split_test_results_file} \
+          TESTS_FILE=tests/bsim/bluetooth/tests.nrf5340bsim_nrf5340_cpuapp.txt \
+          tests/bsim/run_parallel.sh
 
       - name: Run Networking Tests with BSIM
         if: steps.check-networking-files.outputs.any_changed == 'true' || steps.check-common-files.outputs.any_changed == 'true'
         run: |
           export ZEPHYR_BASE=${PWD}
-          WORK_DIR=${ZEPHYR_BASE}/bsim_net tests/bsim/net/compile.sh
-          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_networking_test_results_file} \
+          WORK_DIR=${ZEPHYR_BASE}/bsim_net nice tests/bsim/net/compile.sh
+          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_bluetooth/bsim_results.xml
-            ./bsim_net/bsim_results.xml
+            ./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/bsim-tests.yaml

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