Merge remote-tracking branch 'upstream/main' into 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/workflows/bsim-tests.yaml

@@ -80,7 +80,7 @@ jobs:
           west forall -c 'git reset --hard HEAD'
 
       - 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 +95,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 +104,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: |

.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 }}
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: ["native_sim", "qemu_x86", "unit_testing"]
+        platform: ["mps2_an385", "native_sim", "qemu_x86", "unit_testing"]
     env:
       ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.4
     steps:
@@ -88,27 +88,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
+          ./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
         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"
@@ -129,14 +127,14 @@ jobs:
 
       - 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 +148,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 +158,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
+          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@v3
+        with:
+          name: Merged Coverage Data
+          path: |
+            coverage/reports/merged.json
+            coverage/reports/merged.xml
 
       - name: Upload coverage to Codecov
         if: always()
@@ -173,4 +180,4 @@ jobs:
           env_vars: OS,PYTHON
           fail_ci_if_error: false
           verbose: true
-          files: merged.info
+          files: merged.xml

.github/workflows/do_not_merge.yml

@@ -7,12 +7,14 @@ on:
 jobs:
   do-not-merge:
     if: ${{ contains(github.event.*.labels.*.name, 'DNM') ||
-            contains(github.event.*.labels.*.name, 'TSC') }}
+            contains(github.event.*.labels.*.name, 'TSC') ||
+            contains(github.event.*.labels.*.name, 'Architecture Review') ||
+            contains(github.event.*.labels.*.name, 'dev-review') }}
     name: Prevent Merging
     runs-on: ubuntu-22.04
     steps:
       - name: Check for label
         run: |
-          echo "Pull request is labeled as 'DNM' or 'TSC'"
-          echo "This workflow fails so that the pull request cannot be merged"
+          echo "Pull request is labeled as 'DNM', 'TSC', 'Architecture Review' or 'dev-review'."
+          echo "This workflow fails so that the pull request cannot be merged."
           exit 1

.github/workflows/stats_merged_prs.yml

@@ -0,0 +1,24 @@
+name: Merged PR stats
+
+on:
+  pull_request_target:
+    branches:
+      - main
+      - v*-branch
+    types: [closed]
+jobs:
+  record_merged:
+    if: github.event.pull_request.merged == true && github.repository == 'zephyrproject-rtos/zephyr'
+    runs-on: ubuntu-22.04
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: PR event
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ELASTICSEARCH_KEY: ${{ secrets.ELASTICSEARCH_KEY }}
+          ELASTICSEARCH_SERVER: "https://elasticsearch.zephyrproject.io:443"
+          PR_STAT_ES_INDEX: ${{ vars.PR_STAT_ES_INDEX }}
+        run: |
+          pip3 install pygithub elasticsearch
+          python3 ./scripts/ci/stats/merged_prs.py --pull-request ${{ github.event.pull_request.number }} --repo ${{ github.repository }}

.github/workflows/twister.yaml

@@ -179,6 +179,12 @@ 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'
 
+          # Hotfix until we have kitware ninja in the docker image.
+          # Needed for full functionality of the job server functionality in twister which only works with
+          # kitware supplied ninja version.
+          wget -c    https://github.com/Kitware/ninja/releases/download/v1.11.1.g95dee.kitware.jobserver-1/ninja-1.11.1.g95dee.kitware.jobserver-1_x86_64-linux-gnu.tar.gz -O - | tar xz --strip-components=1
+          sudo cp ninja /usr/local/bin
+
       - name: Check Environment
         run: |
           cmake --version

CMakeLists.txt

@@ -1622,18 +1622,20 @@ if(CONFIG_BUILD_OUTPUT_BIN AND CONFIG_BUILD_OUTPUT_UF2)
 endif()
 
 if(CONFIG_BUILD_OUTPUT_META)
+  set(KERNEL_META_PATH  ${PROJECT_BINARY_DIR}/${KERNEL_META_NAME} CACHE INTERNAL "")
+
   list(APPEND
     post_build_commands
     COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/zephyr_module.py
             ${WEST_ARG}
             ${ZEPHYR_MODULES_ARG}
             ${EXTRA_ZEPHYR_MODULES_ARG}
-            --meta-out ${KERNEL_META_NAME}
+            --meta-out ${KERNEL_META_PATH}
             $<$<BOOL:${CONFIG_BUILD_OUTPUT_META_STATE_PROPAGATE}>:--meta-state-propagate>
   )
   list(APPEND
     post_build_byproducts
-    ${KERNEL_META_NAME}
+    ${KERNEL_META_PATH}
   )
 endif()
 
@@ -1885,12 +1887,11 @@ endif()
 add_custom_command(
   TARGET ${logical_target_for_zephyr_elf}
   POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E echo "Generating files from ${PROJECT_BINARY_DIR}/${KERNEL_ELF_NAME} for board: ${BOARD}"
   ${post_build_commands}
   BYPRODUCTS
   ${post_build_byproducts}
-  COMMENT "Generating files from ${KERNEL_ELF_NAME} for board: ${BOARD}"
   COMMAND_EXPAND_LISTS
-  # NB: COMMENT only works for some CMake-Generators
   )
 
 # To populate with hex files to merge, do the following:

CODEOWNERS

@@ -133,6 +133,7 @@
 /boards/shields/inventek_eswifi/          @nandojve
 /boards/xtensa/odroid_go/                 @ydamigos
 /boards/xtensa/nxp_adsp_imx8/             @iuliana-prodan @dbaluta
+/boards/xtensa/kincony_kc868_a32/         @bbilas
 /boards/arm64/qemu_cortex_a53/            @carlocaione
 /boards/arm64/bcm958402m2_a72/            @abhishek-brcm
 /boards/arm64/mimx8mm_evk/                @MrVan @JiafeiPan
@@ -363,6 +364,8 @@
 /drivers/spi/spi_rv32m1_lpspi*            @karstenkoenig
 /drivers/spi/*esp32*                      @sylvioalves
 /drivers/spi/*pl022*                      @soburi
+/drivers/sdhc/                            @danieldegrasse
+/drivers/sdhc/sdhc_cdns*                  @roymurlidhar
 /drivers/timer/*arm_arch*                 @carlocaione
 /drivers/timer/*cortex_m_systick*         @anangl
 /drivers/timer/*altera_avalon*            @nashif
@@ -416,7 +419,7 @@
 /dts/arm/atmel/                           @galak
 /dts/arm/broadcom/                        @sbranden
 /dts/arm/cypress/                         @ifyall @npal-cy
-/dts/arm/gigadevice/                      @nandojve
+/dts/arm/gd/                              @nandojve
 /dts/arm/infineon/xmc4*                   @parthitce @ifyall @npal-cy
 /dts/arm/infineon/psoc6/                  @ifyall @npal-cy
 /dts/arm64/armv8-r.dtsi                   @povergoing