Bluetooth: Controller: Add explicit LLCP error code check

Add unit tests to cover explicit LLCP error code check and
cover the same in the Controller implementation.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
(cherry picked from commit d6f2bc9669)
Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>

.checkpatch.conf

@@ -29,4 +29,3 @@
 --ignore MULTISTATEMENT_MACRO_USE_DO_WHILE
 --ignore ENOSYS
 --ignore IS_ENABLED_CONFIG
---ignore EXPORT_SYMBOL

.clang-format

@@ -32,14 +32,11 @@ ColumnLimit: 100
 ConstructorInitializerIndentWidth: 8
 ContinuationIndentWidth: 8
 ForEachMacros:
-  - 'ARRAY_FOR_EACH'
-  - 'ARRAY_FOR_EACH_PTR'
   - 'FOR_EACH'
   - 'FOR_EACH_FIXED_ARG'
   - 'FOR_EACH_IDX'
   - 'FOR_EACH_IDX_FIXED_ARG'
   - 'FOR_EACH_NONEMPTY_TERM'
-  - 'FOR_EACH_FIXED_ARG_NONEMPTY_TERM'
   - 'RB_FOR_EACH'
   - 'RB_FOR_EACH_CONTAINER'
   - 'SYS_DLIST_FOR_EACH_CONTAINER'
@@ -69,16 +66,7 @@ ForEachMacros:
   - 'Z_GENLIST_FOR_EACH_NODE'
   - 'Z_GENLIST_FOR_EACH_NODE_SAFE'
   - 'STRUCT_SECTION_FOREACH'
-  - 'STRUCT_SECTION_FOREACH_ALTERNATE'
   - 'TYPE_SECTION_FOREACH'
-  - 'K_SPINLOCK'
-  - 'COAP_RESOURCE_FOREACH'
-  - 'COAP_SERVICE_FOREACH'
-  - 'COAP_SERVICE_FOREACH_RESOURCE'
-  - 'HTTP_RESOURCE_FOREACH'
-  - 'HTTP_SERVER_CONTENT_TYPE_FOREACH'
-  - 'HTTP_SERVICE_FOREACH'
-  - 'HTTP_SERVICE_FOREACH_RESOURCE'
 IfMacros:
   - 'CHECKIF'
 # Disabled for now, see bug https://github.com/zephyrproject-rtos/zephyr/issues/48520
@@ -93,10 +81,8 @@ IncludeCategories:
   - Regex: '.*'
     Priority: 3
 IndentCaseLabels: false
-IndentGotoLabels: false
 IndentWidth: 8
 InsertBraces: true
-SpaceBeforeInheritanceColon: False
 SpaceBeforeParens: ControlStatementsExceptControlMacros
 SortIncludes: Never
 UseTab: ForContinuationAndIndentation

.github/ISSUE_TEMPLATE/001_bug_report.md

@@ -6,8 +6,8 @@ labels: bug
 assignees: ''
 
 ---
-<!--
-**Notes**
+
+**Notes (delete this)**
 Github Discussions (https://github.com/zephyrproject-rtos/zephyr/discussions)
 are available to first verify that the issue is a genuine Zephyr bug and not a
 consequence of Zephyr services misuse.
@@ -16,10 +16,8 @@ This issue list is only for bugs in the main Zephyr code base
 (https://github.com/zephyrproject-rtos/zephyr/). If the bug is for a project
 fork (such as NCS) specific feature, please open an issue in the fork project
 instead.
--->
 
 **Describe the bug**
-<!--
 A clear and concise description of what the bug is.
 
 Please also mention any information which could help others to understand
@@ -29,43 +27,31 @@ the problem you're facing:
  - Is this a regression? If yes, have you been able to "git bisect" it to a
    specific commit?
  - ...
--->
 
 **To Reproduce**
-<!--
 Steps to reproduce the behavior:
 1. mkdir build; cd build
 2. cmake -DBOARD=board\_xyz
 3. make
 4. See error
--->
 
 **Expected behavior**
-<!--
 A clear and concise description of what you expected to happen.
--->
 
 **Impact**
-<!--
 What impact does this issue have on your progress (e.g., annoyance, showstopper)
--->
 
 **Logs and console output**
-<!--
 If applicable, add console logs or other types of debug information
 e.g Wireshark capture or Logic analyzer capture (upload in zip archive).
 copy-and-paste text and put a code fence (\`\`\`) before and after, to help
 explain the issue. (if unable to obtain text log, add a screenshot)
--->
 
 **Environment (please complete the following information):**
-
  - OS: (e.g. Linux, MacOS, Windows)
  - Toolchain (e.g Zephyr SDK, ...)
  - Commit SHA or Version used
 
 **Additional context**
-<!--
 Add any other context that could be relevant to your issue, such as pin setting,
 target configuration, ...
--->

.github/ISSUE_TEMPLATE/002_enhancement.md

@@ -8,21 +8,13 @@ assignees: ''
 ---
 
 **Is your enhancement proposal related to a problem? Please describe.**
-<!--
 A clear and concise description of what the problem is.
--->
 
 **Describe the solution you'd like**
-<!--
 A clear and concise description of what you want to happen.
--->
 
 **Describe alternatives you've considered**
-<!--
 A clear and concise description of any alternative solutions or features you've considered.
--->
 
 **Additional context**
-<!--
 Add any other context or graphics (drag-and-drop an image) about the feature request here.
--->

.github/ISSUE_TEMPLATE/003_rfc-proposal.md

@@ -9,52 +9,43 @@ assignees: ''
 
 ## Introduction
 
-<!--
 This section targets end users, TSC members, maintainers and anyone else that might
 need a quick explanation of your proposed change.
--->
 
 ### Problem description
-<!--
+
 Why do we want this change and what problem are we trying to address?
--->
 
 ### Proposed change
-<!--
+
 A brief summary of the proposed change - the 10,000 ft view on what it will
 change once this change is implemented.
--->
 
 ## Detailed RFC
-<!--
+
 In this section of the document the target audience is the dev team. Upon
 reading this section each engineer should have a rather clear picture of what
 needs to be done in order to implement the described feature.
--->
 
 ### Proposed change (Detailed)
-<!--
+
 This section is freeform - you should describe your change in as much detail
 as possible. Please also ensure to include any context or background info here.
 For example, do we have existing components which can be reused or altered.
 
 By reading this section, each team member should be able to know what exactly
 you're planning to change and how.
--->
 
 ### Dependencies
-<!--
+
 Highlight how the change may affect the rest of the project (new components,
 modifications in other areas), or other teams/projects.
--->
 
 ### Concerns and Unresolved Questions
-<!--
+
 List any concerns, unknowns, and generally unresolved questions etc.
--->
 
 ## Alternatives
-<!--
+
 List any alternatives considered, and the reasons for choosing this option
 over them.
--->

.github/ISSUE_TEMPLATE/004_feature_request.md

@@ -8,21 +8,13 @@ assignees: ''
 ---
 
 **Is your feature request related to a problem? Please describe.**
-<!--
 A clear and concise description of what the problem is.
--->
 
 **Describe the solution you'd like**
-<!--
 A clear and concise description of what you want to happen.
--->
 
 **Describe alternatives you've considered**
-<!--
 A clear and concise description of any alternative solutions or features you've considered.
--->
 
 **Additional context**
-<!--
 Add any other context or graphics (drag-and-drop an image) about the feature request here.
--->

.github/SECURITY.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.6, the supported
+At this time, with the latest release of v3.5, the supported
 versions are:
 
-  - v3.7: Current LTS
-  - v3.6: Prior release
-  - v2.7: Prior LTS
+  - v2.7: Current LTS
+  - v3.4: Prior release
+  - v3.5: Current release
 
 ## Reporting process
 

.github/workflows/assigner.yml

@@ -9,7 +9,6 @@ on:
     - ready_for_review
     branches:
     - main
-    - collab-*
     - v*-branch
   issues:
     types:
@@ -28,7 +27,7 @@ jobs:
         pip3 install -U PyGithub>=1.55 west
 
     - name: Check out source code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
 
     - 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@v4
+        uses: actions/checkout@v3
 
       - name: Install Python dependencies
         run: |

.github/workflows/bsim-tests-publish.yaml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Download artifacts
-        uses: dawidd6/action-download-artifact@v3
+        uses: dawidd6/action-download-artifact@v2
         with:
           run_id: ${{ github.event.workflow_run.id }}
 

.github/workflows/bsim-tests.yaml

@@ -8,7 +8,6 @@ on:
       - "west.yml"
       - "subsys/bluetooth/**"
       - "tests/bsim/**"
-      - "tests/bluetooth/common/testlib/**"
       - "samples/bluetooth/**"
       - "boards/posix/**"
       - "soc/posix/**"
@@ -21,8 +20,6 @@ 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 }}
@@ -34,13 +31,17 @@ jobs:
     runs-on:
       group: zephyr-runner-v2-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.13.20240601
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.5.20231213
       options: '--entrypoint /bin/bash'
     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_net_52_test_results_file: ./bsim_net/52_bsim_results.xml
     steps:
       - name: Apply container owner mismatch workaround
         run: |
@@ -63,7 +64,7 @@ jobs:
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -82,109 +83,95 @@ jobs:
           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@v44
+        uses: tj-actions/changed-files@v35
         id: check-common-files
         with:
           files: |
             .github/workflows/bsim-tests.yaml
             .github/workflows/bsim-tests-publish.yaml
             west.yml
-            boards/posix/
-            soc/posix/
-            arch/posix/
-            include/zephyr/arch/posix/
-            scripts/native_simulator/
+            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@v44
+        uses: tj-actions/changed-files@v35
         id: check-bluetooth-files
         with:
           files: |
-            tests/bsim/bluetooth/
-            samples/bluetooth/
-            subsys/bluetooth/
+            tests/bsim/bluetooth/**
+            samples/bluetooth/**
+            subsys/bluetooth/**
 
       - name: Check if Networking files changed
-        uses: tj-actions/changed-files@v44
+        uses: tj-actions/changed-files@v35
         id: check-networking-files
         with:
           files: |
-            tests/bsim/net/
-            samples/net/sockets/echo_*/
-            modules/openthread/
-            subsys/net/l2/openthread/
+            tests/bsim/net/**
+            samples/net/sockets/echo_*/**
+            modules/openthread/**
+            subsys/net/l2/openthread/**
             include/zephyr/net/openthread.h
-            drivers/ieee802154/
+            drivers/ieee802154/**
             include/zephyr/net/ieee802154*
 
-      - name: Check if UART files changed
-        uses: tj-actions/changed-files@v44
-        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 -c advice.detachedHead=false checkout ${BSIM_VERSION}
+          git config --global advice.detachedHead false
+          git 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: |
-          tests/bsim/ci.bt.sh
+          export ZEPHYR_BASE=${PWD}
+          WORK_DIR=${ZEPHYR_BASE}/bsim_bt nice tests/bsim/bluetooth/compile.sh
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_52_test_results_file} \
+          SEARCH_PATH=tests/bsim/bluetooth/ tests/bsim/run_parallel.sh
+          # Run the BT controller tests also for the nrf5340
+          BOARD=nrf5340bsim_nrf5340_cpunet \
+          WORK_DIR=${ZEPHYR_BASE}/bsim_bt nice tests/bsim/bluetooth/ll/compile.sh
+          BOARD=nrf5340bsim_nrf5340_cpunet \
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_53_test_results_file} \
+          SEARCH_PATH=tests/bsim/bluetooth/ll/ 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: |
-          tests/bsim/ci.net.sh
+          export ZEPHYR_BASE=${PWD}
+          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: |
-          tests/bsim/ci.uart.sh
-
-      - name: Merge Test Results
-        run: |
-          pip3 install junitparser junit2html
-          junitparser merge --glob "./bsim_*/*bsim_results.*.xml" "./twister-out/twister.xml" junit.xml
-          junit2html junit.xml junit.html
-
-      - name: Upload Unit Test Results in HTML
+      - name: Upload Test Results
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: HTML Unit Test Results
-          if-no-files-found: ignore
+          name: bsim-test-results
           path: |
-            junit.html
-
-      - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        with:
-          check_name: Bsim Test Results
-          files: "junit.xml"
-          comment_mode: off
+            ./bsim_bt/52_bsim_results.xml
+            ./bsim_bt/53_bsim_results.xml
+            ./bsim_net/52_bsim_results.xml
+            ${{ github.event_path }}
+          if-no-files-found: warn
 
       - name: Upload Event Details
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: event
           path: |

.github/workflows/bug_snapshot.yaml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
 
     - name: Install Python dependencies
       run: |
@@ -42,7 +42,7 @@ jobs:
         echo "BUGS_PICKLE_PATH=${BUGS_PICKLE_PATH}" >> ${GITHUB_ENV}
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@v2
       with:
         aws-access-key-id: ${{ vars.AWS_BUILDS_ZEPHYR_BUG_SNAPSHOT_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_BUILDS_ZEPHYR_BUG_SNAPSHOT_SECRET_ACCESS_KEY }}

.github/workflows/clang.yaml

@@ -12,13 +12,14 @@ jobs:
     runs-on:
       group: zephyr-runner-v2-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.13.20240601
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.5.20231213
       options: '--entrypoint /bin/bash'
     strategy:
       fail-fast: false
       matrix:
-        platform: ["native_sim"]
+        platform: ["native_posix"]
     env:
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
       CCACHE_DIR: /node-cache/ccache-zephyr
       CCACHE_REMOTE_STORAGE: "redis://cache-*.keydb-cache.svc.cluster.local|shards=1,2,3"
       CCACHE_REMOTE_ONLY: "true"
@@ -49,7 +50,7 @@ jobs:
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
@@ -73,8 +74,6 @@ jobs:
           # west caching).
           west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.log || west update --path-cache /repo-cache/zephyrproject 2>&1 1> west2.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /repo-cache/zephyrproject)
 
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
       - name: Check Environment
         run: |
           cmake --version
@@ -89,16 +88,6 @@ jobs:
           ccache -p
           ccache -z -s -vv
 
-      - name: Update BabbleSim to manifest revision
-        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 -c advice.detachedHead=false checkout ${BSIM_VERSION}
-          west update
-          make everything -s -j 8
-
       - name: Run Tests with Twister
         id: twister
         run: |
@@ -125,7 +114,7 @@ jobs:
 
       - name: Upload Unit Test Results
         if: always() && steps.twister.outputs.report_needed != 0
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: Unit Test Results (Subset ${{ matrix.platform }})
           path: twister-out/twister.xml
@@ -137,7 +126,7 @@ jobs:
     if: (success() || failure() ) && needs.clang-build.outputs.report_needed != 0
     steps:
       - name: Download Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           path: artifacts
       - name: Merge Test Results
@@ -148,7 +137,7 @@ jobs:
 
       - name: Upload Unit Test Results in HTML
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         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 06,18 * * *'
+    - cron: '25 */3 * * 1-5'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
@@ -14,22 +14,14 @@ jobs:
     runs-on:
       group: zephyr-runner-v2-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.13.20240601
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.5.20231213
       options: '--entrypoint /bin/bash'
     strategy:
       fail-fast: false
       matrix:
-        platform: ["mps2/an385", "native_sim", "qemu_x86", "unit_testing"]
-        include:
-          - platform: 'mps2/an385'
-            normalized: 'mps2_an385'
-          - platform: 'native_sim'
-            normalized: 'native_sim'
-          - platform: 'qemu_x86'
-            normalized: 'qemu_x86'
-          - platform: 'unit_testing'
-            normalized: 'unit_testing'
+        platform: ["native_posix", "qemu_x86", "unit_testing"]
     env:
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
       CCACHE_DIR: /node-cache/ccache-zephyr
       CCACHE_REMOTE_STORAGE: "redis://cache-*.keydb-cache.svc.cluster.local|shards=1,2,3"
       CCACHE_REMOTE_ONLY: "true"
@@ -61,7 +53,7 @@ jobs:
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -70,14 +62,12 @@ jobs:
           west init -l . || true
           west update 1> west.update.log || west update 1> west.update-2.log
 
-      - name: Environment Setup
+      - name: Check Environment
         run: |
           cmake --version
           gcc --version
           ls -la
 
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
       - name: Set up ccache
         run: |
           mkdir -p ${CCACHE_DIR}
@@ -85,48 +75,34 @@ jobs:
           ccache -p
           ccache -z -s -vv
 
-      - name: Update BabbleSim to manifest revision
-        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 -c advice.detachedHead=false checkout ${BSIM_VERSION}
-          west update
-          make everything -s -j 8
-
       - name: Run Tests with Twister (Push)
         continue-on-error: true
         run: |
           export ZEPHYR_BASE=${PWD}
           export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
           mkdir -p coverage/reports
-          pip3 install gcovr==6.0
-          ./scripts/twister -E ${{matrix.normalized}}-testplan.json
-          ls -la
-          ./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 \
-            --timeout-multiplier 2
+          ./scripts/twister --force-color -N -v --filter runnable -p ${{ matrix.platform }} \
+            --coverage -T tests --timeout-multiplier 2
+
+      - 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
 
       - name: Print ccache stats
         if: always()
         run: |
           ccache -s -vv
 
-      - name: Rename coverage files
-        if: always()
-        run: |
-          mv twister-out/coverage.json coverage/reports/${{matrix.normalized}}.json
-
       - name: Upload Coverage Results
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: Coverage Data (Subset ${{ matrix.normalized }})
-          path: |
-            coverage/reports/${{ matrix.normalized }}.json
-            ${{ matrix.normalized }}-testplan.json
+          name: Coverage Data (Subset ${{ matrix.platform }})
+          path: coverage/reports/${{ matrix.platform }}.info
 
   codecov-results:
     name: "Publish Coverage Results"
@@ -137,27 +113,24 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
-
       - name: Download Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           path: coverage/reports
 
       - name: Move coverage files
         run: |
-          ls -lRt  ./coverage/reports
-          mv ./coverage/reports/*/*testplan.json .
-          mv ./coverage/reports/*/coverage/reports/*.json ./coverage/reports
+          mv ./coverage/reports/*/*.info ./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/*.json")
+          file(GLOB INPUT_FILES_LIST  "coverage/reports/*.info")
           set(MERGELIST "")
           set(FILELIST "")
           foreach(ITEM ${INPUT_FILES_LIST})
@@ -171,7 +144,7 @@ jobs:
           foreach(ITEM ${INPUT_FILES_LIST})
             get_filename_component(f ${ITEM} NAME)
             if(MERGELIST STREQUAL "")
-              set(MERGELIST "--add-tracefile ${f}")
+              set(MERGELIST "-a ${f}")
             else()
               set(MERGELIST "${MERGELIST} -a ${f}")
             endif()
@@ -181,49 +154,17 @@ jobs:
 
       - name: Merge coverage files
         run: |
-          pushd ./coverage/reports
-          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
-          popd
-
-      - name: Get current date
-        id: run_date
-        run: |
-            echo "run_date=$(date --iso-8601=minutes)" >> "$GITHUB_OUTPUT"
-            echo "run_date_short=$(date +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
-            echo "run_date_year=$(date +'%Y')" >> "$GITHUB_OUTPUT"
-            echo "run_date_month=$(date +'%m')" >> "$GITHUB_OUTPUT"
-
-      - name: Generate Coverage Report
-        if: always()
-        run: |
-          pip install xlsxwriter ijson
-          python3 ./scripts/ci/coverage/coverage_analysis.py \
-            -t native_sim-testplan.json \
-            -m MAINTAINERS.yml \
-            -c coverage/reports/merged.json \
-            -o coverage-report-${{ steps.run_date.outputs.run_date_short }} \
-            -f all
-          cp coverage-report-* coverage/reports/
-
-      - name: Upload Merged Coverage Results and Report
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Coverage Data and report
-          path: |
-            coverage/reports/merged.json
-            coverage/reports/merged.xml
-            coverage/reports/coverage-report-${{ steps.run_date.outputs.run_date_short }}.json
-            coverage/reports/coverage-report-${{ steps.run_date.outputs.run_date_short }}.xlsx
+          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
 
       - name: Upload coverage to Codecov
         if: always()
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v3
         with:
+          directory: ./coverage/reports
           env_vars: OS,PYTHON
           fail_ci_if_error: false
           verbose: true
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: coverage/reports/merged.xml
+          files: merged.info

.github/workflows/coding_guidelines.yml

@@ -8,16 +8,16 @@ jobs:
     name: Run coding guidelines checks on patch series (PR)
     steps:
     - name: Checkout the code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
 
     - name: cache-pip
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('.github/workflows/coding_guidelines.yml') }}
+        key: ${{ runner.os }}-doc-pip
 
     - name: Install python dependencies
       run: |

.github/workflows/compliance.yml

@@ -1,12 +1,6 @@
 name: Compliance Checks
 
-on:
-  pull_request:
-    types:
-    - edited
-    - opened
-    - reopened
-    - synchronize
+on: pull_request
 
 jobs:
   check_compliance:
@@ -18,27 +12,22 @@ jobs:
         echo "$HOME/.local/bin" >> $GITHUB_PATH
 
     - name: Checkout the code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
 
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.11
-
     - name: cache-pip
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('.github/workflows/compliance.yml') }}
+        key: ${{ runner.os }}-doc-pip
 
     - name: Install python dependencies
       run: |
         pip3 install setuptools
         pip3 install wheel
-        pip3 install python-magic lxml junitparser gitlint pylint pykwalify yamllint clang-format unidiff
+        pip3 install python-magic lxml junitparser gitlint pylint pykwalify yamllint
         pip3 install west
 
     - name: west setup
@@ -55,16 +44,8 @@ jobs:
         # debug
         git log  --pretty=oneline | head -n 10
         west init -l . || true
-        west config manifest.group-filter -- +ci,-optional
-        west update -o=--depth=1 -n 2>&1 1> west.update.log || west update -o=--depth=1 -n 2>&1 1> west.update2.log
-
-    - name: Check for PR description
-      if: ${{ github.event.pull_request.body == '' }}
-      continue-on-error: true
-      id: pr_description
-      run: |
-        echo "Pull request description cannot be empty."
-        exit 1
+        west config manifest.group-filter -- +ci,+optional
+        west update 2>&1 1> west.update.log || west update 2>&1 1> west.update2.log
 
     - name: Run Compliance Tests
       continue-on-error: true
@@ -76,13 +57,11 @@ jobs:
         # debug
         ls -la
         git log  --pretty=oneline | head -n 10
-        # Increase rename limit to allow for large PRs
-        git config diff.renameLimit 10000
         ./scripts/ci/check_compliance.py --annotate -e KconfigBasic \
         -c origin/${BASE_REF}..
 
     - name: upload-results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       continue-on-error: true
       with:
         name: compliance.xml
@@ -94,33 +73,19 @@ jobs:
           exit 1;
         fi
 
-        warns=("ClangFormat")
         files=($(./scripts/ci/check_compliance.py -l))
-
         for file in "${files[@]}"; do
           f="${file}.txt"
           if [[ -s $f ]]; then
-            results=$(cat $f)
-            results="${results//'%'/'%25'}"
-            results="${results//$'\n'/'%0A'}"
-            results="${results//$'\r'/'%0D'}"
-
-            if [[ "${warns[@]}" =~ "${file}" ]]; then
-              echo "::warning file=${f}::$results"
-            else
-              echo "::error file=${f}::$results"
-              exit=1
-            fi
+            errors=$(cat $f)
+            errors="${errors//'%'/'%25'}"
+            errors="${errors//$'\n'/'%0A'}"
+            errors="${errors//$'\r'/'%0D'}"
+            echo "::error file=${f}::$errors"
+            exit=1
           fi
         done
 
         if [ "${exit}" == "1" ]; then
-          echo "Compliance error, check for error messages in the \"Run Compliance Tests\" step"
-          echo "You can run this step locally with the ./scripts/ci/check_compliance.py script."
-          exit 1;
-        fi
-
-        if [ "${{ steps.pr_description.outcome }}" == "failure" ]; then
-          echo "PR description cannot be empty"
           exit 1;
         fi

.github/workflows/daily_test_version.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@v2
       with:
         aws-access-key-id: ${{ vars.AWS_TESTING_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_TESTING_SECRET_ACCESS_KEY }}
@@ -28,7 +28,7 @@ jobs:
         pip3 install gitpython
 
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
 

.github/workflows/devicetree_checks.yml

@@ -26,23 +26,23 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.10', '3.11', '3.12']
-        os: [ubuntu-22.04, macos-14, windows-2022]
+        python-version: [3.8, 3.9, '3.10']
+        os: [ubuntu-22.04, macos-11, windows-2022]
         exclude:
-        - os: macos-14
+        - os: macos-11
           python-version: 3.6
         - os: windows-2022
           python-version: 3.6
     steps:
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: cache-pip-linux
       if: startsWith(runner.os, 'Linux')
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ matrix.python-version }}
@@ -50,7 +50,7 @@ jobs:
           ${{ runner.os }}-pip-${{ matrix.python-version }}
     - name: cache-pip-mac
       if: startsWith(runner.os, 'macOS')
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/Library/Caches/pip
         # Trailing '-' was just to get a different cache name
@@ -59,7 +59,7 @@ jobs:
           ${{ runner.os }}-pip-${{ matrix.python-version }}-
     - name: cache-pip-win
       if: startsWith(runner.os, 'Windows')
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~\AppData\Local\pip\Cache
         key: ${{ runner.os }}-pip-${{ matrix.python-version }}

.github/workflows/do_not_merge.yml

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

.github/workflows/doc-build.yml

@@ -10,61 +10,34 @@ on:
     tags:
     - v*
   pull_request:
+    paths:
+    - 'doc/**'
+    - '**.rst'
+    - 'include/**'
+    - 'kernel/include/kernel_arch_interface.h'
+    - 'lib/libc/**'
+    - 'subsys/testsuite/ztest/include/**'
+    - 'tests/**'
+    - '**/Kconfig*'
+    - 'west.yml'
+    - '.github/workflows/doc-build.yml'
+    - 'scripts/dts/**'
+    - 'doc/requirements.txt'
 
 env:
   # NOTE: west docstrings will be extracted from the version listed here
-  WEST_VERSION: 1.2.0
+  WEST_VERSION: 1.0.0
   # The latest CMake available directly with apt is 3.18, but we need >=3.20
   # so we fetch that through pip.
   CMAKE_VERSION: 3.20.5
-  DOXYGEN_VERSION: 1.12.0
-  # Job count is set to 2 less than the vCPU count of 16 because the total available RAM is 32GiB
-  # and each sphinx-build process may use more than 2GiB of RAM.
-  JOB_COUNT: 14
+  DOXYGEN_VERSION: 1.9.6
 
 jobs:
-  doc-file-check:
-    name: Check for doc changes
-    runs-on: ubuntu-22.04
-    if: >
-      github.repository_owner == 'zephyrproject-rtos'
-    outputs:
-      file_check: ${{ steps.check-doc-files.outputs.any_changed }}
-    steps:
-    - name: checkout
-      uses: actions/checkout@v4
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-        fetch-depth: 0
-    - name: Check if Documentation related files changed
-      uses: tj-actions/changed-files@v44
-      id: check-doc-files
-      with:
-        files: |
-          doc/
-          **.rst
-          include/
-          kernel/include/kernel_arch_interface.h
-          lib/libc/**
-          subsys/testsuite/ztest/include/**
-          tests/
-          **/Kconfig*
-          west.yml
-          scripts/dts/
-          doc/requirements.txt
-          .github/workflows/doc-build.yml
-          scripts/pylib/pytest-twister-harness/src/twister_harness/device/device_adapter.py
-          scripts/pylib/pytest-twister-harness/src/twister_harness/helpers/shell.py
-
   doc-build-html:
     name: "Documentation Build (HTML)"
-    needs: [doc-file-check]
-    if: >
-      github.repository_owner == 'zephyrproject-rtos' &&
-        ( needs.doc-file-check.outputs.file_check == 'true' || github.event_name != 'pull_request' )
     runs-on:
       group: zephyr-runner-v2-linux-x64-4xlarge
-    timeout-minutes: 90
+    timeout-minutes: 45
     concurrency:
       group: doc-build-html-${{ github.ref }}
       cancel-in-progress: true
@@ -79,20 +52,36 @@ jobs:
     - name: install-pkgs
       run: |
         sudo apt-get update
-        sudo apt-get install -y wget python3-pip git ninja-build graphviz lcov
+        sudo apt-get install -y wget python3-pip git ninja-build graphviz
         wget --no-verbose "https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz"
         sudo tar xf doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz -C /opt
         echo "/opt/doxygen-${DOXYGEN_VERSION}/bin" >> $GITHUB_PATH
         echo "${HOME}/.local/bin" >> $GITHUB_PATH
 
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+        fetch-depth: 0
+
+    - name: Rebase
+      continue-on-error: true
+      env:
+        BASE_REF: ${{ github.base_ref }}
+        PR_HEAD: ${{ github.event.pull_request.head.sha }}
+      run: |
+        git config --global user.email "actions@zephyrproject.org"
+        git config --global user.name "Github Actions"
+        git rebase origin/${BASE_REF}
+        git log --graph --oneline HEAD...${PR_HEAD}
+
+    - name: checkout
+      uses: actions/checkout@v3
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
 
     - name: Rebase
-      if: github.event_name == 'pull_request'
       continue-on-error: true
       env:
         BASE_REF: ${{ github.base_ref }}
@@ -104,7 +93,7 @@ jobs:
         git log --graph --oneline HEAD...${PR_HEAD}
 
     - name: cache-pip
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
         key: pip-${{ hashFiles('doc/requirements.txt') }}
@@ -115,7 +104,6 @@ jobs:
         pip3 install -r doc/requirements.txt
         pip3 install west==${WEST_VERSION}
         pip3 install cmake==${CMAKE_VERSION}
-        pip3 install coverxygen
 
     - name: west setup
       run: |
@@ -136,51 +124,30 @@ jobs:
           DOC_TARGET="html"
         fi
 
-        DOC_TAG=${DOC_TAG} \
-        SPHINXOPTS="-j ${JOB_COUNT} -W --keep-going -T" \
-        SPHINXOPTS_EXTRA="-q -t publish" \
-        make -C doc ${DOC_TARGET}
-
-        # API documentation coverage
-        python3 -m coverxygen --xml-dir  doc/_build/html/doxygen/xml/ --src-dir include/ --output doc-coverage.info
-        # deprecated page causing issues
-        lcov --remove doc-coverage.info \*/deprecated > new.info
-        genhtml --no-function-coverage --no-branch-coverage new.info -o coverage-report
+        DOC_TAG=${DOC_TAG} SPHINXOPTS_EXTRA="-q -t publish" make -C doc ${DOC_TARGET}
 
     - name: compress-docs
       run: |
-        tar --use-compress-program="xz -T0" -cf html-output.tar.xz --directory=doc/_build html
-        tar --use-compress-program="xz -T0" -cf api-output.tar.xz --directory=doc/_build html/doxygen/html
-        tar --use-compress-program="xz -T0" -cf api-coverage.tar.xz coverage-report
+        tar cfJ html-output.tar.xz --directory=doc/_build html
 
     - name: upload-build
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: html-output
         path: html-output.tar.xz
 
-    - name: upload-api-coverage
-      uses: actions/upload-artifact@v4
-      with:
-        name: api-coverage
-        path: api-coverage.tar.xz
-
     - name: process-pr
       if: github.event_name == 'pull_request'
       run: |
         REPO_NAME="${{ github.event.repository.name }}"
         PR_NUM="${{ github.event.pull_request.number }}"
         DOC_URL="https://builds.zephyrproject.io/${REPO_NAME}/pr/${PR_NUM}/docs/"
-        API_DOC_URL="https://builds.zephyrproject.io/${REPO_NAME}/pr/${PR_NUM}/docs/doxygen/html/"
-        API_COVERAGE_URL="https://builds.zephyrproject.io/${REPO_NAME}/pr/${PR_NUM}/api-coverage/"
 
         echo "${PR_NUM}" > pr_num
         echo "Documentation will be available shortly at: ${DOC_URL}" >> $GITHUB_STEP_SUMMARY
-        echo "API Documentation will be available shortly at: ${API_DOC_URL}" >> $GITHUB_STEP_SUMMARY
-        echo "API Coverage Report will be available shortly at: ${API_COVERAGE_URL}" >> $GITHUB_STEP_SUMMARY
 
     - name: upload-pr-number
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       if: github.event_name == 'pull_request'
       with:
         name: pr_num
@@ -188,23 +155,16 @@ jobs:
 
   doc-build-pdf:
     name: "Documentation Build (PDF)"
-    needs: [doc-file-check]
-    if: |
-      github.event_name != 'pull_request' &&
-      github.repository_owner == 'zephyrproject-rtos'
+    if: github.event_name != 'pull_request'
     runs-on:
       group: zephyr-runner-v2-linux-x64-4xlarge
     container: texlive/texlive:latest
-    timeout-minutes: 120
+    timeout-minutes: 60
     concurrency:
       group: doc-build-pdf-${{ github.ref }}
       cancel-in-progress: true
 
     steps:
-    - name: Apply container owner mismatch workaround
-      run: |
-        git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
     - name: Print cloud service information
       run: |
         echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
@@ -212,15 +172,15 @@ jobs:
         echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
 
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
 
     - name: install-pkgs
       run: |
         apt-get update
-        apt-get install -y python3-pip python3-venv ninja-build doxygen graphviz librsvg2-bin imagemagick
+        apt-get install -y python3-pip python3-venv ninja-build doxygen graphviz librsvg2-bin
 
     - name: cache-pip
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
         key: pip-${{ hashFiles('doc/requirements.txt') }}
@@ -252,28 +212,14 @@ jobs:
           DOC_TAG="development"
         fi
 
-        DOC_TAG=${DOC_TAG} \
-        SPHINXOPTS="-q -j ${JOB_COUNT}" \
-        LATEXMKOPTS="-quiet -halt-on-error" \
-        make -C doc pdf
+        DOC_TAG=${DOC_TAG} SPHINXOPTS="-q -j auto" LATEXMKOPTS="-quiet -halt-on-error" make -C doc pdf
 
     - name: upload-build
       if: always()
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: pdf-output
         if-no-files-found: ignore
         path: |
           doc/_build/latex/zephyr.pdf
           doc/_build/latex/zephyr.log
-
-  doc-build-status-check:
-    if: always()
-    name: "Documentation Build Status"
-    needs:
-    - doc-build-pdf
-    - doc-file-check
-    - doc-build-html
-    uses: ./.github/workflows/ready-to-merge.yml
-    with:
-      needs_context: ${{ toJson(needs) }}

.github/workflows/doc-publish-pr.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
     - name: Download artifacts
-      uses: dawidd6/action-download-artifact@v3
+      uses: dawidd6/action-download-artifact@v2
       with:
         workflow: doc-build.yml
         run_id: ${{ github.event.workflow_run.id }}
@@ -46,12 +46,9 @@ jobs:
     - name: Uncompress HTML docs
       run: |
         tar xf html-output/html-output.tar.xz -C html-output
-        if [ -f api-coverage/api-coverage.tar.xz ]; then
-          tar xf api-coverage/api-coverage.tar.xz -C api-coverage
-        fi
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@v2
       with:
         aws-access-key-id: ${{ vars.AWS_BUILDS_ZEPHYR_PR_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_BUILDS_ZEPHYR_PR_SECRET_ACCESS_KEY }}
@@ -64,8 +61,3 @@ jobs:
         aws s3 sync --quiet html-output/html \
           s3://builds.zephyrproject.org/${{ github.event.repository.name }}/pr/${PR_NUM}/docs \
           --delete
-        if [ -d api-coverage/coverage-report ]; then
-          aws s3 sync --quiet api-coverage/coverage-report/ \
-            s3://builds.zephyrproject.org/${{ github.event.repository.name }}/pr/${PR_NUM}/api-coverage \
-            --delete
-        fi

.github/workflows/doc-publish.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
     - name: Download artifacts
-      uses: dawidd6/action-download-artifact@v3
+      uses: dawidd6/action-download-artifact@v2
       with:
         workflow: doc-build.yml
         run_id: ${{ github.event.workflow_run.id }}
@@ -32,12 +32,9 @@ jobs:
     - name: Uncompress HTML docs
       run: |
         tar xf html-output/html-output.tar.xz -C html-output
-        if [ -f api-coverage/api-coverage.tar.xz ]; then
-          tar xf api-coverage/api-coverage.tar.xz -C api-coverage
-        fi
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@v2
       with:
         aws-access-key-id: ${{ vars.AWS_DOCS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_DOCS_SECRET_ACCESS_KEY }}
@@ -55,7 +52,4 @@ jobs:
 
         aws s3 sync --quiet html-output/html s3://docs.zephyrproject.org/${VERSION} --delete
         aws s3 sync --quiet html-output/html/doxygen/html s3://docs.zephyrproject.org/apidoc/${VERSION} --delete
-        if [ -d api-coverage/coverage-report ]; then
-          aws s3 sync --quiet api-coverage/coverage-report/ s3://docs.zephyrproject.org/api-coverage/${VERSION} --delete
-        fi
         aws s3 cp --quiet pdf-output/zephyr.pdf s3://docs.zephyrproject.org/${VERSION}/zephyr.pdf

.github/workflows/errno.yml

@@ -10,7 +10,9 @@ jobs:
   check-errno:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.13
+      image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
+    env:
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
 
     steps:
       - name: Apply container owner mismatch workaround
@@ -22,11 +24,7 @@ jobs:
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
       - name: checkout
-        uses: actions/checkout@v4
-
-      - name: Environment Setup
-        run: |
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
+        uses: actions/checkout@v3
 
       - name: Run errno.py
         run: |

.github/workflows/footprint-tracking.yml

@@ -26,11 +26,12 @@ jobs:
       group: zephyr-runner-v2-linux-x64-4xlarge
     if: github.repository_owner == 'zephyrproject-rtos'
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.13.20240601
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.5.20231213
       options: '--entrypoint /bin/bash'
     strategy:
       fail-fast: false
     env:
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
       ZEPHYR_TOOLCHAIN_VARIANT: zephyr
     steps:
       - name: Apply container owner mismatch workaround
@@ -58,15 +59,11 @@ jobs:
           sudo pip3 install -U setuptools wheel pip gitpython
 
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
 
-      - name: Environment Setup
-        run: |
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
       - name: west setup
         run: |
           west init -l . || true
@@ -74,7 +71,7 @@ jobs:
           west update 2>&1 1> west.update.log || west update 2>&1 1> west.update2.log
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-access-key-id: ${{ vars.AWS_TESTING_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_TESTING_SECRET_ACCESS_KEY }}

.github/workflows/footprint.yml

@@ -0,0 +1,78 @@
+name: Footprint Delta
+
+on: pull_request
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  footprint-delta:
+    runs-on:
+      group: zephyr-runner-v2-linux-x64-4xlarge
+    if: github.repository == 'zephyrproject-rtos/zephyr'
+    container:
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.5.20231213
+      options: '--entrypoint /bin/bash'
+    strategy:
+      fail-fast: false
+    env:
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
+      ZEPHYR_TOOLCHAIN_VARIANT: zephyr
+    steps:
+      - name: Apply container owner mismatch workaround
+        run: |
+          # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
+          #        match the container user UID because of the way GitHub
+          #        Actions runner is implemented. Remove this workaround when
+          #        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: Update PATH for west
+        run: |
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: checkout
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+
+      - name: west setup
+        run: |
+          west init -l . || true
+          west config --global update.narrow true
+          west update 2>&1 1> west.update.log || west update 2>&1 1> west.update.log
+
+      - name: Detect Changes in Footprint
+        env:
+          BASE_REF: ${{ github.base_ref }}
+        run: |
+          export ZEPHYR_BASE=${PWD}
+          git config --global user.email "actions@zephyrproject.org"
+          git config --global user.name "Github Actions"
+          git remote -v
+          git rebase origin/${BASE_REF}
+          git checkout -b this_pr
+          west update
+          west build -b frdm_k64f  tests/benchmarks/footprints -t ram_report
+          cp build/ram.json ram2.json
+          west build -b frdm_k64f  tests/benchmarks/footprints -t rom_report
+          cp build/rom.json rom2.json
+
+          git checkout origin/${BASE_REF}
+          west update
+          west build -p always -b frdm_k64f  tests/benchmarks/footprints -t ram_report
+          west build -b frdm_k64f  tests/benchmarks/footprints -t rom_report
+          cp build/ram.json ram1.json
+          cp build/rom.json rom1.json
+
+          git checkout this_pr
+          ./scripts/footprint/fpdiff.py ram1.json ram2.json
+          ./scripts/footprint/fpdiff.py rom1.json rom2.json

.github/workflows/greet_first_time_contributor.yml

@@ -12,8 +12,8 @@ jobs:
     if: github.repository == 'zephyrproject-rtos/zephyr'
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: zephyrproject-rtos/action-first-interaction@v1.1.1-zephyr-5
+      - uses: actions/checkout@v3
+      - uses: zephyrproject-rtos/action-first-interaction@v1.1.1-zephyr-4
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/hello_world_multiplatform.yaml

@@ -1,79 +0,0 @@
-name: Hello World (Multiplatform)
-
-on:
-  push:
-    branches:
-      - main
-      - v*-branch
-      - collab-*
-  pull_request:
-    branches:
-      - main
-      - v*-branch
-      - collab-*
-    paths:
-      - 'scripts/build/**'
-      - 'scripts/requirements*.txt'
-      - '.github/workflows/hello_world_multiplatform.yaml'
-      - 'SDK_VERSION'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14, windows-2022]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          path: zephyr
-          fetch-depth: 0
-
-      - name: Rebase
-        if: github.event_name == 'pull_request'
-        env:
-          BASE_REF: ${{ github.base_ref }}
-          PR_HEAD: ${{ github.event.pull_request.head.sha }}
-        working-directory: zephyr
-        shell: bash
-        run: |
-          git config --global user.email "actions@zephyrproject.org"
-          git config --global user.name "Github Actions"
-          git rebase origin/${BASE_REF}
-          git log --graph --oneline HEAD...${PR_HEAD}
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.11
-
-      - name: Setup Zephyr project
-        uses: zephyrproject-rtos/action-zephyr-setup@v1
-        with:
-          app-path: zephyr
-          toolchains: all
-
-      - name: Build firmware
-        working-directory: zephyr
-        shell: bash
-        run: |
-          if [ "${{ runner.os }}" = "macOS" ]; then
-            EXTRA_TWISTER_FLAGS="-P native_sim --build-only"
-          elif [ "${{ runner.os }}" = "Windows" ]; then
-            EXTRA_TWISTER_FLAGS="-P native_sim --short-build-path -O/tmp/twister-out"
-          fi
-          ./scripts/twister --force-color --inline-logs -T samples/hello_world -v $EXTRA_TWISTER_FLAGS
-
-      - name: Upload artifacts
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          if-no-files-found: ignore
-          path:
-            zephyr/twister-out/*/samples/hello_world/sample.basic.helloworld/build.log

.github/workflows/issue_count.yml

@@ -27,7 +27,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install discount
 
-    - uses: brcrista/summarize-issues@v4
+    - uses: brcrista/summarize-issues@v3
       with:
         title: 'Issues Report for ${{ github.repository }}'
         configPath: 'issues-report-config.json'
@@ -35,14 +35,14 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: upload-stats
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       continue-on-error: true
       with:
         name: ${{ env.OUTPUT_FILE_NAME }}
         path: ${{ env.OUTPUT_FILE_NAME }}
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@v2
       with:
         aws-access-key-id: ${{ vars.AWS_TESTING_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_TESTING_SECRET_ACCESS_KEY }}

.github/workflows/license_check.yml

@@ -8,16 +8,14 @@ jobs:
     name: Scan code for licenses
     steps:
     - name: Checkout the code
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
+      uses: actions/checkout@v3
     - name: Scan the code
       id: scancode
       uses: zephyrproject-rtos/action_scancode@v4
       with:
         directory-to-scan: 'scan/'
     - name: Artifact Upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: scancode
         path: ./artifacts

.github/workflows/manifest.yml

@@ -8,7 +8,7 @@ jobs:
     name: Manifest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           path: zephyrproject/zephyr
           ref: ${{ github.event.pull_request.head.sha }}
@@ -26,13 +26,12 @@ jobs:
           west init -l . || true
 
       - name: Manifest
-        uses: zephyrproject-rtos/action-manifest@v1.3.1
+        uses: zephyrproject-rtos/action-manifest@v1.2.0
         with:
           github-token: ${{ secrets.ZB_GITHUB_TOKEN }}
           manifest-path: 'west.yml'
           checkout-path: 'zephyrproject/zephyr'
           use-tree-checkout: 'true'
-          check-impostor-commits: 'true'
           label-prefix: 'manifest-'
           verbosity-level: '1'
           labels: 'manifest'

.github/workflows/pylib_tests.yml

@@ -25,18 +25,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.10', '3.11', '3.12']
+        python-version: [3.8, 3.9, '3.10']
         os: [ubuntu-22.04]
     steps:
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: cache-pip-linux
       if: startsWith(runner.os, 'Linux')
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ matrix.python-version }}

.github/workflows/ready-to-merge.yml

@@ -1,28 +0,0 @@
-name: ready to merge
-
-on:
-  workflow_call:
-    inputs:
-      needs_context:
-        type: string
-        required: true
-
-jobs:
-  all_jobs_passed:
-    name: all jobs passed
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Check status of all required jobs"
-        run: |-
-          NEEDS_CONTEXT='${{ inputs.needs_context }}'
-          JOB_IDS=$(echo "$NEEDS_CONTEXT" | jq -r 'keys[]')
-          for JOB_ID in $JOB_IDS; do
-            RESULT=$(echo "$NEEDS_CONTEXT" | jq -r ".[\"$JOB_ID\"].result")
-            echo "$JOB_ID job result: $RESULT"
-            if [[ $RESULT != "success" && $RESULT != "skipped" ]]; then
-              echo "***"
-              echo "Error: The $JOB_ID job did not pass."
-              exit 1
-            fi
-          done
-          echo "All jobs passed or were skipped."

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
   release:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -26,7 +26,7 @@ jobs:
           args: spdx -o zephyr-${{ steps.get_version.outputs.VERSION }}.spdx
 
       - name: upload-results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         continue-on-error: true
         with:
           name: zephyr-${{ steps.get_version.outputs.VERSION }}.spdx

.github/workflows/scorecards.yml

@@ -1,61 +0,0 @@
-# This workflow uses actions that are not certified by GitHub. They are provided
-# by a third-party and are governed by separate terms of service, privacy
-# policy, and support documentation.
-
-name: Scorecards supply-chain security
-on:
-  # For Branch-Protection check. Only the default branch is supported. See
-  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
-  branch_protection_rule:
-  # To guarantee Maintained check is occasionally updated. See
-  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
-  schedule:
-    - cron: '43 7 * * 6'
-  push:
-    branches:
-      - main
-
-permissions: read-all
-
-jobs:
-  analysis:
-    name: Scorecard analysis
-    runs-on: ubuntu-latest
-    permissions:
-      # Needed for Code scanning upload
-      security-events: write
-      # Needed for GitHub OIDC token if publish_results is true
-      id-token: write
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-        with:
-          persist-credentials: false
-
-      - name: "Run analysis"
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
-        with:
-          results_file: results.sarif
-          results_format: sarif
-          # Publish results to OpenSSF REST API for easy access by consumers.
-          # - Allows the repository to include the Scorecard badge.
-          # - See https://github.com/ossf/scorecard-action#publishing-results.
-          publish_results: true
-
-      # Upload the results as artifacts (optional). Commenting out will disable
-      # uploads of run results in SARIF format to the repository Actions tab.
-      # https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      # Upload the results to GitHub's code scanning dashboard (optional).
-      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
-        with:
-          sarif_file: results.sarif

.github/workflows/scripts_tests.yml

@@ -25,11 +25,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.10', '3.11', '3.12']
+        python-version: [3.8, 3.9, '3.10']
         os: [ubuntu-20.04]
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
@@ -46,13 +46,13 @@ jobs:
           git log --graph --oneline HEAD...${PR_HEAD}
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: cache-pip-linux
         if: startsWith(runner.os, 'Linux')
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ matrix.python-version }}

.github/workflows/stale_issue.yml

@@ -24,5 +24,5 @@ jobs:
         stale-issue-label: 'Stale'
         stale-pr-label: 'Stale'
         exempt-pr-labels: 'Blocked,In progress'
-        exempt-issue-labels: 'In progress,Enhancement,Feature,Feature Request,RFC,Meta,Process,Coverity'
+        exempt-issue-labels: 'In progress,Enhancement,Feature,Feature Request,RFC,Meta,Process'
         operations-per-run: 400

.github/workflows/stats_merged_prs.yml

@@ -1,24 +0,0 @@
-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@v4
-      - 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

@@ -25,7 +25,7 @@ jobs:
     runs-on:
       group: zephyr-runner-v2-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.14.20240823
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.5.20231213
       options: '--entrypoint /bin/bash'
     outputs:
       subset: ${{ steps.output-services.outputs.subset }}
@@ -35,6 +35,7 @@ jobs:
       MATRIX_SIZE: 10
       PUSH_MATRIX_SIZE: 20
       DAILY_MATRIX_SIZE: 80
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
       BSIM_OUT_PATH: /opt/bsim/
       BSIM_COMPONENTS_PATH: /opt/bsim/components
       TESTS_PER_BUILDER: 700
@@ -64,7 +65,7 @@ jobs:
 
       - name: Checkout
         if: github.event_name == 'pull_request_target'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
@@ -84,8 +85,6 @@ jobs:
           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: Generate Test Plan with Twister
         if: github.event_name == 'pull_request_target'
         id: test-plan
@@ -129,7 +128,7 @@ jobs:
     needs: twister-build-prep
     if: needs.twister-build-prep.outputs.size != 0
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.14.20240823
+      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.5.20231213
       options: '--entrypoint /bin/bash'
     strategy:
       fail-fast: false
@@ -137,6 +136,7 @@ jobs:
         subset: ${{fromJSON(needs.twister-build-prep.outputs.subset)}}
     timeout-minutes: 1440
     env:
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
       CCACHE_DIR: /node-cache/ccache-zephyr
       CCACHE_REMOTE_STORAGE: "redis://cache-*.keydb-cache.svc.cluster.local|shards=1,2,3"
       CCACHE_REMOTE_ONLY: "true"
@@ -172,7 +172,7 @@ jobs:
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
@@ -188,7 +188,6 @@ jobs:
             git log  --pretty=oneline | head -n 10
           fi
           echo "$HOME/.local/bin" >> $GITHUB_PATH
-          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
           west init -l . || true
           west config manifest.group-filter -- +ci,+optional
@@ -196,14 +195,10 @@ jobs:
           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 Environment
         run: |
           cmake --version
           gcc --version
-          cargo --version
-          rustup target list --installed
           ls -la
           echo "github.ref: ${{ github.ref }}"
           echo "github.base_ref: ${{ github.base_ref }}"
@@ -216,16 +211,6 @@ jobs:
           ccache -p
           ccache -z -s -vv
 
-      - name: Update BabbleSim to manifest revision
-        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 -c advice.detachedHead=false checkout ${BSIM_VERSION}
-          west update
-          make everything -s -j 8
-
       - if: github.event_name == 'push'
         name: Run Tests with Twister (Push)
         run: |
@@ -274,7 +259,7 @@ jobs:
 
       - name: Upload Unit Test Results
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: Unit Test Results (Subset ${{ matrix.subset }})
           if-no-files-found: ignore
@@ -284,24 +269,6 @@ jobs:
             module_tests/twister.xml
             testplan.json
 
-      - if: matrix.subset == 1 && github.event_name == 'push'
-        name: Save the list of Python packages
-        shell: bash
-        run: |
-          FREEZE_FILE="frozen-requirements.txt"
-          timestamp="$(date)"
-          version="$(git describe --abbrev=12 --always)"
-          echo -e "# Generated at $timestamp ($version)\n" > $FREEZE_FILE
-          pip3 freeze | tee -a $FREEZE_FILE
-
-      - if: matrix.subset == 1 && github.event_name == 'push'
-        name: Upload the list of Python packages
-        uses: actions/upload-artifact@v4
-        with:
-          name: Frozen PIP package set
-          path: |
-            frozen-requirements.txt
-
   twister-test-results:
     name: "Publish Unit Tests Results"
     env:
@@ -316,13 +283,13 @@ jobs:
       # Needed for opensearch and upload script
       - if: github.event_name == 'push' || github.event_name == 'schedule'
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           persist-credentials: false
 
       - name: Download Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           path: artifacts
 
@@ -348,7 +315,7 @@ jobs:
 
       - name: Upload Unit Test Results in HTML
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: HTML Unit Test Results
           if-no-files-found: ignore
@@ -361,12 +328,3 @@ jobs:
           check_name: Unit Test Results
           files: "**/twister.xml"
           comment_mode: off
-  twister-status-check:
-    if: always()
-    name: "Check Twister Status"
-    needs:
-      - twister-build-prep
-      - twister-build
-    uses: ./.github/workflows/ready-to-merge.yml
-    with:
-      needs_context: ${{ toJson(needs) }}

.github/workflows/twister_tests.yml

@@ -8,23 +8,20 @@ on:
     branches:
     - main
     - v*-branch
-    - collab-*
     paths:
-    - 'scripts/pylib/**'
+    - 'scripts/pylib/twister/**'
     - 'scripts/twister'
     - 'scripts/tests/twister/**'
     - '.github/workflows/twister_tests.yml'
-    - 'scripts/schemas/twister/'
   pull_request:
     branches:
     - main
     - v*-branch
     paths:
-    - 'scripts/pylib/**'
+    - 'scripts/pylib/twister/**'
     - 'scripts/twister'
     - 'scripts/tests/twister/**'
     - '.github/workflows/twister_tests.yml'
-    - 'scripts/schemas/twister/'
 
 jobs:
   twister-tests:
@@ -32,18 +29,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.10', '3.11', '3.12']
+        python-version: [3.8, 3.9, '3.10']
         os: [ubuntu-22.04]
     steps:
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: cache-pip-linux
       if: startsWith(runner.os, 'Linux')
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ matrix.python-version }}
@@ -51,7 +48,7 @@ jobs:
           ${{ runner.os }}-pip-${{ matrix.python-version }}
     - name: install-packages
       run: |
-        pip3 install -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt -r scripts/requirements-run-test.txt
+        pip3 install -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt
     - name: Run pytest for twisterlib
       env:
         ZEPHYR_BASE: ./

.github/workflows/twister_tests_blackbox.yml

@@ -7,8 +7,6 @@ on:
   pull_request:
     branches:
     - main
-    - collab-*
-    - v*-branch
     paths:
     - 'scripts/pylib/twister/**'
     - 'scripts/twister'
@@ -21,10 +19,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.10', '3.11', '3.12']
+        python-version: [3.8, 3.9, '3.10']
         os: [ubuntu-22.04]
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.13
+      image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
+    env:
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
 
     steps:
     - name: Apply Container Owner Mismatch Workaround
@@ -36,23 +36,19 @@ jobs:
         git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
 
     - name: Environment Setup
       run: |
         echo "$HOME/.local/bin" >> $GITHUB_PATH
 
         west init -l . || true
-        # we do not depend on any hals, tools or bootloader, save some time and space...
-        west config manifest.group-filter -- -hal,-tools,-bootloader
         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 forall -c 'git reset --hard HEAD'
 
-        echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
     - name: Set Up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -77,3 +73,19 @@ jobs:
         echo "Run twister tests"
         source zephyr-env.sh
         PYTHONPATH="./scripts/tests" pytest ./scripts/tests/twister_blackbox
+
+    - name: Upload Unit Test Results
+      if: success() || failure()
+      uses: actions/upload-artifact@v2
+      with:
+        name: Black Box Test Results (Python ${{ matrix.python-version }})
+        path: |
+          twister-out*/twister.log
+          twister-out*/twister.json
+          twister-out*/testplan.log
+        retention-days: 14
+
+    - name: Clear Workspace
+      if: success() || failure()
+      run: |
+        rm -rf twister-out*/

.github/workflows/west_cmds.yml

@@ -8,7 +8,6 @@ on:
     branches:
     - main
     - v*-branch
-    - collab-*
     paths:
     - 'scripts/west-commands.yml'
     - 'scripts/west_commands/**'
@@ -17,7 +16,6 @@ on:
     branches:
     - main
     - v*-branch
-    - collab-*
     paths:
     - 'scripts/west-commands.yml'
     - 'scripts/west_commands/**'
@@ -29,23 +27,23 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.10', '3.11', '3.12']
-        os: [ubuntu-22.04, macos-14, windows-2022]
+        python-version: [3.8, 3.9, '3.10']
+        os: [ubuntu-22.04, macos-11, windows-2022]
         exclude:
-        - os: macos-14
+        - os: macos-11
           python-version: 3.6
         - os: windows-2022
           python-version: 3.6
     steps:
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: cache-pip-linux
       if: startsWith(runner.os, 'Linux')
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ matrix.python-version }}
@@ -53,7 +51,7 @@ jobs:
           ${{ runner.os }}-pip-${{ matrix.python-version }}
     - name: cache-pip-mac
       if: startsWith(runner.os, 'macOS')
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/Library/Caches/pip
         # Trailing '-' was just to get a different cache name
@@ -62,7 +60,7 @@ jobs:
           ${{ runner.os }}-pip-${{ matrix.python-version }}-
     - name: cache-pip-win
       if: startsWith(runner.os, 'Windows')
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~\AppData\Local\pip\Cache
         key: ${{ runner.os }}-pip-${{ matrix.python-version }}

.gitignore

@@ -7,10 +7,8 @@
 *.swp
 *.swo
 *~
-
-# Emacs
+.\#*
 \#*\#
-
 build*/
 !doc/build/
 !scripts/build
@@ -29,8 +27,6 @@ outdir
 outdir-*
 scripts/basic/fixdep
 scripts/gen_idt/gen_idt
-coverage-report
-doc-coverage.info
 doc/_build
 doc/doxygen
 doc/xml
@@ -43,7 +39,6 @@ sanity-out*
 twister-out*
 bsim_out
 bsim_bt_out
-myresults.xml
 tests/RunResults.xml
 scripts/grub
 doc/reference/kconfig/*.rst
@@ -57,19 +52,6 @@ venv
 .venv
 .DS_Store
 .clangd
-new.info
-
-# Cargo drops lock files in projects to capture resolved dependencies.
-# We don't want to record these.
-Cargo.lock
-
-# Cargo encourages a .cargo/config.toml file to symlink to a generated
-# file.  Don't save these.
-.cargo/
-
-# Normal west builds will place the Rust target directory under the build directory.  However,
-# sometimes IDEs and such will litter these target directories as well.
-target/
 
 # CI output
 compliance.xml
@@ -86,19 +68,14 @@ tags
 
 # from check_compliance.py
 BinaryFiles.txt
-BoardYml.txt
 Checkpatch.txt
-ClangFormat.txt
 DevicetreeBindings.txt
-GitDiffCheck.txt
 Gitlint.txt
 Identity.txt
 ImageSize.txt
 Kconfig.txt
 KconfigBasic.txt
 KconfigBasicNoModules.txt
-KconfigHWMv2.txt
-KeepSorted.txt
 MaintainersFormat.txt
 ModulesMaintainers.txt
 Nits.txt

.gitlint

@@ -26,7 +26,7 @@ extra-path=scripts/gitlint
 # max-line-count=200
 
 [title-starts-with-subsystem]
-regex = ^(?!subsys:)(?!treewide:)(([^:]+):)(\s([^:]+):)*\s(.+)$
+regex = ^(?!subsys:)(([^:]+):)(\s([^:]+):)*\s(.+)$
 
 [title-must-not-contain-word]
 # Comma-separated list of words that should not occur in the title. Matching is case

.mailmap

@@ -61,7 +61,6 @@ Lixin Guo <lixinx.guo@intel.com>
 Łukasz Mazur <lukasz.mazur@hidglobal.com>
 Manuel Argüelles <manuel.arguelles@nxp.com>
 Manuel Argüelles <manuel.arguelles@nxp.com> <manuel.arguelles@coredumplabs.com>
-Manuel Argüelles <manuel.arguelles@nxp.com> <marguelles.dev@gmail.com>
 Marc Herbert <marc.herbert@intel.com> <46978960+marc-hb@users.noreply.github.com>
 Marin Jurjević <marin.jurjevic@hotmail.com>
 Mariusz Ryndzionek <mariusz.ryndzionek@firmwave.com>

CMakeLists.txt

@@ -109,10 +109,6 @@ add_library(zephyr_interface INTERFACE)
 # flags that come with zephyr_interface.
 zephyr_library_named(zephyr)
 
-if(CONFIG_LEGACY_GENERATED_INCLUDE_PATH)
-  zephyr_include_directories(${PROJECT_BINARY_DIR}/include/generated/zephyr)
-endif()
-
 zephyr_include_directories(
   include
   ${PROJECT_BINARY_DIR}/include/generated
@@ -122,7 +118,19 @@ zephyr_include_directories(
 
 include(${ZEPHYR_BASE}/cmake/linker_script/${ARCH}/linker.cmake OPTIONAL)
 
-zephyr_include_directories(${SOC_FULL_DIR})
+# Don't add non-existing include directories, it creates noise and
+# warnings in some tooling
+foreach(optional_include_dir
+  ${SOC_DIR}/${ARCH}/${SOC_PATH}
+  ${SOC_DIR}/${ARCH}/${SOC_PATH}/include
+  ${SOC_DIR}/${ARCH}/${SOC_PATH}/include/${SOC_NAME}
+  ${SOC_DIR}/${ARCH}/${SOC_FAMILY}/include
+  ${SOC_DIR}/${ARCH}/${SOC_FAMILY}/common/include
+  )
+  if(EXISTS ${optional_include_dir})
+    zephyr_include_directories(${optional_include_dir})
+  endif()
+endforeach()
 
 # Don't inherit compiler flags from the environment
 foreach(var AFLAGS CFLAGS CXXFLAGS CPPFLAGS LDFLAGS)
@@ -192,7 +200,6 @@ get_property(OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG TARGET compiler PROPERTY no_opti
 get_property(OPTIMIZE_FOR_DEBUG_FLAG TARGET compiler PROPERTY optimization_debug)
 get_property(OPTIMIZE_FOR_SPEED_FLAG TARGET compiler PROPERTY optimization_speed)
 get_property(OPTIMIZE_FOR_SIZE_FLAG  TARGET compiler PROPERTY optimization_size)
-get_property(OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG TARGET compiler PROPERTY optimization_size_aggressive)
 
 # From kconfig choice, pick the actual OPTIMIZATION_FLAG to use.
 # Kconfig choice ensures only one of these CONFIG_*_OPTIMIZATIONS is set.
@@ -204,11 +211,8 @@ elseif(CONFIG_SPEED_OPTIMIZATIONS)
   set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_SPEED_FLAG})
 elseif(CONFIG_SIZE_OPTIMIZATIONS)
   set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_SIZE_FLAG}) # Default in kconfig
-elseif(CONFIG_SIZE_OPTIMIZATIONS_AGGRESSIVE)
-  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG})
 else()
-  message(FATAL_ERROR
-    "Unreachable code. Expected optimization level to have been chosen. See Kconfig.zephyr")
+  assert(0 "Unreachable code. Expected optimization level to have been chosen. See Kconfig.zephyr")
 endif()
 
 if(NOT CONFIG_ARCH_IS_SET)
@@ -221,31 +225,6 @@ endif()
 # Apply the final optimization flag(s)
 zephyr_compile_options(${OPTIMIZATION_FLAG})
 
-if(CONFIG_LTO)
-  zephyr_compile_options($<TARGET_PROPERTY:compiler,optimization_lto>)
-  add_link_options($<TARGET_PROPERTY:linker,lto_arguments>)
-endif()
-
-if(CONFIG_STD_C23)
-  set(CSTD c2x)
-elseif(CONFIG_STD_C17)
-  set(CSTD c17)
-elseif(CONFIG_STD_C11)
-  set(CSTD c11)
-elseif(CONFIG_STD_C99)
-  set(CSTD c99)
-elseif(CONFIG_STD_C90)
-  set(CSTD c90)
-else()
-  message(FATAL_ERROR "Unreachable code. Expected C standard to have been chosen.")
-endif()
-
-if(CONFIG_GNU_C_EXTENSIONS)
-  string(REPLACE "c" "gnu" CSTD "${CSTD}")
-endif()
-
-list(APPEND CMAKE_C_COMPILE_FEATURES ${compile_features_${CSTD}})
-
 # @Intent: Obtain compiler specific flags related to C++ that are not influenced by kconfig
 zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler-cpp,required>>)
 
@@ -275,8 +254,7 @@ if(CONFIG_CPP)
     set(STD_CPP_DIALECT_FLAGS $<TARGET_PROPERTY:compiler-cpp,dialect_cpp2b>)
     list(APPEND CMAKE_CXX_COMPILE_FEATURES ${compile_features_cpp20})
   else()
-    message(FATAL_ERROR
-      "Unreachable code. Expected C++ standard to have been chosen. See Kconfig.zephyr.")
+    assert(0 "Unreachable code. Expected C++ standard to have been chosen. See Kconfig.zephyr.")
   endif()
   set(CMAKE_CXX_COMPILE_FEATURES ${CMAKE_CXX_COMPILE_FEATURES} PARENT_SCOPE)
 
@@ -506,6 +484,30 @@ if(CONFIG_USERSPACE)
   set(KOBJECT_LINKER_DEP kobject_linker)
 endif()
 
+get_property(TOPT GLOBAL PROPERTY TOPT)
+get_property(COMPILER_TOPT TARGET compiler PROPERTY linker_script)
+set_ifndef(  TOPT "${COMPILER_TOPT}")
+set_ifndef(  TOPT -Wl,-T) # Use this if the compiler driver doesn't set a value
+
+if(CONFIG_HAVE_CUSTOM_LINKER_SCRIPT)
+  set(LINKER_SCRIPT ${APPLICATION_SOURCE_DIR}/${CONFIG_CUSTOM_LINKER_SCRIPT})
+  if(NOT EXISTS ${LINKER_SCRIPT})
+    set(LINKER_SCRIPT ${CONFIG_CUSTOM_LINKER_SCRIPT})
+    assert_exists(CONFIG_CUSTOM_LINKER_SCRIPT)
+  endif()
+else()
+  # Try a board specific linker file
+  set(LINKER_SCRIPT ${BOARD_DIR}/linker.ld)
+  if(NOT EXISTS ${LINKER_SCRIPT})
+    # If not available, try an SoC specific linker file
+    set(LINKER_SCRIPT ${SOC_DIR}/${ARCH}/${SOC_PATH}/linker.ld)
+  endif()
+endif()
+
+if(NOT EXISTS ${LINKER_SCRIPT})
+  message(FATAL_ERROR "Could not find linker script: '${LINKER_SCRIPT}'. Corrupted configuration?")
+endif()
+
 if(DEFINED BUILD_VERSION)
   set(build_version_argument "-DBUILD_VERSION=${BUILD_VERSION}")
 elseif(NOT ZEPHYR_GIT_INDEX)
@@ -548,35 +550,31 @@ if(ZEPHYR_GIT_INDEX)
 endif()
 
 add_custom_command(
-  OUTPUT ${PROJECT_BINARY_DIR}/include/generated/zephyr/version.h
+  OUTPUT ${PROJECT_BINARY_DIR}/include/generated/version.h
   COMMAND ${CMAKE_COMMAND} -DZEPHYR_BASE=${ZEPHYR_BASE}
-    -DOUT_FILE=${PROJECT_BINARY_DIR}/include/generated/zephyr/version.h
+    -DOUT_FILE=${PROJECT_BINARY_DIR}/include/generated/version.h
     -DVERSION_TYPE=KERNEL
     -DVERSION_FILE=${ZEPHYR_BASE}/VERSION
-    -DKERNEL_VERSION_CUSTOMIZATION="$<TARGET_PROPERTY:version_h,KERNEL_VERSION_CUSTOMIZATION>"
+    -DKERNEL_VERSION_CUSTOMIZATION="${KERNEL_VERSION_CUSTOMIZATION}"
     ${build_version_argument}
     -P ${ZEPHYR_BASE}/cmake/gen_version_h.cmake
   DEPENDS ${ZEPHYR_BASE}/VERSION ${git_dependency}
-  COMMAND_EXPAND_LISTS
 )
-add_custom_target(version_h DEPENDS ${PROJECT_BINARY_DIR}/include/generated/zephyr/version.h)
+add_custom_target(version_h DEPENDS ${PROJECT_BINARY_DIR}/include/generated/version.h)
 
 if(EXISTS ${APPLICATION_SOURCE_DIR}/VERSION)
   add_custom_command(
-    OUTPUT ${PROJECT_BINARY_DIR}/include/generated/zephyr/app_version.h
+    OUTPUT ${PROJECT_BINARY_DIR}/include/generated/app_version.h
     COMMAND ${CMAKE_COMMAND} -DZEPHYR_BASE=${ZEPHYR_BASE}
-      -DOUT_FILE=${PROJECT_BINARY_DIR}/include/generated/zephyr/app_version.h
+      -DOUT_FILE=${PROJECT_BINARY_DIR}/include/generated/app_version.h
       -DVERSION_TYPE=APP
       -DVERSION_FILE=${APPLICATION_SOURCE_DIR}/VERSION
-      -DAPP_VERSION_CUSTOMIZATION="$<TARGET_PROPERTY:app_version_h,APP_VERSION_CUSTOMIZATION>"
+      -DAPP_VERSION_CUSTOMIZATION="${APP_VERSION_CUSTOMIZATION}"
       ${build_version_argument}
       -P ${ZEPHYR_BASE}/cmake/gen_version_h.cmake
     DEPENDS ${APPLICATION_SOURCE_DIR}/VERSION ${git_dependency}
-    COMMAND_EXPAND_LISTS
   )
-  add_custom_target(
-    app_version_h
-    DEPENDS ${PROJECT_BINARY_DIR}/include/generated/zephyr/app_version.h)
+  add_custom_target(app_version_h DEPENDS ${PROJECT_BINARY_DIR}/include/generated/app_version.h)
   add_dependencies(zephyr_interface app_version_h)
 endif()
 
@@ -617,22 +615,19 @@ foreach(module_name ${ZEPHYR_MODULE_NAMES})
   # https://cmake.org/pipermail/cmake/2019-June/069547.html
   zephyr_string(SANITIZE TOUPPER MODULE_NAME_UPPER ${module_name})
   if(NOT ${ZEPHYR_${MODULE_NAME_UPPER}_CMAKE_DIR} STREQUAL "")
-    set(ZEPHYR_CURRENT_MODULE_NAME ${ZEPHYR_${MODULE_NAME_UPPER}_MODULE_NAME})
     set(ZEPHYR_CURRENT_MODULE_DIR ${ZEPHYR_${MODULE_NAME_UPPER}_MODULE_DIR})
     set(ZEPHYR_CURRENT_CMAKE_DIR ${ZEPHYR_${MODULE_NAME_UPPER}_CMAKE_DIR})
     add_subdirectory(${ZEPHYR_CURRENT_CMAKE_DIR} ${CMAKE_BINARY_DIR}/modules/${module_name})
   endif()
 endforeach()
-# Done processing modules, clear module variables
-set(ZEPHYR_CURRENT_MODULE_NAME)
+# Done processing modules, clear ZEPHYR_CURRENT_MODULE_DIR and ZEPHYR_CURRENT_CMAKE_DIR.
 set(ZEPHYR_CURRENT_MODULE_DIR)
 set(ZEPHYR_CURRENT_CMAKE_DIR)
 
 get_property(LIBC_LINK_LIBRARIES TARGET zephyr_interface PROPERTY LIBC_LINK_LIBRARIES)
 zephyr_link_libraries(${LIBC_LINK_LIBRARIES})
 
-set(syscall_list_h   ${CMAKE_CURRENT_BINARY_DIR}/include/generated/zephyr/syscall_list.h)
-set(edk_syscall_list_h   ${CMAKE_CURRENT_BINARY_DIR}/edk/include/generated/zephyr/syscall_list.h)
+set(syscall_list_h   ${CMAKE_CURRENT_BINARY_DIR}/include/generated/syscall_list.h)
 set(syscalls_json    ${CMAKE_CURRENT_BINARY_DIR}/misc/generated/syscalls.json)
 set(struct_tags_json ${CMAKE_CURRENT_BINARY_DIR}/misc/generated/struct_tags.json)
 
@@ -726,13 +721,6 @@ if(CONFIG_ZTEST)
 
 endif()
 
-get_property(
-  syscalls_include_list
-  TARGET syscalls_interface
-  PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-)
-list(APPEND SYSCALL_INCLUDE_DIRS ${syscalls_include_list})
-
 foreach(d ${SYSCALL_INCLUDE_DIRS})
   list(APPEND parse_syscalls_include_args
     --include ${d}
@@ -770,7 +758,7 @@ add_custom_target(${SYSCALL_LIST_H_TARGET} DEPENDS ${syscall_list_h} ${picolibc_
 set_property(TARGET ${SYSCALL_LIST_H_TARGET}
              APPEND PROPERTY
              ADDITIONAL_CLEAN_FILES
-             ${CMAKE_CURRENT_BINARY_DIR}/include/generated/zephyr/syscalls
+             ${CMAKE_CURRENT_BINARY_DIR}/include/generated/syscalls
 )
 
 add_custom_target(${PARSE_SYSCALLS_TARGET}
@@ -790,30 +778,18 @@ if(CONFIG_TIMEOUT_64BIT)
   set(SYSCALL_SPLIT_TIMEOUT_ARG --split-type k_timeout_t --split-type k_ticks_t)
 endif()
 
-# percepio/TraceRecorder/kernelports/Zephyr/scripts/tz_parse_syscalls.py hardcodes the path
-# to the `syscall_list.h`, make a copy of the generated file so that percepio is able to build
-if(CONFIG_LEGACY_GENERATED_INCLUDE_PATH)
-  set(LEGACY_SYSCALL_LIST_H_ARGS
-    ${CMAKE_COMMAND} -E copy
-    ${syscall_list_h}
-    ${CMAKE_CURRENT_BINARY_DIR}/include/generated/syscall_list.h)
-endif()
-
-add_custom_command(OUTPUT include/generated/zephyr/syscall_dispatch.c ${syscall_list_h}
-  # Also, some files are written to include/generated/zephyr/syscalls/
+add_custom_command(OUTPUT include/generated/syscall_dispatch.c ${syscall_list_h}
+  # Also, some files are written to include/generated/syscalls/
   COMMAND
   ${PYTHON_EXECUTABLE}
   ${ZEPHYR_BASE}/scripts/build/gen_syscalls.py
   --json-file        ${syscalls_json}                     # Read this file
-  --base-output      include/generated/zephyr/syscalls    # Write to this dir
-  --syscall-dispatch include/generated/zephyr/syscall_dispatch.c # Write this file
-  --syscall-export-llext  include/generated/zephyr/syscall_export_llext.c
+  --base-output      include/generated/syscalls           # Write to this dir
+  --syscall-dispatch include/generated/syscall_dispatch.c # Write this file
   --syscall-list     ${syscall_list_h}
   $<$<BOOL:${CONFIG_USERSPACE}>:--gen-mrsh-files>
   ${SYSCALL_LONG_REGISTERS_ARG}
   ${SYSCALL_SPLIT_TIMEOUT_ARG}
-  COMMAND
-  ${LEGACY_SYSCALL_LIST_H_ARGS}
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS ${PARSE_SYSCALLS_TARGET}
   )
@@ -821,7 +797,7 @@ add_custom_command(OUTPUT include/generated/zephyr/syscall_dispatch.c ${syscall_
 # This is passed into all calls to the gen_kobject_list.py script.
 set(gen_kobject_list_include_args --include-subsystem-list ${struct_tags_json})
 
-set(DRV_VALIDATION ${PROJECT_BINARY_DIR}/include/generated/zephyr/driver-validation.h)
+set(DRV_VALIDATION ${PROJECT_BINARY_DIR}/include/generated/driver-validation.h)
 add_custom_command(
   OUTPUT ${DRV_VALIDATION}
   COMMAND
@@ -854,17 +830,13 @@ add_dependencies(zephyr_generated_headers
 set(OFFSETS_LIB offsets)
 
 set(OFFSETS_C_PATH ${ARCH_DIR}/${ARCH}/core/offsets/offsets.c)
-set(OFFSETS_H_PATH ${PROJECT_BINARY_DIR}/include/generated/zephyr/offsets.h)
+set(OFFSETS_H_PATH ${PROJECT_BINARY_DIR}/include/generated/offsets.h)
 
 add_library(          ${OFFSETS_LIB} OBJECT ${OFFSETS_C_PATH})
 target_include_directories(${OFFSETS_LIB} PRIVATE
   kernel/include
   ${ARCH_DIR}/${ARCH}/include
   )
-
-# Make sure that LTO will never be enabled when compiling offsets.c
-set_source_files_properties(${OFFSETS_C_PATH} PROPERTIES COMPILE_OPTIONS $<TARGET_PROPERTY:compiler,prohibit_lto>)
-
 target_link_libraries(${OFFSETS_LIB} zephyr_interface)
 add_dependencies(zephyr_interface
   ${SYSCALL_LIST_H_TARGET}
@@ -890,7 +862,7 @@ add_subdirectory(kernel)
 get_property(
   syscalls_file_list
   TARGET syscalls_interface
-  PROPERTY INTERFACE_SOURCES
+  PROPERTY INTERFACE_INCLUDE_DIRECTORIES
 )
 file(CONFIGURE OUTPUT ${syscalls_file_list_output}
      CONTENT "@syscalls_file_list@" @ONLY)
@@ -927,13 +899,6 @@ foreach(zephyr_lib ${ZEPHYR_LIBS_PROPERTY})
   add_dependencies(${zephyr_lib} zephyr_generated_headers)
 endforeach()
 
-if(CONFIG_KERNEL_WHOLE_ARCHIVE)
-  set(WHOLE_ARCHIVE_LIBS ${ZEPHYR_LIBS_PROPERTY} kernel)
-else()
-  set(WHOLE_ARCHIVE_LIBS ${ZEPHYR_LIBS_PROPERTY})
-  set(NO_WHOLE_ARCHIVE_LIBS kernel)
-endif()
-
 get_property(OUTPUT_FORMAT        GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT)
 
 if (CONFIG_CODE_DATA_RELOCATION)
@@ -997,46 +962,18 @@ if(CONFIG_USERSPACE)
   set(PROCESS_GPERF ${ZEPHYR_BASE}/scripts/build/process_gperf.py)
 endif()
 
-get_property(GLOBAL_CSTD GLOBAL PROPERTY CSTD)
-if(DEFINED GLOBAL_CSTD)
-  message(DEPRECATION
-    "Global CSTD property is deprecated, see Kconfig.zephyr for C Standard options.")
-  set(CSTD ${GLOBAL_CSTD})
-  list(APPEND CMAKE_C_COMPILE_FEATURES ${compile_features_${CSTD}})
-endif()
+get_property(CSTD GLOBAL PROPERTY CSTD)
+set_ifndef(CSTD c99)
 
 # @Intent: Obtain compiler specific flag for specifying the c standard
 zephyr_compile_options(
   $<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,cstd>${CSTD}>
 )
-set(CMAKE_C_COMPILE_FEATURES ${CMAKE_C_COMPILE_FEATURES} PARENT_SCOPE)
+set(CMAKE_C_COMPILE_FEATURES ${compile_features_${CSTD}} PARENT_SCOPE)
 
 # @Intent: Configure linker scripts, i.e. generate linker scripts with variables substituted
 toolchain_ld_configure_files()
 
-get_property(TOPT GLOBAL PROPERTY TOPT)
-get_property(COMPILER_TOPT TARGET compiler PROPERTY linker_script)
-set_ifndef(  TOPT "${COMPILER_TOPT}")
-set_ifndef(  TOPT -Wl,-T) # Use this if the compiler driver doesn't set a value
-
-if(CONFIG_HAVE_CUSTOM_LINKER_SCRIPT)
-  set(LINKER_SCRIPT ${APPLICATION_SOURCE_DIR}/${CONFIG_CUSTOM_LINKER_SCRIPT})
-  if(NOT EXISTS ${LINKER_SCRIPT})
-    set(LINKER_SCRIPT ${CONFIG_CUSTOM_LINKER_SCRIPT})
-    assert_exists(CONFIG_CUSTOM_LINKER_SCRIPT)
-  endif()
-elseif(DEFINED BOARD_LINKER_SCRIPT)
-  set(LINKER_SCRIPT ${BOARD_LINKER_SCRIPT})
-elseif(DEFINED SOC_LINKER_SCRIPT)
-  set(LINKER_SCRIPT ${SOC_LINKER_SCRIPT})
-else()
-  find_package(Deprecated COMPONENTS SEARCHED_LINKER_SCRIPT)
-endif()
-
-if(NOT EXISTS ${LINKER_SCRIPT})
-  message(FATAL_ERROR "Could not find linker script: '${LINKER_SCRIPT}'. Corrupted configuration?")
-endif()
-
 if(CONFIG_USERSPACE)
   set(APP_SMEM_ALIGNED_LD "${PROJECT_BINARY_DIR}/include/generated/app_smem_aligned.ld")
   set(APP_SMEM_UNALIGNED_LD "${PROJECT_BINARY_DIR}/include/generated/app_smem_unaligned.ld")
@@ -1186,7 +1123,7 @@ if(CONFIG_USERSPACE)
     ${PROCESS_GPERF}
     -i ${KOBJECT_PREBUILT_HASH_OUTPUT_SRC_PRE}
     -o ${KOBJECT_PREBUILT_HASH_OUTPUT_SRC}
-    -p "struct k_object"
+    -p "struct z_object"
     $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
     DEPENDS kobj_prebuilt_hash_output_src_pre ${KOBJECT_PREBUILT_HASH_OUTPUT_SRC_PRE}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -1217,7 +1154,7 @@ if(CONFIG_USERSPACE)
     PUBLIC $<TARGET_PROPERTY:zephyr_interface,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
   )
 
-  set(KOBJECT_LINKER_HEADER_DATA "${PROJECT_BINARY_DIR}/include/generated/zephyr/linker-kobject-prebuilt-data.h")
+  set(KOBJECT_LINKER_HEADER_DATA "${PROJECT_BINARY_DIR}/include/generated/linker-kobject-prebuilt-data.h")
 
   add_custom_command(
     OUTPUT ${KOBJECT_LINKER_HEADER_DATA}
@@ -1225,7 +1162,7 @@ if(CONFIG_USERSPACE)
     ${PYTHON_EXECUTABLE}
     ${ZEPHYR_BASE}/scripts/build/gen_kobject_placeholders.py
     --object $<TARGET_OBJECTS:kobj_prebuilt_hash_output_lib>
-    --outdir ${PROJECT_BINARY_DIR}/include/generated/zephyr
+    --outdir ${PROJECT_BINARY_DIR}/include/generated
     --datapct ${CONFIG_KOBJECT_DATA_AREA_RESERVE_EXTRA_PERCENT}
     --rodata ${CONFIG_KOBJECT_RODATA_AREA_EXTRA_BYTES}
     $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
@@ -1300,14 +1237,20 @@ if(CONFIG_GEN_ISR_TABLES)
   # isr_tables.c is generated from ${ZEPHYR_LINK_STAGE_EXECUTABLE} by
   # gen_isr_tables.py
   add_custom_command(
-    OUTPUT isr_tables.c isr_tables_vt.ld isr_tables_swi.ld
+    OUTPUT isr_tables.c isrList.bin
+    COMMAND $<TARGET_PROPERTY:bintools,elfconvert_command>
+            $<TARGET_PROPERTY:bintools,elfconvert_flag>
+            $<TARGET_PROPERTY:bintools,elfconvert_flag_intarget>${OUTPUT_FORMAT}
+            $<TARGET_PROPERTY:bintools,elfconvert_flag_outtarget>binary
+            $<TARGET_PROPERTY:bintools,elfconvert_flag_section_only>.intList
+            $<TARGET_PROPERTY:bintools,elfconvert_flag_infile>$<TARGET_FILE:${ZEPHYR_LINK_STAGE_EXECUTABLE}>
+            $<TARGET_PROPERTY:bintools,elfconvert_flag_outfile>isrList.bin
+            $<TARGET_PROPERTY:bintools,elfconvert_flag_final>
     COMMAND ${PYTHON_EXECUTABLE}
     ${ZEPHYR_BASE}/scripts/build/gen_isr_tables.py
     --output-source isr_tables.c
-    --linker-output-files isr_tables_vt.ld isr_tables_swi.ld
     --kernel $<TARGET_FILE:${ZEPHYR_LINK_STAGE_EXECUTABLE}>
-    --intlist-section .intList
-    --intlist-section intList
+    --intlist isrList.bin
     $<$<BOOL:${CONFIG_BIG_ENDIAN}>:--big-endian>
     $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--debug>
     ${GEN_ISR_TABLE_EXTRA_ARG}
@@ -1317,20 +1260,6 @@ if(CONFIG_GEN_ISR_TABLES)
   set_property(GLOBAL APPEND PROPERTY GENERATED_KERNEL_SOURCE_FILES isr_tables.c)
 endif()
 
-if(CONFIG_SYMTAB)
-  add_custom_command(
-    OUTPUT symtab.c
-    COMMAND
-    ${PYTHON_EXECUTABLE}
-    ${ZEPHYR_BASE}/scripts/build/gen_symtab.py
-    -k $<TARGET_FILE:${ZEPHYR_LINK_STAGE_EXECUTABLE}>
-    -o symtab.c
-    DEPENDS ${ZEPHYR_LINK_STAGE_EXECUTABLE}
-    COMMAND_EXPAND_LISTS
-  )
-  set_property(GLOBAL APPEND PROPERTY GENERATED_KERNEL_SOURCE_FILES symtab.c)
-endif()
-
 if(CONFIG_USERSPACE)
   set(KOBJECT_HASH_LIST               kobject_hash.gperf)
   set(KOBJECT_HASH_OUTPUT_SRC_PRE     kobject_hash_preprocessed.c)
@@ -1393,7 +1322,7 @@ if(CONFIG_USERSPACE)
     ${PROCESS_GPERF}
     -i ${KOBJECT_HASH_OUTPUT_SRC_PRE}
     -o ${KOBJECT_HASH_OUTPUT_SRC}
-    -p "struct k_object"
+    -p "struct z_object"
     $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
     DEPENDS kobj_hash_output_src_pre ${CMAKE_CURRENT_BINARY_DIR}/${KOBJECT_HASH_OUTPUT_SRC_PRE}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -1613,14 +1542,11 @@ endif()
 
 if(CONFIG_BUILD_OUTPUT_ADJUST_LMA)
   math(EXPR adjustment "${CONFIG_BUILD_OUTPUT_ADJUST_LMA}" OUTPUT_FORMAT DECIMAL)
-  set(args_adjustment ${CONFIG_BUILD_OUTPUT_ADJUST_LMA_SECTIONS})
-  list(TRANSFORM args_adjustment PREPEND $<TARGET_PROPERTY:bintools,elfconvert_flag_lma_adjust>)
-  list(TRANSFORM args_adjustment APPEND +${adjustment})
   list(APPEND
     post_build_commands
     COMMAND $<TARGET_PROPERTY:bintools,elfconvert_command>
             $<TARGET_PROPERTY:bintools,elfconvert_flag_final>
-            ${args_adjustment}
+            $<TARGET_PROPERTY:bintools,elfconvert_flag_lma_adjust>${adjustment}
             $<TARGET_PROPERTY:bintools,elfconvert_flag_infile>${KERNEL_ELF_NAME}
             $<TARGET_PROPERTY:bintools,elfconvert_flag_outfile>${KERNEL_ELF_NAME}
     )
@@ -1713,24 +1639,20 @@ if(CONFIG_BUILD_OUTPUT_BIN AND CONFIG_BUILD_OUTPUT_UF2)
   set(BYPRODUCT_KERNEL_UF2_NAME "${PROJECT_BINARY_DIR}/${KERNEL_UF2_NAME}" CACHE FILEPATH "Kernel uf2 file" FORCE)
 endif()
 
-set(KERNEL_META_PATH  ${PROJECT_BINARY_DIR}/${KERNEL_META_NAME} CACHE INTERNAL "")
 if(CONFIG_BUILD_OUTPUT_META)
   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_PATH}
-            --zephyr-base=${ZEPHYR_BASE}
+            --meta-out ${KERNEL_META_NAME}
             $<$<BOOL:${CONFIG_BUILD_OUTPUT_META_STATE_PROPAGATE}>:--meta-state-propagate>
   )
   list(APPEND
     post_build_byproducts
-    ${KERNEL_META_PATH}
+    ${KERNEL_META_NAME}
   )
-else(CONFIG_BUILD_OUTPUT_META)
-  # Prevent spdx to use invalid data
-  file(REMOVE ${KERNEL_META_PATH})
 endif()
 
 # Cleanup intermediate files
@@ -1771,7 +1693,7 @@ endif()
 if(CONFIG_OUTPUT_DISASSEMBLY)
 if(CONFIG_OUTPUT_DISASSEMBLE_ALL)
     set(disassembly_type "$<TARGET_PROPERTY:bintools,disassembly_flag_all>")
-  elseif (CONFIG_OUTPUT_DISASSEMBLY_WITH_SOURCE)
+  else()
     set(disassembly_type "$<TARGET_PROPERTY:bintools,disassembly_flag_inline_source>")
   endif()
   list(APPEND
@@ -1836,17 +1758,6 @@ if(CONFIG_BUILD_OUTPUT_STRIPPED)
     )
 endif()
 
-if(CONFIG_BUILD_OUTPUT_COMPRESS_DEBUG_SECTIONS)
-  list(APPEND
-    post_build_commands
-    COMMAND $<TARGET_PROPERTY:bintools,elfconvert_command>
-            $<TARGET_PROPERTY:bintools,elfconvert_flag>
-            $<TARGET_PROPERTY:bintools,elfconvert_flag_compress_debug_sections>
-            $<TARGET_PROPERTY:bintools,elfconvert_flag_infile>${KERNEL_ELF_NAME}
-            $<TARGET_PROPERTY:bintools,elfconvert_flag_final>
-)
-endif()
-
 if(CONFIG_BUILD_OUTPUT_EXE)
   if (NOT CONFIG_NATIVE_LIBRARY)
     list(APPEND
@@ -1858,6 +1769,7 @@ if(CONFIG_BUILD_OUTPUT_EXE)
       post_build_byproducts
       ${KERNEL_EXE_NAME}
       )
+    set(BYPRODUCT_KERNEL_EXE_NAME "${PROJECT_BINARY_DIR}/${KERNEL_EXE_NAME}" CACHE FILEPATH "Kernel exe file" FORCE)
   else()
     if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
       set(MAKE "${CMAKE_MAKE_PROGRAM}" CACHE FILEPATH "cmake defined make")
@@ -1868,13 +1780,12 @@ if(CONFIG_BUILD_OUTPUT_EXE)
       COMMENT "Building native simulator runner, and linking final executable"
       COMMAND
       ${MAKE} -f ${ZEPHYR_BASE}/scripts/native_simulator/Makefile all --warn-undefined-variables
-        -r NSI_CONFIG_FILE=${APPLICATION_BINARY_DIR}/zephyr/NSI/nsi_config
+        -r NSI_CONFIG_FILE=${CMAKE_BINARY_DIR}/zephyr/NSI/nsi_config
       # nsi_config is created by the board cmake file
       DEPENDS ${logical_target_for_zephyr_elf}
       BYPRODUCTS ${KERNEL_EXE_NAME}
     )
   endif()
-  set(BYPRODUCT_KERNEL_EXE_NAME "${PROJECT_BINARY_DIR}/${KERNEL_EXE_NAME}" CACHE FILEPATH "Kernel exe file" FORCE)
 endif()
 
 if(CONFIG_BUILD_OUTPUT_INFO_HEADER)
@@ -1891,66 +1802,39 @@ if(CONFIG_BUILD_OUTPUT_INFO_HEADER)
     )
 endif()
 
-if (CONFIG_LLEXT AND CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID)
-  #slidgen must be the first post-build command to be executed
-  #on the Zephyr ELF to ensure that all other commands, such as
-  #binary file generation, are operating on a preparated ELF.
-  list(PREPEND
+if(CONFIG_CHECK_INIT_PRIORITIES)
+  if(CONFIG_CHECK_INIT_PRIORITIES_FAIL_ON_WARNING)
+    set(fail_on_warning "--fail-on-warning")
+  endif()
+  list(APPEND
     post_build_commands
-    COMMAND ${PYTHON_EXECUTABLE}
-    ${ZEPHYR_BASE}/scripts/build/llext_prepare_exptab.py
-    --elf-file ${PROJECT_BINARY_DIR}/${KERNEL_ELF_NAME}
-    --slid-listing ${PROJECT_BINARY_DIR}/slid_listing.txt
-  )
-
+    COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/check_init_priorities.py
+      --elf-file=${ZEPHYR_BINARY_DIR}/${KERNEL_ELF_NAME}
+      ${fail_on_warning}
+    )
 endif()
 
 if(NOT CMAKE_C_COMPILER_ID STREQUAL "ARMClang")
-  set(check_init_priorities_input
-      $<IF:$<TARGET_EXISTS:native_runner_executable>,${BYPRODUCT_KERNEL_EXE_NAME},${BYPRODUCT_KERNEL_ELF_NAME}>
-  )
-  set(check_init_priorities_command
-      ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/check_init_priorities.py
-      --elf-file=${check_init_priorities_input}
-  )
-  set(check_init_priorities_dependencies
-      ${logical_target_for_zephyr_elf}
-      $<$<TARGET_EXISTS:native_runner_executable>:native_runner_executable>
-  )
-
-  if(CONFIG_CHECK_INIT_PRIORITIES)
-    if(TARGET native_runner_executable)
-      add_custom_command(TARGET native_runner_executable POST_BUILD
-                         COMMAND ${check_init_priorities_command}
-      )
-    else()
-      list(APPEND post_build_commands COMMAND ${check_init_priorities_command})
-    endif()
-  endif()
-
   add_custom_target(
     initlevels
-    COMMAND ${check_init_priorities_command} --initlevels
-    DEPENDS ${check_init_priorities_dependencies}
+    COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/build/check_init_priorities.py
+      --elf-file=${ZEPHYR_BINARY_DIR}/${KERNEL_ELF_NAME}
+      --initlevels
+    DEPENDS ${logical_target_for_zephyr_elf}
     USES_TERMINAL
   )
 endif()
 
-# Generate signed (MCUboot or other) related artifacts as needed. Priority is:
-# * Sysbuild (if set)
-# * SIGNING_SCRIPT target property (if set)
-# * MCUboot signing script (if MCUboot is enabled)
-zephyr_get(signing_script VAR SIGNING_SCRIPT SYSBUILD)
-
-if(NOT signing_script)
+# Generate and use MCUboot related artifacts as needed.
+if(CONFIG_BOOTLOADER_MCUBOOT)
   get_target_property(signing_script zephyr_property_target SIGNING_SCRIPT)
-
-  if(NOT signing_script AND CONFIG_BOOTLOADER_MCUBOOT)
-    set(signing_script ${CMAKE_CURRENT_LIST_DIR}/cmake/mcuboot.cmake)
+  if(NOT signing_script)
+    set_target_properties(zephyr_property_target PROPERTIES SIGNING_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/cmake/mcuboot.cmake)
   endif()
 endif()
 
 # Include signing script, if set
+get_target_property(signing_script zephyr_property_target SIGNING_SCRIPT)
 if(signing_script)
   message(STATUS "Including signing script: ${signing_script}")
 
@@ -1983,47 +1867,27 @@ list(APPEND
   )
 
 if(CONFIG_LOG_DICTIONARY_DB)
-  set(LOG_DICT_DB_NAME ${PROJECT_BINARY_DIR}/log_dictionary.json)
-  set(LOG_DICT_DB_NAME_ARG --json)
+  set(log_dict_db_output --json=${PROJECT_BINARY_DIR}/log_dictionary.json)
 elseif(CONFIG_LOG_MIPI_SYST_USE_CATALOG)
-  set(LOG_DICT_DB_NAME ${PROJECT_BINARY_DIR}/mipi_syst_collateral.xml)
-  set(LOG_DICT_DB_NAME_ARG --syst)
+  set(log_dict_db_output --syst=${PROJECT_BINARY_DIR}/mipi_syst_collateral.xml)
 endif()
 
-if(LOG_DICT_DB_NAME_ARG)
-  set(log_dict_gen_command
-      ${PYTHON_EXECUTABLE}
-      ${ZEPHYR_BASE}/scripts/logging/dictionary/database_gen.py
-      ${KERNEL_ELF_NAME}
-      ${LOG_DICT_DB_NAME_ARG}=${LOG_DICT_DB_NAME}
-      --build-header ${PROJECT_BINARY_DIR}/include/generated/zephyr/version.h
-  )
+if(log_dict_db_output)
+  list(APPEND
+    post_build_commands
+    COMMAND
+    ${PYTHON_EXECUTABLE}
+    ${ZEPHYR_BASE}/scripts/logging/dictionary/database_gen.py
+    ${KERNEL_ELF_NAME}
+    ${log_dict_db_output}
+    --build-header ${PROJECT_BINARY_DIR}/include/generated/version.h
+    )
+  list(APPEND
+    post_build_byproducts
+    ${LOG_DICT_DB_NAME}
+    )
 
-  if (NOT CONFIG_LOG_DICTIONARY_DB_TARGET)
-    # If not using a separate target for generating logging dictionary
-    # database, add the generation to post build command to make sure
-    # the database is actually being generated.
-    list(APPEND
-      post_build_commands
-      COMMAND ${CMAKE_COMMAND} -E echo "Generating logging dictionary database: ${LOG_DICT_DB_NAME}"
-      COMMAND ${log_dict_gen_command}
-    )
-    list(APPEND
-      post_build_byproducts
-      ${LOG_DICT_DB_NAME}
-    )
-  else()
-    # Seprate build target for generating logging dictionary database.
-    # This needs to be explicitly called/used to generate the database.
-    add_custom_command(
-      OUTPUT ${LOG_DICT_DB_NAME}
-      COMMAND ${log_dict_gen_command}
-      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-      COMMENT "Generating logging dictionary database: ${LOG_DICT_DB_NAME}"
-      DEPENDS ${logical_target_for_zephyr_elf}
-    )
-    add_custom_target(log_dict_db_gen DEPENDS ${LOG_DICT_DB_NAME})
-  endif()
+  unset(log_dict_db_output)
 endif()
 
 # Add post_build_commands to post-process the final .elf file produced by
@@ -2032,11 +1896,12 @@ 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:
@@ -2132,53 +1997,6 @@ if((CMAKE_BUILD_TYPE IN_LIST build_types) AND (NOT NO_BUILD_TYPE_WARNING))
   endif()
 endif()
 
-# Extension Development Kit (EDK) generation.
-set(llext_edk_file ${PROJECT_BINARY_DIR}/${CONFIG_LLEXT_EDK_NAME}.tar.xz)
-
-# TODO maybe generate flags for C CXX ASM
-zephyr_get_compile_definitions_for_lang(C zephyr_defs)
-zephyr_get_compile_options_for_lang(C zephyr_flags)
-
-# Filter out non LLEXT and LLEXT_EDK flags - and add required ones
-llext_filter_zephyr_flags(LLEXT_REMOVE_FLAGS ${zephyr_flags} llext_filt_flags)
-llext_filter_zephyr_flags(LLEXT_EDK_REMOVE_FLAGS ${llext_filt_flags} llext_filt_flags)
-
-set(llext_edk_cflags ${zephyr_defs} -DLL_EXTENSION_BUILD)
-list(APPEND llext_edk_cflags ${llext_filt_flags})
-list(APPEND llext_edk_cflags ${LLEXT_APPEND_FLAGS})
-list(APPEND llext_edk_cflags ${LLEXT_EDK_APPEND_FLAGS})
-
-add_custom_command(
-    OUTPUT ${llext_edk_file}
-    # Regenerate syscalls in case CONFIG_LLEXT_EDK_USERSPACE_ONLY
-    COMMAND ${CMAKE_COMMAND}
-        -E make_directory edk/include/generated/zephyr
-    COMMAND
-        ${PYTHON_EXECUTABLE}
-        ${ZEPHYR_BASE}/scripts/build/gen_syscalls.py
-        --json-file        ${syscalls_json}                     # Read this file
-        --base-output      edk/include/generated/zephyr/syscalls           # Write to this dir
-        --syscall-dispatch edk/include/generated/zephyr/syscall_dispatch.c # Write this file
-        --syscall-list     ${edk_syscall_list_h}
-        $<$<BOOL:${CONFIG_LLEXT_EDK_USERSPACE_ONLY}>:--userspace-only>
-        ${SYSCALL_LONG_REGISTERS_ARG}
-        ${SYSCALL_SPLIT_TIMEOUT_ARG}
-    COMMAND ${CMAKE_COMMAND}
-        -DPROJECT_BINARY_DIR=${PROJECT_BINARY_DIR}
-        -DAPPLICATION_SOURCE_DIR=${APPLICATION_SOURCE_DIR}
-        -DINTERFACE_INCLUDE_DIRECTORIES="$<TARGET_PROPERTY:zephyr_interface,INTERFACE_INCLUDE_DIRECTORIES>"
-        -Dllext_edk_file=${llext_edk_file}
-        -Dllext_edk_cflags="${llext_edk_cflags}"
-        -Dllext_edk_name=${CONFIG_LLEXT_EDK_NAME}
-        -DWEST_TOPDIR=${WEST_TOPDIR}
-        -DZEPHYR_BASE=${ZEPHYR_BASE}
-        -DCONFIG_LLEXT_EDK_USERSPACE_ONLY=${CONFIG_LLEXT_EDK_USERSPACE_ONLY}
-        -P ${ZEPHYR_BASE}/cmake/llext-edk.cmake
-    DEPENDS ${logical_target_for_zephyr_elf}
-    COMMAND_EXPAND_LISTS
-)
-add_custom_target(llext-edk DEPENDS ${llext_edk_file})
-
 # @Intent: Set compiler specific flags for standard C/C++ includes
 # Done at the very end, so any other system includes which may
 # be added by Zephyr components were first in list.

CODEOWNERS

@@ -11,21 +11,49 @@
 # add others as needed.
 
 # Do not use wildcard on all source yet
-#
-# +++++++++++ NOTE ++++++++++++++++
-#
-# Please use the MAINTAINERS file to add yourself in an area or to add a new
-# component or code. This file is going to be deprecated and currently only had
-# entries that are not covered by the MAINTAINERS file.
+# *                                        @galak @nashif
 
+/.github/				  @nashif @stephanosio
+/.github/workflows/                       @galak @nashif
+/MAINTAINERS.yml                          @MaureenHelm
+/arch/arc/                                @abrodkin @ruuddw @evgeniy-paltsev
+/arch/arm/                                @MaureenHelm @galak @ioannisg
+/arch/arm/core/cortex_m/cmse/             @ioannisg
+/arch/arm/include/cortex_m/cmse.h         @ioannisg
+/arch/arm/core/cortex_a_r/                @MaureenHelm @galak @ioannisg @bbolen @stephanosio
+/arch/arm64/                              @carlocaione
+/arch/arm64/core/cortex_r/                @povergoing
+/arch/arm64/core/xen/                     @lorc @firscity
+/arch/common/                             @ioannisg @andyross
+/arch/mips/                               @frantony
+/soc/arc/snps_*/                          @abrodkin @ruuddw @evgeniy-paltsev
+/soc/nios2/                               @nashif
+/soc/arm/                                 @MaureenHelm @galak @ioannisg
+/soc/arm/arm/mps2/                        @fvincenzo
 /soc/arm/aspeed/                          @aspeeddylan
-/soc/atmel/                               @nandojve
+/soc/arm/atmel_sam/common/*_sam4l_*.c     @nandojve
+/soc/arm/atmel_sam/sam3x/                 @ioannisg
+/soc/arm/atmel_sam/sam4e/                 @nandojve
+/soc/arm/atmel_sam/sam4l/                 @nandojve
+/soc/arm/atmel_sam/sam4s/                 @fallrisk
+/soc/arm/atmel_sam/same70/                @nandojve
+/soc/arm/atmel_sam/samv71/                @nandojve
+/soc/arm/cypress/                         @ifyall @npal-cy
 /soc/arm/bcm*/                            @sbranden
-/soc/arm/ene/                             @ene-steven
+/soc/arm/gigadevice/                      @nandojve
 /soc/arm/infineon_cat1/                   @ifyall @npal-cy
 /soc/arm/infineon_xmc/                    @parthitce
+/soc/arm/nxp*/                            @mmahadevan108 @dleach02
+/soc/arm/nxp_s32/                         @manuargue
+/soc/arm/nordic_nrf/                      @anangl
+/soc/arm/nuvoton_npcx/                    @MulinChao @ChiHuaL
+/soc/arm/nuvoton_numicro/                 @ssekar15
+/soc/arm/quicklogic_eos_s3/               @fkokosinski @kgugala
+/soc/arm/rpi_pico/                        @yonsch
 /soc/arm/silabs_exx32/efm32pg1b/          @rdmeneze
 /soc/arm/silabs_exx32/efr32mg21/          @l-alfred
+/soc/arm/st_stm32/                        @erwango
+/soc/arm/st_stm32/*/power.c               @FRASTM
 /soc/arm/st_stm32/stm32mp1/               @arnopo
 /soc/arm/st_stm32/stm32h7/*stm32h735*     @benediktibk
 /soc/arm/st_stm32/stm32l4/*stm32l451*     @benediktibk
@@ -35,14 +63,37 @@
 /soc/arm/xilinx_zynq7000/                 @ibirnbaum
 /soc/arm/xilinx_zynqmp/                   @stephanosio
 /soc/arm/renesas_rcar/                    @aaillet
+/soc/arm64/                               @carlocaione
+/soc/arm64/qemu_cortex_a53/               @carlocaione
+/soc/arm64/bcm_vk/                        @abhishek-brcm
+/soc/arm64/nxp_layerscape/                @JiafeiPan
+/soc/arm64/xenvm/                         @lorc @firscity
+/soc/arm64/nxp_imx/                       @MrVan @JiafeiPan
+/soc/arm64/arm/                           @povergoing
+/soc/arm64/arm/fvp_aemv8a/                @carlocaione
+/soc/arm64/intel_socfpga/*                @siclim
+/soc/arm64/renesas_rcar/                  @lorc @xakep-amatop
+/soc/Kconfig                              @tejlmand @galak @nashif @nordicjm
+/submanifests/*                           @mbolivar-ampere
+/arch/x86/                                @jhedberg @nashif
+/arch/nios2/                              @nashif
+/arch/posix/                              @aescolar @daor-oti
+/arch/riscv/                              @kgugala @pgielda
+/soc/mips/                                @frantony
+/soc/posix/                               @aescolar @daor-oti
+/soc/riscv/                               @kgugala @pgielda
 /soc/riscv/openisa*/                      @dleach02
 /soc/riscv/riscv-privileged/andes_v5/      @cwshu @kevinwang821020 @jimmyzhe
 /soc/riscv/riscv-privileged/neorv32/       @henrikbrixandersen
 /soc/riscv/riscv-privileged/gd32vf103/     @soburi
-/soc/starfive/jh71xx/ 			  @pfarwsi
 /soc/riscv/riscv-privileged/niosv/         @sweeaun
-/boards/adafruit/feather_nrf52840/        @jacobw
-/boards/ene/                              @ene-steven
+/soc/x86/                                 @dcpleung @nashif
+/arch/xtensa/                             @dcpleung @andyross @nashif
+/soc/xtensa/                              @dcpleung @andyross @nashif
+/arch/sparc/                              @julius-barendt
+/soc/sparc/                               @julius-barendt
+/boards/arc/                              @abrodkin @ruuddw @evgeniy-paltsev
+/boards/arm/                              @MaureenHelm @galak
 /boards/arm/96b_argonkey/                 @avisconti
 /boards/arm/96b_avenger96/                @Mani-Sadhasivam
 /boards/arm/96b_carbon/                   @idlethread
@@ -51,9 +102,12 @@
 /boards/arm/96b_neonkey/                  @Mani-Sadhasivam
 /boards/arm/96b_stm32_sensor_mez/         @Mani-Sadhasivam
 /boards/arm/96b_wistrio/                  @Mani-Sadhasivam
+/boards/arm/arduino_due/                  @ioannisg
 /boards/arm/acn52832/                     @sven-hm
 /boards/arm/arduino_mkrzero/              @soburi
 /boards/arm/bbc_microbit_v2/              @LingaoM
+/boards/arm/bl5340_dvk/                   @lairdjm
+/boards/arm/bl65*/                        @lairdjm
 /boards/arm/blackpill_f401ce/             @coderkalyan
 /boards/arm/blackpill_f411ce/             @coderkalyan
 /boards/arm/bt*10/                        @greg-leach
@@ -64,6 +118,7 @@
 /boards/arm/cy8ckit_062s4/                @DaWei8823
 /boards/arm/cy8ckit_062_wifi_bt/          @ifyall @npal-cy
 /boards/arm/cy8cproto_062_4343w/          @ifyall @npal-cy
+/boards/arm/disco_l475_iot1/              @erwango
 /boards/arm/efm32pg_stk3401a/             @rdmeneze
 /boards/arm/faze/                         @mbittan @simonguinot
 /boards/arm/frdm*/                        @mmahadevan108 @dleach02
@@ -73,6 +128,7 @@
 /boards/arm/ip_k66f/                      @parthitce @lmajewski
 /boards/arm/legend/                       @mbittan @simonguinot
 /boards/arm/lpcxpresso*/                  @mmahadevan108 @dleach02
+/boards/arm/mg100/                        @rerickson1
 /boards/arm/mimx8mm_evk/                  @Mani-Sadhasivam
 /boards/arm/mimx8mm_phyboard_polis        @pefech
 /boards/arm/mimxrt*/                      @mmahadevan108 @dleach02
@@ -80,8 +136,10 @@
 /boards/arm/msp_exp432p401r_launchxl/     @Mani-Sadhasivam
 /boards/arm/npcx7m6fb_evb/                @MulinChao @ChiHuaL
 /boards/arm/nrf*/                         @carlescufi @lemrey
+/boards/arm/nucleo*/                      @erwango @ABOSTM @FRASTM
 /boards/arm/nucleo_f401re/                @idlethread
 /boards/arm/nuvoton_pfm_m487/             @ssekar15
+/boards/arm/pinnacle_100_dvk/             @rerickson1
 /boards/arm/qemu_cortex_a9/               @ibirnbaum
 /boards/arm/qemu_cortex_r*/               @stephanosio
 /boards/arm/qemu_cortex_m*/               @ioannisg @stephanosio
@@ -91,7 +149,11 @@
 /boards/arm/rpi_pico/                     @yonsch
 /boards/arm/ronoth_lodev/                 @NorthernDean
 /boards/arm/xmc45_relax_kit/              @parthitce
-/boards/atmel/                            @nandojve
+/boards/arm/sam4e_xpro/                   @nandojve
+/boards/arm/sam4l_ek/                     @nandojve
+/boards/arm/sam4s_xplained/               @fallrisk
+/boards/arm/sam_e70_xplained/             @nandojve
+/boards/arm/sam_v71_xult/                 @nandojve
 /boards/arm/scobc_module1/                @yashi
 /boards/arm/v2m_beetle/                   @fvincenzo
 /boards/arm/olimexino_stm32/              @ydamigos
@@ -99,13 +161,22 @@
 /boards/arm/sensortile_box/               @avisconti
 /boards/arm/steval_fcu001v1/              @Navin-Sankar
 /boards/arm/stm32l1_disco/                @karlp
+/boards/arm/stm32*_disco/                 @erwango @ABOSTM @FRASTM
 /boards/arm/stm32h735g_disco/             @benediktibk
 /boards/arm/stm32f3_disco/                @ydamigos
+/boards/arm/stm32*_eval/                  @erwango @ABOSTM @FRASTM
 /boards/arm/rcar_*/                       @aaillet
 /boards/arm/ubx_bmd345eval_nrf52840/      @Navin-Sankar @brec-u-blox
 /boards/arm/nrf5340_audio_dk_nrf5340      @koffes @alexsven @erikrobstad @rick1082 @gWacey
+/boards/common/                           @mbolivar-ampere
+/boards/deprecated.cmake                  @tejlmand
+/boards/mips/                             @frantony
+/boards/nios2/                            @nashif
+/boards/nios2/altera_max10/               @nashif
 /boards/arm/stm32_min_dev/                @sidcha
-/boards/ezurio/*                          @rerickson1
+/boards/posix/                            @aescolar @daor-oti
+/boards/posix/nrf52_bsim/                 @aescolar @wopu-ot
+/boards/riscv/                            @kgugala @pgielda
 /boards/riscv/rv32m1_vega/                @dleach02
 /boards/riscv/adp_xc7k_ae350/             @cwshu @kevinwang821020 @jimmyzhe
 /boards/riscv/longan_nano/                @soburi
@@ -113,13 +184,16 @@
 /boards/riscv/niosv*/                     @sweeaun
 /boards/riscv/sparkfun_red_v_things_plus/ @soburi
 /boards/riscv/stamp_c3/                   @soburi
-/boards/starfive/visionfive2/	 	  @kanakshilledar @pfarwsi
+/boards/shields/                          @erwango
 /boards/shields/atmel_rf2xx/              @nandojve
 /boards/shields/esp_8266/                 @nandojve
 /boards/shields/inventek_eswifi/          @nandojve
+/boards/x86/                              @dcpleung @nashif
+/boards/x86/acrn/                         @enjiamai
+/boards/xtensa/                           @nashif @dcpleung
 /boards/xtensa/odroid_go/                 @ydamigos
 /boards/xtensa/nxp_adsp_imx8/             @iuliana-prodan @dbaluta
-/boards/xtensa/kincony_kc868_a32/         @bbilas
+/boards/sparc/                            @julius-barendt
 /boards/arm64/qemu_cortex_a53/            @carlocaione
 /boards/arm64/bcm958402m2_a72/            @abhishek-brcm
 /boards/arm64/mimx8mm_evk/                @MrVan @JiafeiPan
@@ -131,19 +205,33 @@
 /boards/arm64/fvp_baser_aemv8r/           @povergoing
 /boards/arm64/fvp_base_revc_2xaemv8a/     @carlocaione
 /boards/arm64/intel_socfpga_agilex_socdk/ @siclim @ngboonkhai
-/boards/arm64/intel_socfpga_agilex5_socdk/ @teikheng @gdengi
+/boards/arm64/intel_socfpga_agilex5_socdk/ @chongteikheng
 /boards/arm64/rcar_*/                     @lorc @xakep-amatop
+/boards/Kconfig                           @tejlmand @galak @nashif @nordicjm
 # All cmake related files
+/cmake/                                   @tejlmand @nashif
+/cmake/*/arcmwdt/                         @abrodkin @evgeniy-paltsev @tejlmand
+/CMakeLists.txt                           @tejlmand @nashif
+/doc/                                     @carlescufi
 /doc/develop/tools/coccinelle.rst                @himanshujha199640 @JuliaLawall
 /doc/services/device_mgmt/smp_protocol.rst  @de-nordic @nordicjm
 /doc/services/device_mgmt/smp_groups/       @de-nordic @nordicjm
 /doc/services/sensing/                      @lixuzha @ghu0510 @qianruh
 /doc/CMakeLists.txt                       @carlescufi
 /doc/_scripts/                            @carlescufi
+/doc/connectivity/bluetooth/                    @alwa-nordic @jhedberg @Vudentz
+/doc/connectivity/networking/conn_mgr     @carlescufi @glarsennordic
+/doc/build/dts/                          @galak @mbolivar-ampere
+/doc/build/sysbuild/                      @tejlmand @nordicjm
+/doc/hardware/peripherals/canbus/                    @alexanderwachter @henrikbrixandersen
+/doc/security/                            @ceolin @d3zd3z
+/drivers/debug/                           @nashif
 /drivers/*/*sam4l*                        @nandojve
 /drivers/*/*cc13xx_cc26xx*                @bwitherspoon
 /drivers/*/*gd32*                         @nandojve
+/drivers/*/*litex*                        @mateusz-holenko @kgugala @pgielda
 /drivers/*/*mcux*                         @mmahadevan108 @dleach02
+/drivers/*/*stm32*                        @erwango @ABOSTM @FRASTM
 /drivers/*/*native_posix*                 @aescolar @daor-oti
 /drivers/*/*lpc11u6x*                     @mbittan @simonguinot
 /drivers/*/*npcx*                         @MulinChao @ChiHuaL
@@ -151,25 +239,28 @@
 /drivers/*/*ifx_cat1*                     @ifyall @npal-cy
 /drivers/*/*neorv32*                      @henrikbrixandersen
 /drivers/*/*_s32*                         @manuargue
+/drivers/adc/                             @anangl
 /drivers/adc/adc_ads1x1x.c                @XenuIsWatching
 /drivers/adc/adc_stm32.c                  @cybertale
 /drivers/adc/adc_rpi_pico.c               @soburi
 /drivers/adc/*ads114s0x*                  @benediktibk
 /drivers/adc/*max11102_17*                @benediktibk
-/drivers/adc/*kb1200*                     @ene-steven
-/drivers/adc/adc_ad559x.c                 @bbilas
 /drivers/audio/*nrfx*                     @anangl
 /drivers/auxdisplay/*pt6314*              @xingrz
 /drivers/auxdisplay/*                      @thedjnK
 /drivers/bbram/*                          @yperess @sjg20 @jackrosenthal
 /drivers/bluetooth/                       @alwa-nordic @jhedberg @Vudentz
 /drivers/bluetooth/hci/hci_esp32.c        @sylvioalves
+/drivers/cache/                           @carlocaione
+/drivers/syscon/                          @carlocaione @yperess
+/drivers/can/                             @alexanderwachter @henrikbrixandersen
 /drivers/can/*mcp2515*                    @karstenkoenig
 /drivers/can/*rcar*                       @aaillet
 /drivers/clock_control/*agilex*           @siclim @gdengi
 /drivers/clock_control/*nrf*              @nordic-krch
 /drivers/clock_control/*esp32*            @extremegtx @sylvioalves
 /drivers/clock_control/*cpg_mssr*         @aaillet
+/drivers/counter/                         @nordic-krch
 /drivers/console/ipm_console.c            @finikorg
 /drivers/console/semihost_console.c       @luozhongyao
 /drivers/console/jailhouse_debug_console.c @MrVan
@@ -181,14 +272,13 @@
 /drivers/crypto/*nrf_ecb*                 @maciekfabia @anangl
 /drivers/display/*rm68200*                @mmahadevan108
 /drivers/display/display_ili9342c.*       @extremegtx
+/drivers/dac/                             @martinjaeger
 /drivers/dac/*ad56xx*                     @benediktibk
-/drivers/dac/dac_ad559x.c                 @bbilas
 /drivers/dai/                             @kv2019i @marcinszkudlinski @abonislawski
 /drivers/dai/intel/                       @kv2019i @marcinszkudlinski @abonislawski
 /drivers/dai/intel/ssp/                   @kv2019i @marcinszkudlinski @abonislawski
 /drivers/dai/intel/dmic/                  @marcinszkudlinski @abonislawski
 /drivers/dai/intel/alh/                   @abonislawski
-/drivers/dma/dma_dw_axi.c                 @pbalsundar
 /drivers/dma/*dw*                         @tbursztyka
 /drivers/dma/*dw_common*                  @abonislawski
 /drivers/dma/*sam0*                       @Sizurka
@@ -198,31 +288,38 @@
 /drivers/dma/*intel_adsp*                 @teburd @abonislawski
 /drivers/dma/*rpi_pico*                   @soburi
 /drivers/dma/*xmc4xxx*                    @talih0
+/drivers/edac/                            @finikorg
+/drivers/eeprom/                          @henrikbrixandersen
 /drivers/eeprom/eeprom_stm32.c            @KwonTae-young
 /drivers/entropy/*b91*                    @andy-liu-telink
 /drivers/entropy/*bt_hci*                 @JordanYates
 /drivers/entropy/*rv32m1*                 @dleach02
+/drivers/entropy/*litex*                  @mateusz-holenko @kgugala @pgielda
+/drivers/espi/                            @albertofloyd @franciscomunoz @sjvasanth1
+/drivers/ethernet/                        @tbursztyka @jukkar
 /drivers/ethernet/*dwmac*                 @npitre
 /drivers/ethernet/*stm32*                 @Nukersson @lochej
 /drivers/ethernet/*w5500*                 @parthitce
 /drivers/ethernet/*xlnx_gem*              @ibirnbaum
 /drivers/ethernet/*smsc91x*               @sgrrzhf
 /drivers/ethernet/*adin2111*              @GeorgeCGV
-/drivers/ethernet/*oa_tc6*                @lmajewski
-/drivers/ethernet/*lan865x*               @lmajewski
 /drivers/ethernet/phy/                    @rlubos @tbursztyka @arvinf @jukkar
 /drivers/ethernet/phy/*adin2111*          @GeorgeCGV
+/drivers/mdio/                            @rlubos @tbursztyka @arvinf
 /drivers/mdio/*adin2111*                  @GeorgeCGV
+/drivers/flash/                           @nashif @de-nordic
 /drivers/flash/*stm32_qspi*               @lmajewski
 /drivers/flash/*b91*                      @andy-liu-telink
 /drivers/flash/*cadence*                  @ngboonkhai
 /drivers/flash/*cc13xx_cc26xx*            @pepe2k
 /drivers/flash/*nrf*                      @de-nordic
 /drivers/flash/*esp32*                    @sylvioalves
-/drivers/flash/flash_cadence_nand*        @nbalabak
+/drivers/fpga/                            @tgorochowik @kgugala
+/drivers/gpio/                            @mnkp
 /drivers/gpio/*b91*                       @andy-liu-telink
 /drivers/gpio/*lmp90xxx*                  @henrikbrixandersen
 /drivers/gpio/*nct38xx*                   @MulinChao @ChiHuaL
+/drivers/gpio/*stm32*                     @erwango
 /drivers/gpio/*eos_s3*                    @fkokosinski @kgugala
 /drivers/gpio/*rcar*                      @aaillet
 /drivers/gpio/*esp32*                     @sylvioalves
@@ -231,9 +328,8 @@
 /drivers/gpio/*ads114s0x*                 @benediktibk
 /drivers/gpio/*bd8lb600fs*                @benediktibk
 /drivers/gpio/*pcal64xxa*                 @benediktibk
-/drivers/gpio/*kb1200*                    @ene-steven
 /drivers/gpio/gpio_altera_pio.c           @shilinte
-/drivers/gpio/gpio_ad559x.c               @bbilas
+/drivers/hwinfo/                          @alexanderwachter
 /drivers/i2c/i2c_common.c                 @sjg20
 /drivers/i2c/i2c_emul.c                   @sjg20
 /drivers/i2c/i2c_ite_enhance.c            @GTLin08
@@ -245,13 +341,14 @@
 /drivers/i2c/Kconfig.test                 @mbolivar-ampere
 /drivers/i2c/i2c_test.c                   @mbolivar-ampere
 /drivers/i2c/*rcar*                       @aaillet
-/drivers/i2c/*kb1200*                     @ene-steven
+/drivers/i2s/*litex*                      @mateusz-holenko @kgugala @pgielda
 /drivers/i2s/i2s_ll_stm32*                @avisconti
 /drivers/i2s/*nrfx*                       @anangl
+/drivers/i3c/                             @dcpleung
 /drivers/i3c/i3c_cdns.c                   @XenuIsWatching
 /drivers/ieee802154/                      @rlubos @tbursztyka @jukkar @fgrandel
 /drivers/ieee802154/*b91*                 @andy-liu-telink
-/drivers/ieee802154/ieee802154_nrf5*      @ankuns
+/drivers/ieee802154/ieee802154_nrf5*      @jciupis
 /drivers/ieee802154/ieee802154_rf2xx*     @tbursztyka @nandojve
 /drivers/ieee802154/ieee802154_cc13xx*    @bwitherspoon @cfriedt @vaishnavachath
 /drivers/interrupt_controller/            @dcpleung @nashif
@@ -268,23 +365,31 @@
 /drivers/ipm/ipm_stm32_hsem.c             @cameled
 /drivers/ipm/ipm_esp32.c                  @uLipe
 /drivers/ipm/ipm_ivshmem.c                @uLipe
+/drivers/kscan/                           @VenkatKotakonda @franciscomunoz @sjvasanth1
 /drivers/kscan/*xec*                      @franciscomunoz @sjvasanth1
 /drivers/kscan/*ft5336*                   @MaureenHelm
 /drivers/kscan/*ht16k33*                  @henrikbrixandersen
+/drivers/led/                             @Mani-Sadhasivam
 /drivers/led_strip/                       @mbolivar-ampere
-/drivers/mfd/mfd_ad559x.c                 @bbilas
-/drivers/mfd/mfd_max20335.c               @bbilas
+/drivers/lora/                            @Mani-Sadhasivam
+/drivers/mbox/                            @carlocaione
+/drivers/misc/                            @tejlmand
 /drivers/misc/ft8xx/                      @hubertmis
+/drivers/mm/                              @dcpleung
 /drivers/modem/hl7800.c                   @rerickson1
 /drivers/modem/simcom-sim7080.c           @lgehreke
 /drivers/modem/simcom-sim7080.h           @lgehreke
 /drivers/modem/Kconfig.hl7800             @rerickson1
 /drivers/modem/Kconfig.simcom-sim7080     @lgehreke
+/drivers/pcie/                            @dcpleung @nashif @jhedberg
+/drivers/peci/                            @albertofloyd @franciscomunoz @sjvasanth1
+/drivers/pinctrl/                         @gmarull
 /drivers/pinctrl/*esp32*                  @sylvioalves
 /drivers/pinctrl/*it8xxx2*                @ite
-/drivers/pinctrl/*kb1200*                 @ene-steven
+/drivers/pm_cpu_ops/                      @carlocaione @gdengi
 /drivers/pm_cpu_ops/psci_shell.c          @nbalabak @gdengi
 /drivers/power_domain/                    @ceolin
+/drivers/ps2/                             @franciscomunoz @sjvasanth1
 /drivers/ps2/*xec*                        @franciscomunoz @sjvasanth1
 /drivers/ps2/*npcx*                       @MulinChao @ChiHuaL
 /drivers/pwm/*b91*                        @andy-liu-telink
@@ -301,14 +406,14 @@
 /drivers/pwm/*esp32*                      @LucasTambor
 /drivers/pwm/*rcar*                       @aaillet
 /drivers/pwm/*max31790*                   @benediktibk
-/drivers/pwm/*kb1200*                     @ene-steven
 /drivers/regulator/*                      @gmarull
-/drivers/regulator/regulator_max20335.c   @bbilas
 /drivers/regulator/regulator_pca9420.c    @danieldegrasse
 /drivers/regulator/regulator_rpi_pico.c   @soburi
 /drivers/regulator/regulator_shell.c      @danieldegrasse
+/drivers/reset/                           @andrei-edward-popa
 /drivers/reset/reset_intel_socfpga.c      @nbalabak
 /drivers/reset/Kconfig.intel_socfpga      @nbalabak
+/drivers/sensor/                          @MaureenHelm
 /drivers/sensor/ams_iAQcore/              @alexanderwachter
 /drivers/sensor/ens210/                   @alexanderwachter
 /drivers/sensor/grow_r502a/               @DineshDK03
@@ -321,13 +426,12 @@
 /drivers/sensor/qdec_stm32/               @valeriosetti
 /drivers/sensor/rpi_pico_temp/            @soburi
 /drivers/sensor/st*/                      @avisconti
-/drivers/sensor/veaa_x_3/                 @jeppenodgaard @MaureenHelm
-/drivers/sensor/ene_tack_kb1200/          @ene-steven
 /drivers/serial/*b91*                     @andy-liu-telink
 /drivers/serial/uart_altera_jtag.c        @nashif @gohshunjing
 /drivers/serial/uart_altera.c             @gohshunjing
 /drivers/serial/*ns16550*                 @dcpleung @nashif @gdengi
 /drivers/serial/*nrfx*                    @anangl
+/drivers/serial/uart_liteuart.c           @mateusz-holenko @kgugala @pgielda
 /drivers/serial/Kconfig.mcux_iuart        @Mani-Sadhasivam
 /drivers/serial/uart_mcux_iuart.c         @Mani-Sadhasivam
 /drivers/serial/Kconfig.rtt               @carlescufi @pkral78
@@ -340,21 +444,28 @@
 /drivers/serial/*numicro*                 @ssekar15
 /drivers/serial/*apbuart*                 @julius-barendt
 /drivers/serial/*rcar*                    @aaillet
+/drivers/serial/Kconfig.test              @str4t0m
+/drivers/serial/serial_test.c             @str4t0m
 /drivers/serial/Kconfig.xen               @lorc @firscity
 /drivers/serial/uart_hvc_xen.c            @lorc @firscity
 /drivers/serial/uart_hvc_xen_consoleio.c  @lorc @firscity
 /drivers/serial/Kconfig.it8xxx2           @GTLin08
 /drivers/serial/uart_ite_it8xxx2.c        @GTLin08
-/drivers/serial/*intel_lw*                @shilinte
-/drivers/serial/*kb1200*                  @ene-steven
+/drivers/smbus/                           @finikorg
+/drivers/sip_svc/                         @maheshraotm
+/drivers/disk/                            @jfischer-no
+/drivers/disk/sdmmc_sdhc.h                @JunYangNXP
 /drivers/disk/sdmmc_stm32.c               @anthonybrandon
+/drivers/net/                             @rlubos @tbursztyka @jukkar
 /drivers/ptp_clock/                       @tbursztyka @jukkar
+/drivers/spi/                             @tbursztyka
 /drivers/spi/*b91*                        @andy-liu-telink
 /drivers/spi/spi_rv32m1_lpspi*            @karstenkoenig
 /drivers/spi/*esp32*                      @sylvioalves
 /drivers/spi/*pl022*                      @soburi
 /drivers/sdhc/                            @danieldegrasse
-/drivers/sdhc/sdhc_cdns*                  @roymurlidhar @tanmaykathpalia
+/drivers/timer/*apic*                     @dcpleung @nashif
+/drivers/timer/apic_tsc.c                 @andyross
 /drivers/timer/*arm_arch*                 @carlocaione
 /drivers/timer/*cortex_m_systick*         @anangl
 /drivers/timer/*altera_avalon*            @nashif
@@ -363,16 +474,21 @@
 /drivers/timer/*xlnx_psttc*               @wjliang @stephanosio
 /drivers/timer/*cc13xx_cc26xx_rtc*        @vanti
 /drivers/timer/*cavs*                     @dcpleung
+/drivers/timer/*stm32_lptim*              @FRASTM
 /drivers/timer/*leon_gptimer*             @julius-barendt
 /drivers/timer/*mips_cp0*                 @frantony
 /drivers/timer/*rcar_cmt*                 @aaillet
-/drivers/timer/*esp32_sys*                @uLipe
+/drivers/timer/*esp32c3_sys*              @uLipe
 /drivers/timer/*sam0_rtc*                 @bendiscz
+/drivers/timer/*arcv2*                    @ruuddw
 /drivers/timer/*xtensa*                   @dcpleung
 /drivers/timer/*rv32m1_lptmr*             @mbolivar
 /drivers/timer/*nrf_rtc*                  @anangl
 /drivers/timer/*hpet*                     @dcpleung
+/drivers/usb/                             @jfischer-no
 /drivers/usb/device/usb_dc_stm32.c        @ydamigos @loicpoulain
+/drivers/usb_c/                           @sambhurst
+/drivers/video/                           @loicpoulain
 /drivers/i2c/*b91*                        @andy-liu-telink
 /drivers/i2c/i2c_ll_stm32*                @ydamigos
 /drivers/i2c/i2c_rv32m1_lpi2c*            @henrikbrixandersen
@@ -380,6 +496,7 @@
 /drivers/i2c/i2c_dw*                      @dcpleung
 /drivers/i2c/*tca954x*                    @kurddt
 /drivers/*/*xec*                          @franciscomunoz @albertofloyd @sjvasanth1
+/drivers/w1/                              @str4t0m
 /drivers/watchdog/*gecko*                 @oanerer
 /drivers/watchdog/*sifive*                @katsuster
 /drivers/watchdog/wdt_handlers.c          @dcpleung @nashif
@@ -388,28 +505,37 @@
 /drivers/watchdog/Kconfig.it8xxx2         @RuibinChang
 /drivers/watchdog/wdt_counter.c           @nordic-krch
 /drivers/watchdog/*rpi_pico*              @thedjnK
-/drivers/watchdog/*dw*                    @softwarecki @pbalsundar
+/drivers/watchdog/*dw*                    @softwarecki
 /drivers/watchdog/*ifx*                   @sreeramIfx
-/drivers/watchdog/*kb1200*                @ene-steven
+/drivers/wifi/                            @rlubos @tbursztyka @jukkar
 /drivers/wifi/esp_at/                     @mniestroj
 /drivers/wifi/eswifi/                     @loicpoulain @nandojve
 /drivers/wifi/winc1500/                   @kludentwo
 /drivers/virtualization/		  @tbursztyka
+/drivers/xen/                             @lorc @firscity
+/dts/arc/                                 @abrodkin @ruuddw @iriszzw @evgeniy-paltsev
 /dts/arm/acsip/                           @NorthernDean
 /dts/arm/aspeed/                          @aspeeddylan
-/dts/arm/atmel/                           @galak @nandojve
+/dts/arm/atmel/sam4e*                     @nandojve
+/dts/arm/atmel/sam4l*                     @nandojve
+/dts/arm/atmel/samr21.dtsi                @benpicco
+/dts/arm/atmel/sam*5*.dtsi                @benpicco
+/dts/arm/atmel/same70*                    @nandojve
+/dts/arm/atmel/samv71*                    @nandojve
+/dts/arm/atmel/                           @galak
 /dts/arm/broadcom/                        @sbranden
 /dts/arm/cypress/                         @ifyall @npal-cy
-/dts/arm/ene/kb1200                       @ene-steven
-/dts/arm/gd/                              @nandojve
+/dts/arm/gigadevice/                      @nandojve
 /dts/arm/infineon/xmc4*                   @parthitce @ifyall @npal-cy
 /dts/arm/infineon/psoc6/                  @ifyall @npal-cy
+/dts/arm64/                               @carlocaione
 /dts/arm64/armv8-r.dtsi                   @povergoing
 /dts/arm64/intel/*intel_socfpga*          @siclim
 /dts/arm64/nxp/                           @JiafeiPan
 /dts/arm64/renesas/                       @lorc @xakep-amatop
 /dts/arm/quicklogic/                      @fkokosinski @kgugala
-/dts/arm/seeed_studio/                    @str4t0m
+/dts/arm/seeed/                           @str4t0m
+/dts/arm/st/                              @erwango
 /dts/arm/st/h7/*stm32h735*                @benediktibk
 /dts/arm/st/l4/*stm32l451*                @benediktibk
 /dts/arm/ti/cc13?2*                       @bwitherspoon
@@ -429,10 +555,12 @@
 /dts/arm/silabs/efm32pg1b*                @rdmeneze
 /dts/arm/silabs/efr32mg21*                @l-alfred
 /dts/arm/silabs/efr32fg13*                @yonsch
+/dts/riscv/                               @kgugala @pgielda
 /dts/riscv/ite/                           @ite
 /dts/riscv/microchip/microchip-miv.dtsi   @galak
 /dts/riscv/openisa/rv32m1*                @dleach02
-/dts/riscv/starfive/                      @rajnesh-kanwal @pfarwsi
+/dts/riscv/riscv32-litex-vexriscv.dtsi    @mateusz-holenko @kgugala @pgielda
+/dts/riscv/starfive/                      @rajnesh-kanwal
 /dts/riscv/andes/andes_v5*                @cwshu @kevinwang821020 @jimmyzhe
 /dts/riscv/niosv/                         @sweeaun
 /dts/arm/armv*m.dtsi                      @galak @ioannisg
@@ -440,10 +568,13 @@
 /dts/arm/armv7-r.dtsi                     @bbolen @stephanosio
 /dts/arm/xilinx/                          @bbolen @stephanosio
 /dts/arm/renesas/rcar/                    @aaillet
+/dts/x86/                                 @jhedberg
 /dts/xtensa/xtensa.dtsi                   @ydamigos
 /dts/xtensa/intel/                        @dcpleung
 /dts/xtensa/espressif/                    @sylvioalves
 /dts/xtensa/nxp/                          @iuliana-prodan @dbaluta
+/dts/sparc/                               @julius-barendt
+/dts/bindings/                            @galak
 /dts/bindings/can/                        @alexanderwachter @henrikbrixandersen
 /dts/bindings/i2c/zephyr*i2c-emul*.yaml   @sjg20
 /dts/bindings/adc/st*stm32-adc.yaml       @cybertale
@@ -454,7 +585,6 @@
 /dts/bindings/counter/snps,dw-timers.yaml @pbalsundar
 /dts/bindings/wifi/*esp-at.yaml           @mniestroj
 /dts/bindings/*/*gd32*                    @nandojve
-/dts/bindings/*/*sam*                     @nandojve
 /dts/bindings/*/*npcx*                    @MulinChao @ChiHuaL
 /dts/bindings/*/*psoc6*                   @ifyall @npal-cy
 /dts/bindings/*/*infineon*cat1*           @ifyall @npal-cy
@@ -463,8 +593,11 @@
 /dts/bindings/*/nxp*s32*                  @manuargue
 /dts/bindings/*/openisa*                  @dleach02
 /dts/bindings/*/raspberrypi*pico*         @yonsch
+/dts/bindings/*/st*                       @erwango
 /dts/bindings/sensor/ams*                 @alexanderwachter
 /dts/bindings/*/sifive*                   @mateusz-holenko @kgugala @pgielda
+/dts/bindings/*/litex*                    @mateusz-holenko @kgugala @pgielda
+/dts/bindings/*/vexriscv*                 @mateusz-holenko @kgugala @pgielda
 /dts/bindings/*/andes*                    @cwshu @kevinwang821020 @jimmyzhe
 /dts/bindings/*/neorv32*                  @henrikbrixandersen
 /dts/bindings/*/*lan91c111*               @sgrrzhf
@@ -473,6 +606,7 @@
 /dts/bindings/ethernet/*gem.yaml          @ibirnbaum
 /dts/bindings/auxdisplay/*pt6314.yaml     @xingrz
 /dts/bindings/auxdisplay/*                 @thedjnK
+/dts/posix/                               @aescolar @daor-oti
 /dts/bindings/sensor/*bme680*             @BoschSensortec
 /dts/bindings/sensor/*ina23*              @bbilas
 /dts/bindings/sensor/st*                  @avisconti
@@ -487,3 +621,343 @@
 /dts/bindings/gpio/*ads114s0x*            @benediktibk
 /dts/bindings/pwm/*max31790*              @benediktibk
 /dts/bindings/dac/*ad56*                  @benediktibk
+/dts/common/                              @galak
+/include/                                 @nashif @carlescufi @galak @MaureenHelm
+/include/zephyr/drivers/*/*litex*                @mateusz-holenko @kgugala @pgielda
+/include/zephyr/drivers/adc.h                    @anangl
+/include/zephyr/drivers/adc/ads114s0x.h   @benediktibk
+/include/zephyr/drivers/auxdisplay.h       @thedjnK
+/include/zephyr/drivers/can.h                    @alexanderwachter @henrikbrixandersen
+/include/zephyr/drivers/can/                     @alexanderwachter @henrikbrixandersen
+/include/zephyr/drivers/counter.h                @nordic-krch
+/include/zephyr/drivers/dac.h                    @martinjaeger
+/include/zephyr/drivers/espi.h                   @albertofloyd @franciscomunoz @sjvasanth1
+/include/zephyr/drivers/bluetooth/               @alwa-nordic @jhedberg @Vudentz
+/include/zephyr/drivers/flash.h                  @nashif @carlescufi @galak @MaureenHelm @de-nordic
+/include/zephyr/drivers/i2c_emul.h               @sjg20
+/include/zephyr/drivers/i3c.h                    @dcpleung
+/include/zephyr/drivers/i3c/                     @dcpleung
+/include/zephyr/drivers/led/ht16k33.h            @henrikbrixandersen
+/include/zephyr/drivers/interrupt_controller/    @dcpleung @nashif
+/include/zephyr/drivers/interrupt_controller/gic.h @stephanosio
+/include/zephyr/drivers/modem/hl7800.h           @rerickson1
+/include/zephyr/drivers/pcie/                    @dcpleung
+/include/zephyr/drivers/hwinfo.h                 @alexanderwachter
+/include/zephyr/drivers/led.h                    @Mani-Sadhasivam
+/include/zephyr/drivers/led_strip.h              @mbolivar-ampere
+/include/zephyr/drivers/sensor.h                 @MaureenHelm
+/include/zephyr/drivers/smbus.h                  @finikorg
+/include/zephyr/drivers/spi.h                    @tbursztyka
+/include/zephyr/drivers/sip_svc/                 @maheshraotm
+/include/zephyr/drivers/lora.h                   @Mani-Sadhasivam
+/include/zephyr/drivers/peci.h                   @albertofloyd @franciscomunoz @sjvasanth1
+/include/zephyr/drivers/pm_cpu_ops.h             @carlocaione
+/include/zephyr/drivers/pm_cpu_ops/              @carlocaione
+/include/zephyr/drivers/w1.h                     @str4t0m
+/include/zephyr/drivers/pwm/max31790.h           @benediktibk
+/include/zephyr/app_memory/                      @dcpleung
+/include/zephyr/arch/arc/                        @abrodkin @ruuddw @evgeniy-paltsev
+/include/zephyr/arch/arc/arch.h                  @abrodkin @ruuddw @evgeniy-paltsev
+/include/zephyr/arch/arc/v2/irq.h                @abrodkin @ruuddw @evgeniy-paltsev
+/include/zephyr/arch/arm                         @MaureenHelm @galak @ioannisg
+/include/zephyr/arch/arm/cortex_a_r/             @stephanosio
+/include/zephyr/arch/arm64/                      @carlocaione
+/include/zephyr/arch/arm64/cortex_r/             @povergoing
+/include/zephyr/arch/arm/irq.h                   @carlocaione
+/include/zephyr/arch/mips/                       @frantony
+/include/zephyr/arch/nios2/                      @nashif
+/include/zephyr/arch/nios2/arch.h                @nashif
+/include/zephyr/arch/posix/                      @aescolar @daor-oti
+/include/zephyr/arch/riscv/                      @kgugala @pgielda
+/include/zephyr/arch/x86/                        @jhedberg @dcpleung
+/include/zephyr/arch/common/                     @andyross @nashif
+/include/zephyr/arch/xtensa/                     @andyross @dcpleung
+/include/zephyr/arch/sparc/                      @julius-barendt
+/include/zephyr/sys/atomic.h                     @andyross
+/include/zephyr/bluetooth/                       @alwa-nordic @jhedberg @Vudentz @sjanc
+/include/zephyr/bluetooth/audio/                 @jhedberg @Vudentz @Thalley
+/include/zephyr/cache.h                          @carlocaione @andyross
+/include/zephyr/canbus/                          @alexanderwachter @henrikbrixandersen
+/include/zephyr/tracing/                         @nashif
+/include/zephyr/debug/                           @nashif
+/include/zephyr/debug/coredump.h                 @dcpleung
+/include/zephyr/debug/gdbstub.h                  @ceolin
+/include/zephyr/device.h                         @tbursztyka @nashif
+/include/zephyr/devicetree.h                     @galak
+/include/zephyr/devicetree/can.h                 @henrikbrixandersen
+/include/zephyr/dt-bindings/clock/kinetis_mcg.h  @henrikbrixandersen
+/include/zephyr/dt-bindings/clock/kinetis_scg.h  @henrikbrixandersen
+/include/zephyr/dt-bindings/ethernet/xlnx_gem.h  @ibirnbaum
+/include/zephyr/dt-bindings/pcie/                @dcpleung
+/include/zephyr/dt-bindings/pinctrl/esp*         @sylvioalves
+/include/zephyr/dt-bindings/pwm/*it8xxx2*        @RuibinChang
+/include/zephyr/dt-bindings/usb/usb.h            @galak
+/include/zephyr/dt-bindings/adc/ads114s0x_adc.h  @benediktibk
+/include/zephyr/drivers/emul.h                   @sjg20
+/include/zephyr/data/                            @d3zd3z
+/include/zephyr/fs/                              @nashif @de-nordic
+/include/zephyr/init.h                           @nashif @andyross
+/include/zephyr/irq.h                            @dcpleung @nashif @andyross
+/include/zephyr/irq_offload.h                    @dcpleung @nashif @andyross
+/include/zephyr/kernel.h                         @dcpleung @nashif @andyross
+/include/zephyr/kernel_version.h                 @dcpleung @nashif @andyross
+/include/zephyr/linker/app_smem*.ld              @dcpleung @nashif
+/include/zephyr/linker/                          @dcpleung @nashif @andyross
+/include/zephyr/logging/                         @nordic-krch
+/include/zephyr/lorawan/lorawan.h                @Mani-Sadhasivam
+/include/zephyr/mgmt/osdp.h                      @sidcha
+/include/zephyr/mgmt/mcumgr/                     @nordicjm
+/include/zephyr/net/                             @rlubos @tbursztyka @jukkar
+/include/zephyr/net/buf.h                        @jhedberg @tbursztyka @rlubos @jukkar
+/include/zephyr/net/coap*.h                      @rlubos
+/include/zephyr/net/conn_mgr*.h                  @rlubos @glarsennordic @jukkar
+/include/zephyr/net/gptp.h                       @rlubos @jukkar @fgrandel
+/include/zephyr/net/ieee802154*.h                @rlubos @tbursztyka @jukkar @fgrandel
+/include/zephyr/net/lwm2m*.h                     @rlubos
+/include/zephyr/net/mqtt.h                       @rlubos
+/include/zephyr/net/mqtt_sn.h                    @rlubos @BeckmaR
+/include/zephyr/net/net_pkt_filter.h             @npitre
+/include/zephyr/posix/                           @cfreidt
+/include/zephyr/pm/pm.h                          @nashif @ceolin
+/include/zephyr/drivers/ptp_clock.h              @tbursztyka @jukkar
+/include/zephyr/rtio/                            @teburd
+/include/zephyr/sensing/                           @lixuzha @ghu0510 @qianruh
+/include/zephyr/shared_irq.h                     @dcpleung @nashif @andyross
+/include/zephyr/shell/                           @jakub-uC @nordic-krch
+/include/zephyr/shell/shell_mqtt.h               @ycsin
+/include/zephyr/sw_isr_table.h                   @dcpleung @nashif @andyross
+/include/zephyr/sd/                              @danieldegrasse
+/include/zephyr/sip_svc/                         @maheshraotm
+/include/zephyr/sys_clock.h                      @dcpleung @nashif @andyross
+/include/zephyr/sys/sys_io.h                     @dcpleung @nashif @andyross
+/include/zephyr/sys/kobject.h                    @dcpleung @nashif
+/include/zephyr/toolchain.h                      @dcpleung @andyross @nashif
+/include/zephyr/toolchain/                       @dcpleung @nashif @andyross
+/include/zephyr/zephyr.h                         @dcpleung @nashif @andyross
+/kernel/                                  @dcpleung @nashif @andyross
+/lib/cpp/                                 @stephanosio
+/lib/smf/                                 @sambhurst
+/lib/util/                                @carlescufi @jakub-uC
+/lib/util/fnmatch/                        @carlescufi @jakub-uC
+/lib/open-amp/                            @arnopo
+/lib/os/                                  @dcpleung @nashif @andyross
+/lib/os/cbprintf_packaged.c               @npitre
+/lib/os/json.c                            @d3zd3z
+/lib/posix/                               @cfriedt
+/lib/posix/getopt/                        @jakub-uC
+/subsys/portability/                      @nashif
+/subsys/sensing/                            @lixuzha @ghu0510 @qianruh
+/lib/libc/                                @nashif
+/lib/libc/arcmwdt/                        @abrodkin @ruuddw @evgeniy-paltsev
+/misc/                                    @tejlmand
+/modules/                                 @nashif
+/modules/canopennode/                     @henrikbrixandersen
+/modules/mbedtls/                         @ceolin @d3zd3z
+/modules/hal_gigadevice/                  @nandojve
+/modules/hal_nordic/nrf_802154/           @jciupis
+/modules/trusted-firmware-m/              @microbuilder
+/kernel/device.c                          @andyross @nashif
+/kernel/idle.c                            @andyross @nashif
+/samples/                                 @nashif
+/samples/application_development/sysbuild/      @tejlmand @nordicjm
+/samples/basic/minimal/                   @carlescufi
+/samples/basic/servo_motor/boards/*microbit* @jhe
+/samples/bluetooth/                       @jhedberg @Vudentz @alwa-nordic @sjanc
+/samples/compression/                     @Navin-Sankar
+/samples/drivers/can/                     @alexanderwachter @henrikbrixandersen
+/samples/drivers/clock_control_litex/     @mateusz-holenko @kgugala @pgielda
+/samples/drivers/eeprom/                  @henrikbrixandersen
+/samples/drivers/ht16k33/                 @henrikbrixandersen
+/samples/drivers/lora/                    @Mani-Sadhasivam
+/samples/drivers/smbus/                   @finikorg
+/samples/subsys/lorawan/                  @Mani-Sadhasivam
+/samples/modules/canopennode/             @henrikbrixandersen
+/samples/net/                             @rlubos @tbursztyka @jukkar
+/samples/net/cloud/tagoio_http_post/      @nandojve
+/samples/net/dns_resolve/                 @rlubos @tbursztyka @jukkar
+/samples/net/gptp/                        @rlubos @jukkar @fgrandel
+/samples/net/lwm2m_client/                @rlubos
+/samples/net/mqtt_publisher/              @rlubos
+/samples/net/mqtt_sn_publisher/           @rlubos @BeckmaR
+/samples/net/sockets/coap_*/              @rlubos
+/samples/net/sockets/                     @rlubos @tbursztyka @jukkar
+/samples/sensor/                          @MaureenHelm
+/samples/shields/                         @avisconti
+/samples/subsys/ipc/ipc_service/icmsg     @emob-nordic
+/samples/subsys/logging/                  @nordic-krch @jakub-uC
+/samples/subsys/logging/syst/             @dcpleung
+/samples/subsys/shell/                    @jakub-uC @nordic-krch @gdengi
+/samples/subsys/sip_svc/                  @maheshraotm
+/samples/subsys/mgmt/mcumgr/              @de-nordic @nordicjm
+/samples/subsys/mgmt/updatehub/           @nandojve @otavio
+/samples/subsys/mgmt/osdp/                @sidcha
+/samples/subsys/usb/                      @jfischer-no
+/samples/subsys/usb_c/                    @sambhurst
+/samples/subsys/pm/                       @nashif @ceolin
+/samples/subsys/sensing/                  @lixuzha @ghu0510 @qianruh
+/samples/tfm_integration/                 @microbuilder
+/samples/userspace/                       @dcpleung @nashif
+/scripts/release/bug_bash.py              @cfriedt
+/scripts/coccicheck                       @himanshujha199640 @JuliaLawall
+/scripts/coccinelle/                      @himanshujha199640 @JuliaLawall
+/scripts/coredump/                        @dcpleung
+/scripts/footprint/                       @nashif
+/scripts/kconfig/                         @ulfalizer
+/scripts/logging/dictionary/              @dcpleung
+/scripts/native_simulator/                @aescolar
+/scripts/pylib/twister/expr_parser.py     @nashif
+/scripts/schemas/twister/                 @nashif
+/scripts/build/gen_app_partitions.py            @dcpleung @nashif
+scripts/build/gen_image_info.py           @tejlmand
+/scripts/get_maintainer.py                @nashif
+/scripts/dts/                             @mbolivar-ampere @galak
+/scripts/release/                         @nashif
+/scripts/ci/                              @nashif
+/scripts/ci/check_compliance.py           @nashif @carlescufi
+/arch/x86/gen_gdt.py                      @dcpleung @nashif
+/arch/x86/gen_idt.py                      @dcpleung @nashif
+/scripts/build/gen_kobject_list.py        @dcpleung @nashif
+/scripts/build/gen_kobject_placeholders.py      @dcpleung
+/scripts/build/gen_syscalls.py            @dcpleung @nashif
+/scripts/list_boards.py                   @mbolivar-ampere
+/scripts/build/process_gperf.py           @dcpleung @nashif
+/scripts/build/gen_relocate_app.py        @dcpleung
+/scripts/generate_usb_vif/                @madhurimaparuchuri
+/scripts/requirements*.txt                @mbolivar-ampere @galak @nashif
+/scripts/tests/build/test_subfolder_list.py @rmstoi
+/scripts/tracing/                         @nashif
+/scripts/pylib/twister/                   @nashif
+/scripts/twister                          @nashif
+/scripts/series-push-hook.sh              @erwango
+/scripts/utils/pinctrl_nrf_migrate.py     @gmarull
+/scripts/utils/migrate_mcumgr_kconfigs.py @de-nordic
+/scripts/west_commands/                   @mbolivar-ampere
+/scripts/west_commands/blobs.py           @carlescufi
+/scripts/west_commands/fetchers/          @carlescufi
+/scripts/west_commands/runners/gd32isp.py @mbolivar-ampere @nandojve
+/scripts/west_commands/tests/test_gd32isp.py @mbolivar-ampere @nandojve
+/scripts/west-commands.yml                @mbolivar-ampere
+/scripts/zephyr_module.py                 @tejlmand
+/scripts/build/uf2conv.py                 @petejohanson
+/scripts/build/user_wordsize.py           @cfriedt
+/scripts/valgrind.supp                    @aescolar @daor-oti
+/share/sysbuild/                          @tejlmand @nordicjm
+/share/zephyr-package/                    @tejlmand
+/share/zephyrunittest-package/            @tejlmand
+/subsys/bluetooth/                        @alwa-nordic @jhedberg @Vudentz
+/subsys/bluetooth/audio/                  @jhedberg @Vudentz @Thalley @sjanc
+/subsys/bluetooth/controller/             @carlescufi @cvinayak @thoh-ot @kruithofa
+/subsys/bluetooth/host/                   @alwa-nordic @jhedberg @Vudentz @sjanc
+/subsys/bluetooth/mesh/                   @jhedberg @PavelVPV @Vudentz @LingaoM
+/subsys/canbus/                           @alexanderwachter @henrikbrixandersen
+/subsys/debug/                            @nashif
+/subsys/debug/coredump/                   @dcpleung
+/subsys/debug/gdbstub/                    @ceolin
+/subsys/debug/gdbstub.c                   @ceolin
+/subsys/dfu/                              @de-nordic @nordicjm
+/subsys/disk/                             @jfischer-no
+/subsys/dsp/                              @yperess
+/subsys/tracing/                          @nashif
+/subsys/debug/asan_hacks.c                @aescolar @daor-oti
+/subsys/demand_paging/                    @dcpleung @nashif
+/subsys/emul/                             @sjg20
+/subsys/fb/                               @jfischer-no
+/subsys/fs/                               @nashif
+/subsys/fs/nvs/                           @Laczen
+/subsys/ipc/                              @carlocaione
+/subsys/ipc/ipc_service/*/*icmsg*         @emob-nordic
+/subsys/jwt/                              @d3zd3z
+/subsys/logging/                          @nordic-krch
+/subsys/logging/backends/log_backend_net.c @nordic-krch @rlubos @jukkar
+/subsys/lorawan/                          @Mani-Sadhasivam
+/subsys/mgmt/ec_host_cmd/                 @jettr
+/subsys/mgmt/mcumgr/                      @carlescufi @de-nordic @nordicjm
+/subsys/mgmt/hawkbit/                     @Navin-Sankar
+/subsys/mgmt/updatehub/                   @nandojve @otavio
+/subsys/mgmt/osdp/                        @sidcha
+/subsys/modbus/                           @jfischer-no
+/subsys/net/buf.c                         @jhedberg @tbursztyka @rlubos @jukkar
+/subsys/net/conn_mgr/                     @rlubos @glarsennordic @jukkar
+/subsys/net/ip/                           @rlubos @tbursztyka @jukkar
+/subsys/net/lib/                          @rlubos @tbursztyka @jukkar
+/subsys/net/lib/dns/                      @rlubos @tbursztyka @cfriedt @jukkar
+/subsys/net/lib/lwm2m/                    @rlubos
+/subsys/net/lib/config/                   @rlubos @tbursztyka @jukkar
+/subsys/net/lib/mqtt/                     @rlubos
+/subsys/net/lib/mqtt_sn/                  @rlubos @BeckmaR
+/subsys/net/lib/coap/                     @rlubos
+/subsys/net/lib/sockets/socketpair.c      @cfriedt
+/subsys/net/lib/sockets/                  @rlubos @tbursztyka @jukkar
+/subsys/net/lib/tls_credentials/          @rlubos
+/subsys/net/l2/                           @rlubos @tbursztyka @jukkar
+/subsys/net/l2/ethernet/gptp/             @rlubos @jukkar @fgrandel
+/subsys/net/l2/ieee802154/                @rlubos @tbursztyka @jukkar @fgrandel
+/subsys/net/l2/canbus/                    @alexanderwachter
+/subsys/net/pkt_filter/                   @npitre
+/subsys/net/*/openthread/                 @rlubos
+/subsys/pm/                               @nashif @ceolin
+/subsys/random/                           @dleach02
+/subsys/shell/                            @jakub-uC @nordic-krch
+/subsys/shell/backends/shell_mqtt.c       @ycsin
+/subsys/sd/                               @danieldegrasse
+/subsys/sip_svc/                          @maheshraotm
+/subsys/task_wdt/                         @martinjaeger
+/subsys/testsuite/                        @nashif
+/subsys/testsuite/ztest/*/ztress*         @nordic-krch
+/subsys/timing/                           @nashif @dcpleung
+/subsys/usb/                              @jfischer-no
+/subsys/usb/usb_c/                        @sambhurst
+/tests/                                   @nashif
+/tests/arch/arm/                          @ioannisg @stephanosio
+/tests/benchmarks/cmsis_dsp/              @stephanosio
+/tests/boards/native_posix/               @aescolar @daor-oti
+/tests/bluetooth/                         @alwa-nordic @jhedberg @Vudentz @sjanc
+/tests/bluetooth/audio/                   @jhedberg @Vudentz @wopu-ot @Thalley
+/tests/bluetooth/controller/              @cvinayak @thoh-ot @kruithofa @erbr-ot @sjanc @ppryga
+/tests/bsim/bluetooth/                    @alwa-nordic @jhedberg @Vudentz @wopu-ot
+/tests/bsim/bluetooth/audio/              @jhedberg @Vudentz @wopu-ot @Thalley
+/tests/bsim/bluetooth/mesh/               @jhedberg @Vudentz @wopu-ot @PavelVPV
+/tests/bluetooth/mesh_shell/              @jhedberg @Vudentz @sjanc @PavelVPV
+/tests/bluetooth/tester/                  @alwa-nordic @jhedberg @Vudentz @sjanc
+/tests/posix/                             @cfriedt
+/tests/crypto/                            @ceolin
+/tests/crypto/mbedtls/                    @nashif @ceolin @d3zd3z
+/tests/drivers/can/                       @alexanderwachter @henrikbrixandersen
+/tests/drivers/counter/                   @nordic-krch
+/tests/drivers/eeprom/                    @henrikbrixandersen @sjg20
+/tests/drivers/flash_simulator/           @de-nordic
+/tests/drivers/gpio/                      @mnkp
+/tests/drivers/hwinfo/                    @alexanderwachter
+/tests/drivers/smbus/                     @finikorg
+/tests/drivers/spi/                       @tbursztyka
+/tests/drivers/uart/uart_async_api/       @anangl
+/tests/drivers/w1/                        @str4t0m
+/tests/kernel/                            @dcpleung @andyross @nashif
+/tests/lib/                               @nashif
+/tests/lib/cmsis_dsp/                     @stephanosio
+/tests/lib/json/                          @d3zd3z
+/tests/net/                               @rlubos @tbursztyka @jukkar
+/tests/net/buf/                           @jhedberg @tbursztyka @jukkar
+/tests/net/conn_mgr_monitor/              @rlubos @glarsennordic @jukkar
+/tests/net/conn_mgr_conn/                 @rlubos @glarsennordic @jukkar
+/tests/net/ieee802154/l2/                 @rlubos @tbursztyka @jukkar @fgrandel
+/tests/net/lib/                           @rlubos @tbursztyka @jukkar
+/tests/net/lib/http_header_fields/        @rlubos @tbursztyka @jukkar
+/tests/net/lib/mqtt_packet/               @rlubos
+/tests/net/lib/mqtt_sn_packet/            @rlubos @BeckmaR
+/tests/net/lib/mqtt_sn_client/            @rlubos @BeckmaR
+/tests/net/lib/coap/                      @rlubos
+/tests/net/npf/                           @npitre
+/tests/net/socket/socketpair/             @cfriedt
+/tests/net/socket/                        @rlubos @tbursztyka @jukkar
+/tests/subsys/debug/coredump/             @dcpleung
+/tests/subsys/fs/                         @nashif @de-nordic
+/tests/subsys/jwt/                        @d3zd3z
+/tests/subsys/mgmt/mcumgr/                @de-nordic @nordicjm
+/tests/subsys/sd/                         @danieldegrasse
+/tests/subsys/rtio/                       @teburd
+/tests/subsys/shell/                      @jakub-uC @nordic-krch
+# Get all docs reviewed
+*.rst                                     @nashif
+/doc/kernel/                              @andyross @nashif
+*posix*.rst                               @aescolar @daor-oti

CODE_OF_CONDUCT.md

@@ -2,138 +2,77 @@
 
 ## Our Pledge
 
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
 
 ## Our Standards
 
-Examples of behavior that contributes to a positive environment for our
-community include:
+Examples of behavior that contributes to creating a positive environment
+include:
 
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
-  community
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
-Examples of unacceptable behavior include:
+Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery, and sexual attention or advances of
-  any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or email address,
-  without their explicit permission
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
-  professional setting
+ professional setting
 
-## Enforcement Responsibilities
+## Our Responsibilities
 
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
 
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
 
 ## Scope
 
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-conduct@zephyrproject.org. Reports will be received by the Chair of the Zephyr
-Governing Board, the Zephyr Project Director (Linux Foundation), and the Zephyr
-Project Developer Advocate (Linux Foundation). You may refer to the [Governing
-Board](https://zephyrproject.org/governing-board/) and [Linux Foundation
-Staff](https://zephyrproject.org/staff/) web pages to identify who are the
-individuals currently holding these positions.
-All complaints will be reviewed and investigated promptly and fairly.
+reported by contacting the project team at conduct@zephyrproject.org.
+Reports will be received by Kate Stewart (Linux Foundation) and Amy Occhialino
+(Intel). All complaints will be reviewed and investigated, and will result in a
+response that is deemed necessary and appropriate to the circumstances. The
+project team is obligated to maintain confidentiality with regard to the
+reporter of an incident.  Further details of specific enforcement policies may
+be posted separately.
 
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of
-actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the
-community.
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-The only changes made by The Zephyr Project to the original document were to
-make explicit who the recipients of Code of Conduct incident reports are.
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-[https://www.contributor-covenant.org/translations][translations].
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
 
 [homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

Kconfig.constants

@@ -1,19 +0,0 @@
-# Constant variables to be used across Kconfig options
-
-# Copyright (c) 2024 basalte bv
-# SPDX-License-Identifier: Apache-2.0
-
-INT8_MIN := -128
-INT16_MIN := -32768
-INT32_MIN := -2147483648
-INT64_MIN := -9223372036854775808
-
-INT8_MAX := 127
-INT16_MAX := 32767
-INT32_MAX := 2147483647
-INT64_MAX := 9223372036854775807
-
-UINT8_MAX := 255
-UINT16_MAX := 65535
-UINT32_MAX := 4294967295
-UINT64_MAX := 18446744073709551615

Kconfig.zephyr

@@ -5,8 +5,6 @@
 # Copyright (c) 2023 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-source "Kconfig.constants"
-
 osource "${APPLICATION_SOURCE_DIR}/VERSION"
 
 # Include Kconfig.defconfig files first so that they can override defaults and
@@ -23,11 +21,12 @@ osource "$(KCONFIG_BINARY_DIR)/Kconfig.shield.defconfig"
 # This loads Zephyr base shield defconfigs
 source "boards/shields/*/Kconfig.defconfig"
 
-osource "$(BOARD_DIR)/Kconfig.defconfig"
-
-# This loads Zephyr specific SoC root defconfigs
-source "$(KCONFIG_BINARY_DIR)/soc/Kconfig.defconfig"
+source "$(BOARD_DIR)/Kconfig.defconfig"
 
+# This loads custom SoC root defconfigs
+osource "$(KCONFIG_BINARY_DIR)/Kconfig.soc.defconfig"
+# This loads Zephyr base SoC root defconfigs
+osource "soc/$(ARCH)/*/Kconfig.defconfig"
 # This loads the toolchain defconfigs
 osource "$(TOOLCHAIN_KCONFIG_DIR)/Kconfig.defconfig"
 # This loads the testsuite defconfig
@@ -142,17 +141,6 @@ config ROM_START_OFFSET
 	  alignment requirements on most ARM targets, although some targets
 	  may require smaller or larger values.
 
-config ROM_END_OFFSET
-	hex "ROM end offset"
-	default 0
-	help
-	  If non-zero, this option reduces the maximum size that the Zephyr image is allowed to
-	  occupy, this is to allow for additional image storage which can be created and used by
-	  other systems such as bootloaders (for MCUboot, this would include the image swap
-	  fields and TLV storage at the end of the image).
-
-	  If unsure, leave at the default value 0.
-
 config LD_LINKER_SCRIPT_SUPPORTED
 	bool
 	default y
@@ -318,135 +306,20 @@ config LINKER_USE_RELAX
 
 endmenu # "Linker Sections"
 
-config LINKER_ITERABLE_SUBALIGN
-	int
-	default 8 if 64BIT
-	default 4
-	help
-	  Hidden option for the default subalignment of iterable sections.
-
-config LINKER_DEVNULL_SUPPORT
-	bool
-	default y if CPU_CORTEX_M || (RISCV && !64BIT)
-
-config LINKER_DEVNULL_MEMORY
-	bool "Devnull region"
-	depends on LINKER_DEVNULL_SUPPORT
-	help
-	  Devnull region is created. It is stripped from final binary but remains
-	  in byproduct elf file.
-
-config LINKER_DEVNULL_MEMORY_SIZE
-	int "Devnull region size"
-	depends on LINKER_DEVNULL_MEMORY
-	default 262144
-	help
-	  Size can be adjusted so it fits all data placed in that region.
-
 endmenu
 
 menu "Compiler Options"
 
-config REQUIRES_STD_C99
-	bool
-	help
-	  Hidden option to select compiler support C99 standard or higher.
-
-config REQUIRES_STD_C11
-	bool
-	select REQUIRES_STD_C99
-	help
-	  Hidden option to select compiler support C11 standard or higher.
-
-config REQUIRES_STD_C17
-	bool
-	select REQUIRES_STD_C11
-	help
-	  Hidden option to select compiler support C17 standard or higher.
-
-config REQUIRES_STD_C23
-	bool
-	select REQUIRES_STD_C17
-	help
-	  Hidden option to select compiler support C23 standard or higher.
-
-choice STD_C
-	prompt "C Standard"
-	default STD_C23 if REQUIRES_STD_C23
-	default STD_C17 if REQUIRES_STD_C17
-	default STD_C11 if REQUIRES_STD_C11
-	default STD_C99
-	help
-	  C Standards.
-
-config STD_C90
-	bool "C90"
-	depends on !REQUIRES_STD_C99
-	help
-	  1989 C standard as completed in 1989 and ratified by ISO/IEC
-	  as ISO/IEC 9899:1990. This version is known as "ANSI C".
-
-config STD_C99
-	bool "C99"
-	depends on !REQUIRES_STD_C11
-	help
-	  1999 C standard.
-
-config STD_C11
-	bool "C11"
-	depends on !REQUIRES_STD_C17
-	help
-	  2011 C standard.
-
-config STD_C17
-	bool "C17"
-	depends on !REQUIRES_STD_C23
-	help
-	  2017 C standard, addresses defects in C11 without introducing
-	  new language features.
-
-config STD_C23
-	bool "C23"
-	help
-	  2023 C standard.
-
-endchoice
-
-config TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS
-	bool
-	default y if "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr"
-	help
-	  Hidden option to signal that toolchain supports GNU Extensions.
-
-config GNU_C_EXTENSIONS
-	bool "GNU C Extensions"
-	depends on TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS
-	help
-	  Enable GNU C Extensions. GNU C provides several language features
-	  not found in ISO standard C.
-
 config CODING_GUIDELINE_CHECK
 	bool "Enforce coding guideline rules"
 	help
 	  Use available compiler flags to check coding guideline rules during
 	  the build.
 
-config NATIVE_LIBC
-	bool
-	select FULL_LIBC_SUPPORTED
-	help
-	  Zephyr will use the host system C library.
-
-config NATIVE_LIBCPP
-	bool
-	select FULL_LIBCPP_SUPPORTED
-	help
-	  Zephyr will use the host system C++ library
-
 config NATIVE_BUILD
 	bool
-	select NATIVE_LIBC if EXTERNAL_LIBC
-	select NATIVE_LIBCPP if EXTERNAL_LIBCPP
+	select FULL_LIBC_SUPPORTED
+	select FULL_LIBCPP_SUPPORTED if CPP
 	help
 	  Zephyr will be built targeting the host system for debug and
 	  development purposes.
@@ -480,7 +353,6 @@ choice COMPILER_OPTIMIZATIONS
 	prompt "Optimization level"
 	default NO_OPTIMIZATIONS    if COVERAGE
 	default DEBUG_OPTIMIZATIONS if DEBUG
-	default SIZE_OPTIMIZATIONS_AGGRESSIVE if "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "llvm"
 	default SIZE_OPTIMIZATIONS
 	help
 	  Note that these flags shall only control the compiler
@@ -493,12 +365,6 @@ config SIZE_OPTIMIZATIONS
 	  Compiler optimizations will be set to -Os independently of other
 	  options.
 
-config SIZE_OPTIMIZATIONS_AGGRESSIVE
-	bool "Aggressively optimize for size"
-	help
-	  Compiler optimizations wil be set to -Oz independently of other
-	  options.
-
 config SPEED_OPTIMIZATIONS
 	bool "Optimize for speed"
 	help
@@ -521,15 +387,6 @@ config NO_OPTIMIZATIONS
 	  default stack sizes in order to avoid stack overflows.
 endchoice
 
-config LTO
-	bool "Link Time Optimization [EXPERIMENTAL]"
-	depends on !(GEN_ISR_TABLES || GEN_IRQ_VECTOR_TABLE) || ISR_TABLES_LOCAL_DECLARATION
-	depends on !NATIVE_LIBRARY
-	depends on !CODE_DATA_RELOCATION
-	select EXPERIMENTAL
-	help
-	  This option enables Link Time Optimization.
-
 config COMPILER_WARNINGS_AS_ERRORS
 	bool "Treat warnings as errors"
 	help
@@ -614,17 +471,17 @@ choice
 config ASSERT_ON_ERRORS
 	bool "Assert on all errors"
 	help
-	  Assert on errors covered with the CHECKIF() macro.
+	  Assert on errors covered with the CHECK macro.
 
 config NO_RUNTIME_CHECKS
 	bool "No runtime error checks"
 	help
-	  Do not do any runtime checks or asserts when using the CHECKIF() macro.
+	  Do not do any runtime checks or asserts when using the CHECK macro.
 
 config RUNTIME_ERROR_CHECKS
 	bool "Runtime error checks"
 	help
-	  Always perform runtime checks covered with the CHECKIF() macro. This
+	  Always perform runtime checks covered with the CHECK macro. This
 	  option is the default and the only option used during testing.
 
 endchoice
@@ -661,17 +518,6 @@ config OUTPUT_DISASSEMBLE_ALL
 	  The .lst file will contain complete disassembly of the firmware
 	  not just those expected to contain instructions including zeros
 
-config OUTPUT_DISASSEMBLY_WITH_SOURCE
-	bool "Include source code in output disassembly file"
-	default y
-	depends on OUTPUT_DISASSEMBLY && !OUTPUT_DISASSEMBLE_ALL
-	help
-	  The .lst file will also contain the source code. Having
-	  control over this can be useful for reproducible builds
-	  since it can be used to remove one of the elements of
-	  the .lst file that can vary across platforms because
-	  of reasons such as having ".." include paths.
-
 config OUTPUT_PRINT_MEMORY_USAGE
 	bool "Print memory usage to stdout"
 	default y
@@ -750,7 +596,7 @@ config BUILD_OUTPUT_UF2_FAMILY_ID
 	default "0x1c5f21b0" if SOC_SERIES_ESP32
 	default "0x621e937a" if SOC_NRF52833_QIAA
 	default "0xada52840" if SOC_NRF52840_QIAA
-	default "0x4fb2d5bd" if SOC_SERIES_IMXRT10XX || SOC_SERIES_IMXRT11XX
+	default "0x4fb2d5bd" if SOC_SERIES_IMX_RT
 	default "0x2abc77ec" if SOC_SERIES_LPC55XXX
 	default "0xe48bff56" if SOC_SERIES_RP2XXX
 	default "0x68ed2b88" if SOC_SERIES_SAMD21
@@ -793,11 +639,6 @@ config BUILD_OUTPUT_STRIPPED
 	  Build a stripped binary zephyr/zephyr.strip in the build directory.
 	  The name of this file can be customized with CONFIG_KERNEL_BIN_NAME.
 
-config BUILD_OUTPUT_COMPRESS_DEBUG_SECTIONS
-	bool "Compress debug sections in the ELF file"
-	help
-	  Compress debug sections in the ELF file to reduce the file size.
-
 config BUILD_OUTPUT_ADJUST_LMA
 	string
 	help
@@ -822,23 +663,6 @@ config BUILD_OUTPUT_ADJUST_LMA
 	    default "$(dt_chosen_reg_addr_hex,$(DT_CHOSEN_IMAGE_M4))-\
 	             $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH))"
 
-config BUILD_OUTPUT_ADJUST_LMA_SECTIONS
-	def_string "*"
-	depends on BUILD_OUTPUT_ADJUST_LMA!=""
-	help
-	  This determines the output sections to which the above LMA adjustment
-	  will be applied.
-	  The value can be the name of a section in the final ELF, like "text".
-	  It can also be a pattern with wildcards, such as "*bss", which could
-	  match more than one section name. Multiple such patterns can be given
-	  as a ";"-separated list. It's possible to supply a 'negative' pattern
-	  starting with "!", to exclude sections matched by a preceding pattern.
-
-	  By default, all sections will have their LMA adjusted. The following
-	  example excludes one section produced by the code relocation feature:
-	  config BUILD_OUTPUT_ADJUST_LMA_SECTIONS
-	    default "*;!.extflash_text_reloc"
-
 config BUILD_OUTPUT_INFO_HEADER
 	bool "Create a image information header"
 	help
@@ -923,9 +747,7 @@ config BUILD_OUTPUT_STRIP_PATHS
 config CHECK_INIT_PRIORITIES
 	bool "Build time initialization priorities check"
 	default y
-	# If we are building a native_simulator target, we can only check the init priorities
-	# if we are building the final output but we are not assembling several images together
-	depends on !(NATIVE_LIBRARY && (!BUILD_OUTPUT_EXE || NATIVE_SIMULATOR_EXTRA_IMAGE_PATHS != ""))
+	depends on !NATIVE_LIBRARY
 	depends on "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "armclang"
 	help
 	  Check the build for initialization priority issues by comparing the
@@ -933,7 +755,16 @@ config CHECK_INIT_PRIORITIES
 	  derived from the devicetree definition.
 
 	  Fails the build on priority errors (dependent devices, inverted
-	  priority).
+	  priority), see CHECK_INIT_PRIORITIES_FAIL_ON_WARNING to fail on
+	  warnings (dependent devices, same priority) as well.
+
+config CHECK_INIT_PRIORITIES_FAIL_ON_WARNING
+	bool "Fail the build on priority check warnings"
+	depends on CHECK_INIT_PRIORITIES
+	help
+	  Fail the build if the dependency check script identifies any pair of
+	  devices depending on each other but initialized with the same
+	  priority.
 
 config EMIT_ALL_SYSCALLS
 	bool "Emit all possible syscalls in the tree"
@@ -949,8 +780,6 @@ config DEPRECATED
 	help
 	  Symbol that must be selected by a feature or module if it is
 	  considered to be deprecated.
-	  When adding this to an option, remember to follow the instructions in
-	  https://docs.zephyrproject.org/latest/develop/api/api_lifecycle.html#deprecated
 
 config WARN_DEPRECATED
 	bool
@@ -1009,7 +838,7 @@ config IS_BOOTLOADER
 	  a separate Zephyr image payload.
 
 config BOOTLOADER_SRAM_SIZE
-	int "SRAM reserved for bootloader [DEPRECATED]"
+	int "SRAM reserved for bootloader"
 	default 0
 	depends on !XIP || IS_BOOTLOADER
 	depends on ARM || XTENSA
@@ -1020,19 +849,14 @@ config BOOTLOADER_SRAM_SIZE
 	  - Zephyr is a !XIP image, which implicitly assumes existence of a
 	  bootloader that loads the Zephyr !XIP image onto SRAM.
 
-	  This option is deprecated, users should transition to using DTS to set this, if needed.
-	  To be removed after Zephyr 3.7 release.
-
-config BOOTLOADER_SRAM_SIZE_DEPRECATED
-	bool
-	default y
-	select DEPRECATED
-	depends on BOOTLOADER_SRAM_SIZE != 0
-	depends on !XIP || IS_BOOTLOADER
-	depends on ARM || XTENSA
+config BOOTLOADER_ESP_IDF
+	bool "ESP-IDF bootloader support"
+	depends on SOC_FAMILY_ESP32 && !BOOTLOADER_MCUBOOT && !MCUBOOT
+	default	y
 	help
-	  Non-prompt symbol to indicate that the deprecated BOOTLOADER_SRAM_SIZE Kconfig has a
-	  non-0 value. Please transition to using devicetree.
+	  This option will trigger the compilation of the ESP-IDF bootloader
+	  inside the build folder.
+	  At flash time, the bootloader will be flashed with the zephyr image
 
 config BOOTLOADER_BOSSA
 	bool "BOSSA bootloader support"
@@ -1079,17 +903,11 @@ endmenu
 
 menu "Compatibility"
 
-config LEGACY_GENERATED_INCLUDE_PATH
-	bool "Legacy include path for generated headers"
+config COMPAT_INCLUDES
+	bool "Suppress warnings when using header shims"
 	default y
 	help
-	  Allow applications and libraries to use the Zephyr legacy include
-	  path for the generated headers which does not use the `zephyr/` prefix.
-
-	  From now on, i.e., the preferred way to include the `version.h` header is to
-	  use <zephyr/version.h>, this Kconfig is currently enabled by default so that
-	  user applications won't immediately fail to compile.
-
-	  This Kconfig will be deprecated and eventually removed in the future releases.
+	  Suppress any warnings from the pre-processor when including
+	  deprecated header files.
 
 endmenu

README.rst

@@ -10,15 +10,12 @@
      </p>
    </a>
 
-   <a href="https://bestpractices.coreinfrastructure.org/projects/74">
-     <img src="https://bestpractices.coreinfrastructure.org/projects/74/badge">
-   </a>
-   <a href="https://scorecard.dev/viewer/?uri=github.com/zephyrproject-rtos/zephyr">
-     <img src="https://api.securityscorecards.dev/projects/github.com/zephyrproject-rtos/zephyr/badge">
-   </a>
-   <a href="https://github.com/zephyrproject-rtos/zephyr/actions/workflows/twister.yaml?query=branch%3Amain">
-     <img src="https://github.com/zephyrproject-rtos/zephyr/actions/workflows/twister.yaml/badge.svg?event=push">
-   </a>
+   <a href="https://bestpractices.coreinfrastructure.org/projects/74"><img
+   src="https://bestpractices.coreinfrastructure.org/projects/74/badge"></a>
+   <a
+   href="https://github.com/zephyrproject-rtos/zephyr/actions/workflows/twister.yaml?query=branch%3Amain">
+   <img
+   src="https://github.com/zephyrproject-rtos/zephyr/actions/workflows/twister.yaml/badge.svg?event=push"></a>
 
 
 The Zephyr Project is a scalable real-time operating system (RTOS) supporting

SDK_VERSION

@@ -1 +0,0 @@
-0.16.8

VERSION

@@ -1,5 +1,5 @@
 VERSION_MAJOR = 3
-VERSION_MINOR = 7
-PATCHLEVEL = 99
+VERSION_MINOR = 5
+PATCHLEVEL = 0
 VERSION_TWEAK = 0
 EXTRAVERSION =

arch/Kconfig

@@ -8,10 +8,8 @@
 # Include these first so that any properties (e.g. defaults) below can be
 # overridden (by defining symbols in multiple locations)
 
-source "$(ARCH_DIR)/Kconfig.$(HWM_SCHEME)"
-
-# ToDo: Generate a Kconfig.arch for loading of additional arch in HWMv2.
-osource "$(KCONFIG_BINARY_DIR)/Kconfig.arch"
+# Note: $ARCH might be a glob pattern
+source "$(ARCH_DIR)/$(ARCH)/Kconfig"
 
 # Architecture symbols
 #
@@ -21,10 +19,10 @@ osource "$(KCONFIG_BINARY_DIR)/Kconfig.arch"
 config ARC
 	bool
 	select ARCH_IS_SET
+	select HAS_DTS
 	imply XIP
 	select ARCH_HAS_THREAD_LOCAL_STORAGE
 	select ARCH_SUPPORTS_ROM_START
-	select ARCH_HAS_DIRECTED_IPIS
 	help
 	  ARC architecture
 
@@ -32,7 +30,7 @@ config ARM
 	bool
 	select ARCH_IS_SET
 	select ARCH_SUPPORTS_COREDUMP if CPU_CORTEX_M
-	select ARCH_SUPPORTS_COREDUMP_THREADS if CPU_CORTEX_M
+	select HAS_DTS
 	# FIXME: current state of the code for all ARM requires this, but
 	# is really only necessary for Cortex-M with ARM MPU!
 	select GEN_PRIV_STACKS
@@ -45,6 +43,7 @@ config ARM64
 	bool
 	select ARCH_IS_SET
 	select 64BIT
+	select HAS_DTS
 	select ARCH_SUPPORTS_COREDUMP
 	select HAS_ARM_SMCCC
 	select ARCH_HAS_THREAD_LOCAL_STORAGE
@@ -52,7 +51,6 @@ config ARM64
 	select USE_SWITCH_SUPPORTED
 	select IRQ_OFFLOAD_NESTED if IRQ_OFFLOAD
 	select BARRIER_OPERATIONS_ARCH
-	select ARCH_HAS_DIRECTED_IPIS
 	help
 	  ARM64 (AArch64) architecture
 
@@ -60,12 +58,14 @@ config MIPS
 	bool
 	select ARCH_IS_SET
 	select ATOMIC_OPERATIONS_C
+	select HAS_DTS
 	help
 	  MIPS architecture
 
 config SPARC
 	bool
 	select ARCH_IS_SET
+	select HAS_DTS
 	select USE_SWITCH
 	select USE_SWITCH_SUPPORTED
 	select BIG_ENDIAN
@@ -80,6 +80,7 @@ config X86
 	bool
 	select ARCH_IS_SET
 	select ATOMIC_OPERATIONS_BUILTIN
+	select HAS_DTS
 	select ARCH_SUPPORTS_COREDUMP
 	select ARCH_SUPPORTS_ROM_START if !X86_64
 	select CPU_HAS_MMU
@@ -88,13 +89,12 @@ config X86
 	select ARCH_HAS_GDBSTUB if !X86_64
 	select ARCH_HAS_TIMING_FUNCTIONS
 	select ARCH_HAS_THREAD_LOCAL_STORAGE
-	select ARCH_HAS_DEMAND_PAGING if !X86_64
+	select ARCH_HAS_DEMAND_PAGING
 	select IRQ_OFFLOAD_NESTED if IRQ_OFFLOAD
 	select NEED_LIBC_MEM_PARTITION if USERSPACE && TIMING_FUNCTIONS \
 					  && !BOARD_HAS_TIMING_FUNCTIONS \
 					  && !SOC_HAS_TIMING_FUNCTIONS
 	select ARCH_HAS_STACK_CANARIES_TLS
-	select ARCH_SUPPORTS_MEM_MAPPED_STACKS if X86_MMU && !DEMAND_PAGING
 	help
 	  x86 architecture
 
@@ -102,6 +102,7 @@ config NIOS2
 	bool
 	select ARCH_IS_SET
 	select ATOMIC_OPERATIONS_C
+	select HAS_DTS
 	imply XIP
 	select ARCH_HAS_TIMING_FUNCTIONS
 	help
@@ -110,16 +111,15 @@ config NIOS2
 config RISCV
 	bool
 	select ARCH_IS_SET
+	select HAS_DTS
 	select ARCH_SUPPORTS_COREDUMP
-	select ARCH_SUPPORTS_ROM_START if !SOC_FAMILY_ESPRESSIF_ESP32
+	select ARCH_SUPPORTS_ROM_START if !SOC_SERIES_ESP32C3
 	select ARCH_HAS_CODE_DATA_RELOCATION
 	select ARCH_HAS_THREAD_LOCAL_STORAGE
-	select ARCH_HAS_STACKWALK
 	select IRQ_OFFLOAD_NESTED if IRQ_OFFLOAD
 	select USE_SWITCH_SUPPORTED
 	select USE_SWITCH
 	select SCHED_IPI_SUPPORTED if SMP
-	select ARCH_HAS_DIRECTED_IPIS
 	select BARRIER_OPERATIONS_BUILTIN
 	imply XIP
 	help
@@ -128,20 +128,20 @@ config RISCV
 config XTENSA
 	bool
 	select ARCH_IS_SET
+	select HAS_DTS
 	select USE_SWITCH
 	select USE_SWITCH_SUPPORTED
 	select IRQ_OFFLOAD_NESTED if IRQ_OFFLOAD
 	select ARCH_HAS_CODE_DATA_RELOCATION
 	select ARCH_HAS_TIMING_FUNCTIONS
-	select ARCH_MEM_DOMAIN_DATA if USERSPACE
-	select ARCH_HAS_DIRECTED_IPIS
-	select THREAD_STACK_INFO
+	imply ATOMIC_OPERATIONS_ARCH
 	help
 	  Xtensa architecture
 
 config ARCH_POSIX
 	bool
 	select ARCH_IS_SET
+	select HAS_DTS
 	select ATOMIC_OPERATIONS_BUILTIN
 	select ARCH_HAS_CUSTOM_SWAP_TO_MAIN
 	select ARCH_HAS_CUSTOM_BUSY_WAIT
@@ -149,14 +149,6 @@ config ARCH_POSIX
 	select NATIVE_BUILD
 	select HAS_COVERAGE_SUPPORT
 	select BARRIER_OPERATIONS_BUILTIN
-	# POSIX arch based targets get their memory cleared on entry by the host OS
-	select SKIP_BSS_CLEAR
-	# Override the C standard used for compilation to C 2011
-	# This is due to some tests using _Static_assert which is a 2011 feature, but
-	# otherwise relying on compilers supporting it also when set to C99.
-	# This was in general ok, but with some host compilers and C library versions
-	# it led to problems. So we override it to 2011 for the native targets.
-	select REQUIRES_STD_C11
 	help
 	  POSIX (native) architecture
 
@@ -216,7 +208,7 @@ config SRAM_BASE_ADDRESS
 	hex "SRAM Base Address"
 	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_SRAM))
 	help
-	  The SRAM base address. The default value comes from
+	  The SRAM base address. The default value comes from from
 	  /chosen/zephyr,sram in devicetree. The user should generally avoid
 	  changing it via menuconfig or in configuration files.
 
@@ -228,7 +220,6 @@ DT_CHOSEN_Z_FLASH := zephyr,flash
 config FLASH_SIZE
 	int "Flash Size in kB"
 	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K) if (XIP && (ARM ||ARM64)) || !ARM
-	default 0 if !XIP
 	help
 	  This option specifies the size of the flash in kB.  It is normally set by
 	  the board's defconfig file and the user should generally avoid modifying
@@ -237,7 +228,6 @@ config FLASH_SIZE
 config FLASH_BASE_ADDRESS
 	hex "Flash Base Address"
 	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH)) if (XIP && (ARM || ARM64)) || !ARM
-	default 0 if !XIP
 	help
 	  This option specifies the base address of the flash on the board. It is
 	  normally set by the board's defconfig file and the user should generally
@@ -407,46 +397,8 @@ config NOCACHE_MEMORY
 	  transfers when cache coherence issues are not optimal or can not
 	  be solved using cache maintenance operations.
 
-config FRAME_POINTER
-	bool "Compile the kernel with frame pointers"
-	select OVERRIDE_FRAME_POINTER_DEFAULT
-	help
-	  Select Y here to gain precise stack traces at the expense of slightly
-	  increased size and decreased speed.
-
-config ARCH_STACKWALK_MAX_FRAMES
-	int "Max depth for stack walk function"
-	default 8
-	depends on ARCH_HAS_STACKWALK
-	help
-	  Depending on implementation, this can place a hard limit on the depths of the stack
-	  for the stack walk function to examine.
-
 menu "Interrupt Configuration"
 
-config ISR_TABLES_LOCAL_DECLARATION_SUPPORTED
-	bool
-	default y
-	# Userspace is currently not supported
-	depends on !USERSPACE
-	# List of currently supported architectures
-	depends on ARM || ARM64
-	# List of currently supported toolchains
-	depends on "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr" || "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "gnuarmemb"
-
-config ISR_TABLES_LOCAL_DECLARATION
-	bool "ISR tables created locally and placed by linker [EXPERIMENTAL]"
-	depends on ISR_TABLES_LOCAL_DECLARATION_SUPPORTED
-	select EXPERIMENTAL
-	help
-	  Enable new scheme of interrupt tables generation.
-	  This is totally different generator that would create tables entries locally
-	  where the IRQ_CONNECT macro is called and then use the linker script to position it
-	  in the right place in memory.
-	  The most important advantage of such approach is that the generated interrupt tables
-	  are LTO compatible.
-	  The drawback is that the support on the architecture port is required.
-
 config DYNAMIC_INTERRUPTS
 	bool "Installation of IRQs at runtime"
 	help
@@ -569,16 +521,6 @@ config IRQ_OFFLOAD_NESTED
 	  synchronous nested interrupt on the current CPU.  Not all
 	  hardware is capable.
 
-config EXCEPTION_DEBUG
-	bool "Unhandled exception debugging"
-	default y
-	depends on PRINTK || LOG
-	help
-	  Install handlers for various CPU exception/trap vectors to
-	  make debugging them easier, at a small expense in code size.
-	  This prints out the specific exception vector and any associated
-	  error codes.
-
 config EXTRA_EXCEPTION_INFO
 	bool "Collect extra exception info"
 	depends on ARCH_HAS_EXTRA_EXCEPTION_INFO
@@ -655,9 +597,6 @@ config ARCH_HAS_NESTED_EXCEPTION_DETECTION
 config ARCH_SUPPORTS_COREDUMP
 	bool
 
-config ARCH_SUPPORTS_COREDUMP_THREADS
-	bool
-
 config ARCH_SUPPORTS_ARCH_HW_INIT
 	bool
 
@@ -670,11 +609,6 @@ config ARCH_HAS_EXTRA_EXCEPTION_INFO
 config ARCH_HAS_GDBSTUB
 	bool
 
-config ARCH_HAS_STACKWALK
-	bool
-	help
-	  This is selected when the architecture implemented the arch_stack_walk() API.
-
 config ARCH_HAS_COHERENCE
 	bool
 	help
@@ -693,11 +627,6 @@ config ARCH_HAS_SUSPEND_TO_RAM
 config ARCH_HAS_STACK_CANARIES_TLS
 	bool
 
-config ARCH_SUPPORTS_MEM_MAPPED_STACKS
-	bool
-	help
-	  Select when the architecture supports memory mapped stacks.
-
 #
 # Other architecture related options
 #
@@ -734,11 +663,6 @@ config CPU_HAS_FPU
 	  This option is enabled when the CPU has hardware floating point
 	  unit.
 
-config CPU_HAS_DSP
-	bool
-	help
-	  This option is enabled when the CPU has hardware DSP unit.
-
 config CPU_HAS_FPU_DOUBLE_PRECISION
 	bool
 	select CPU_HAS_FPU
@@ -771,25 +695,11 @@ config ARCH_HAS_RESERVED_PAGE_FRAMES
 	  memory mappings. The architecture will need to implement
 	  arch_reserved_pages_update().
 
-config ARCH_HAS_DIRECTED_IPIS
-	bool
-	help
-	  This hidden configuration should be selected by the architecture if
-	  it has an implementation for arch_sched_directed_ipi() which allows
-	  for IPIs to be directed to specific CPUs.
-
 config CPU_HAS_DCACHE
 	bool
 	help
 	  This hidden configuration should be selected when the CPU has a d-cache.
 
-config CPU_CACHE_INCOHERENT
-	bool
-	help
-	  This hidden configuration should be selected when the CPU has
-	  incoherent cache. This applies to intra-CPU multiprocessing
-	  incoherence and makes only sense when MP_NUM_CPUS > 1.
-
 config CPU_HAS_ICACHE
 	bool
 	help
@@ -813,7 +723,7 @@ config ARCH_MAPS_ALL_RAM
 	  virtual addresses elsewhere, this is limited to only management of the
 	  virtual address space. The kernel's page frame ontology will not consider
 	  this mapping at all; non-kernel pages will be considered free (unless marked
-	  as reserved) and K_MEM_PAGE_FRAME_MAPPED will not be set.
+	  as reserved) and Z_PAGE_FRAME_MAPPED will not be set.
 
 config DCLS
 	bool "Processor is configured in DCLS mode"
@@ -917,17 +827,6 @@ config CODE_DATA_RELOCATION
 	  the target regions should be specified in CMakeLists.txt using
 	  zephyr_code_relocate().
 
-menu "DSP Options"
-
-config DSP_SHARING
-	bool "DSP register sharing"
-	depends on CPU_HAS_DSP
-	help
-	  This option enables preservation of the hardware DSP registers
-	  across context switches to allow multiple threads to perform concurrent
-	  DSP operations.
-endmenu
-
 menu "Floating Point Options"
 
 config FPU
@@ -985,17 +884,6 @@ config ICACHE
 	help
 	  This option enables the support for the instruction cache (i-cache).
 
-config CACHE_DOUBLEMAP
-	bool "Cache double-mapping support"
-	depends on CPU_CACHE_INCOHERENT
-	default y
-	help
-	  Double-mapping behavior where a pointer can be cheaply converted to
-	  point to the same cached/uncached memory at different locations.
-
-	  This applies to intra-CPU multiprocessing incoherence and makes only
-	  sense when MP_NUM_CPUS > 1.
-
 config CACHE_MANAGEMENT
 	bool "Cache management features"
 	depends on DCACHE || ICACHE
@@ -1072,34 +960,29 @@ config ARCH
 	help
 	  System architecture string.
 
+config SOC
+	string
+	help
+	  SoC name which can be found under soc/<arch>/<soc name>.
+	  This option holds the directory name used by the build system to locate
+	  the correct linker and header files for the SoC.
+
+config SOC_SERIES
+	string
+	help
+	  SoC series name which can be found under soc/<arch>/<family>/<series>.
+	  This option holds the directory name used by the build system to locate
+	  the correct linker and header files.
+
+config SOC_FAMILY
+	string
+	help
+	  SoC family name which can be found under soc/<arch>/<family>.
+	  This option holds the directory name used by the build system to locate
+	  the correct linker and header files.
+
 config TOOLCHAIN_HAS_BUILTIN_FFS
 	bool
 	default y if !(64BIT && RISCV)
 	help
 	  Hidden option to signal that toolchain has __builtin_ffs*().
-
-config ARCH_HAS_CUSTOM_CPU_IDLE
-	bool
-	help
-	  This options allows applications to override the default arch idle implementation with
-	  a custom one.
-
-config ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
-	bool
-	help
-	  This options allows applications to override the default arch idle implementation with
-	  a custom one.
-
-config ARCH_HAS_CUSTOM_SWAP_TO_MAIN
-	bool
-	help
-	  It's possible that an architecture port cannot use _Swap() to swap to
-	  the _main() thread, but instead must do something custom. It must
-	  enable this option in that case.
-
-config ARCH_HAS_CUSTOM_BUSY_WAIT
-	bool
-	help
-	  It's possible that an architecture port cannot or does not want to use
-	  the provided k_busy_wait(), but instead must do something custom. It must
-	  enable this option in that case.

arch/Kconfig.v1

@@ -1,5 +0,0 @@
-# Copyright (c) 2023 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-# Note: $ARCH might be a glob pattern
-source "$(ARCH_DIR)/$(ARCH)/Kconfig"

arch/Kconfig.v2

@@ -1,5 +0,0 @@
-# Copyright (c) 2023 Nordic Semiconductor ASA
-
-# SPDX-License-Identifier: Apache-2.0
-
-source "$(KCONFIG_BINARY_DIR)/arch/Kconfig"

arch/arc/Kconfig

@@ -9,6 +9,7 @@ menu "ARC Options"
 config ARCH
 	default "arc"
 
+
 config CPU_ARCEM
 	bool
 	select ATOMIC_OPERATIONS_C
@@ -18,7 +19,6 @@ config CPU_ARCEM
 config CPU_ARCHS
 	bool
 	select ATOMIC_OPERATIONS_BUILTIN
-	select BARRIER_OPERATIONS_BUILTIN
 	help
 	  This option signifies the use of an ARC HS CPU
 
@@ -253,17 +253,20 @@ config ARC_USE_UNALIGNED_MEM_ACCESS
 	  to support unaligned memory access which is then disabled by default.
 	  Enable unaligned access in hardware and make software to use it.
 
-config ARC_CURRENT_THREAD_USE_NO_TLS
-	bool
-	select CURRENT_THREAD_USE_NO_TLS
-	default y if (RGF_NUM_BANKS > 1) || ("$(ZEPHYR_TOOLCHAIN_VARIANT)" = "arcmwdt")
+config FAULT_DUMP
+	int "Fault dump level"
+	default 2
+	range 0 2
 	help
-	  Disable current Thread Local Storage for ARC. For cores with more then one
-	  RGF_NUM_BANKS the parameter is disabled by-default because banks syncronization
-	  requires significant time, and it slows down performance.
-	  ARCMWDT works with tls pointer in different way then GCC. Optimized access to
-	  TLS pointer via _current variable does not provide significant advantages
-	  in case of MetaWare.
+	  Different levels for display information when a fault occurs.
+
+	  2: The default. Display specific and verbose information. Consumes
+		the most memory (long strings).
+
+	  1: Display general and short information. Consumes less memory
+		(short strings).
+
+	  0: Off.
 
 config GEN_ISR_TABLES
 	default y
@@ -373,6 +376,15 @@ config ARC_EXCEPTION_STACK_SIZE
 
 endmenu
 
+config ARC_EXCEPTION_DEBUG
+	bool "Unhandled exception debugging information"
+	default n
+	depends on PRINTK || LOG
+	help
+	  Print human-readable information about exception vectors, cause codes,
+	  and parameters, at a cost of code/data size for the human-readable
+	  strings.
+
 config ARC_EARLY_SOC_INIT
 	bool "Make early stage SoC-specific initialization"
 	help
@@ -380,6 +392,8 @@ config ARC_EARLY_SOC_INIT
 	  (before C runtime initialization). Setup code is called in form of
 	  soc_early_asm_init_percpu assembler macro.
 
+endmenu
+
 config MAIN_STACK_SIZE
 	default 4096 if 64BIT
 
@@ -406,5 +420,3 @@ config CMSIS_V2_THREAD_MAX_STACK_SIZE
 
 config CMSIS_V2_THREAD_DYNAMIC_STACK_SIZE
 	default 2048 if 64BIT
-
-endmenu

arch/arc/core/CMakeLists.txt

@@ -26,7 +26,7 @@ zephyr_library_sources_ifdef(CONFIG_IRQ_OFFLOAD irq_offload.c)
 
 zephyr_library_sources_ifdef(CONFIG_USERSPACE userspace.S)
 zephyr_library_sources_ifdef(CONFIG_ARC_CONNECT arc_connect.c)
-zephyr_library_sources_ifdef(CONFIG_ARC_CONNECT smp.c)
+zephyr_library_sources_ifdef(CONFIG_ARC_CONNECT arc_smp.c)
 
 zephyr_library_sources_ifdef(CONFIG_THREAD_LOCAL_STORAGE tls.c)
 

arch/arc/core/arc_smp.c

@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2019 Synopsys.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief codes required for ARC multicore and Zephyr smp support
+ *
+ */
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
+#include <ksched.h>
+#include <zephyr/init.h>
+#include <zephyr/irq.h>
+#include <arc_irq_offload.h>
+
+volatile struct {
+	arch_cpustart_t fn;
+	void *arg;
+} arc_cpu_init[CONFIG_MP_MAX_NUM_CPUS];
+
+/*
+ * arc_cpu_wake_flag is used to sync up master core and slave cores
+ * Slave core will spin for arc_cpu_wake_flag until master core sets
+ * it to the core id of slave core. Then, slave core clears it to notify
+ * master core that it's waken
+ *
+ */
+volatile uint32_t arc_cpu_wake_flag;
+
+volatile char *arc_cpu_sp;
+/*
+ * _curr_cpu is used to record the struct of _cpu_t of each cpu.
+ * for efficient usage in assembly
+ */
+volatile _cpu_t *_curr_cpu[CONFIG_MP_MAX_NUM_CPUS];
+
+/* Called from Zephyr initialization */
+void arch_start_cpu(int cpu_num, k_thread_stack_t *stack, int sz,
+		    arch_cpustart_t fn, void *arg)
+{
+	_curr_cpu[cpu_num] = &(_kernel.cpus[cpu_num]);
+	arc_cpu_init[cpu_num].fn = fn;
+	arc_cpu_init[cpu_num].arg = arg;
+
+	/* set the initial sp of target sp through arc_cpu_sp
+	 * arc_cpu_wake_flag will protect arc_cpu_sp that
+	 * only one slave cpu can read it per time
+	 */
+	arc_cpu_sp = Z_KERNEL_STACK_BUFFER(stack) + sz;
+
+	arc_cpu_wake_flag = cpu_num;
+
+	/* wait slave cpu to start */
+	while (arc_cpu_wake_flag != 0U) {
+		;
+	}
+}
+
+#ifdef CONFIG_SMP
+static void arc_connect_debug_mask_update(int cpu_num)
+{
+	uint32_t core_mask = 1 << cpu_num;
+
+	/*
+	 * MDB debugger may modify debug_select and debug_mask registers on start, so we can't
+	 * rely on debug_select reset value.
+	 */
+	if (cpu_num != ARC_MP_PRIMARY_CPU_ID) {
+		core_mask |= z_arc_connect_debug_select_read();
+	}
+
+	z_arc_connect_debug_select_set(core_mask);
+	/* Debugger halts cores at all conditions:
+	 * ARC_CONNECT_CMD_DEBUG_MASK_H: Core global halt.
+	 * ARC_CONNECT_CMD_DEBUG_MASK_AH: Actionpoint halt.
+	 * ARC_CONNECT_CMD_DEBUG_MASK_BH: Software breakpoint halt.
+	 * ARC_CONNECT_CMD_DEBUG_MASK_SH: Self halt.
+	 */
+	z_arc_connect_debug_mask_set(core_mask,	(ARC_CONNECT_CMD_DEBUG_MASK_SH
+		| ARC_CONNECT_CMD_DEBUG_MASK_BH | ARC_CONNECT_CMD_DEBUG_MASK_AH
+		| ARC_CONNECT_CMD_DEBUG_MASK_H));
+}
+#endif
+
+void arc_core_private_intc_init(void);
+
+/* the C entry of slave cores */
+void z_arc_slave_start(int cpu_num)
+{
+	arch_cpustart_t fn;
+
+#ifdef CONFIG_SMP
+	struct arc_connect_bcr bcr;
+
+	bcr.val = z_arc_v2_aux_reg_read(_ARC_V2_CONNECT_BCR);
+
+	if (bcr.dbg) {
+		/* configure inter-core debug unit if available */
+		arc_connect_debug_mask_update(cpu_num);
+	}
+
+	z_irq_setup();
+
+	arc_core_private_intc_init();
+
+	arc_irq_offload_init_smp();
+
+	z_arc_connect_ici_clear();
+	z_irq_priority_set(DT_IRQN(DT_NODELABEL(ici)),
+			   DT_IRQ(DT_NODELABEL(ici), priority), 0);
+	irq_enable(DT_IRQN(DT_NODELABEL(ici)));
+#endif
+	/* call the function set by arch_start_cpu */
+	fn = arc_cpu_init[cpu_num].fn;
+
+	fn(arc_cpu_init[cpu_num].arg);
+}
+
+#ifdef CONFIG_SMP
+
+static void sched_ipi_handler(const void *unused)
+{
+	ARG_UNUSED(unused);
+
+	z_arc_connect_ici_clear();
+	z_sched_ipi();
+}
+
+/* arch implementation of sched_ipi */
+void arch_sched_ipi(void)
+{
+	uint32_t i;
+
+	/* broadcast sched_ipi request to other cores
+	 * if the target is current core, hardware will ignore it
+	 */
+	unsigned int num_cpus = arch_num_cpus();
+
+	for (i = 0U; i < num_cpus; i++) {
+		z_arc_connect_ici_generate(i);
+	}
+}
+
+static int arc_smp_init(void)
+{
+	struct arc_connect_bcr bcr;
+
+	/* necessary master core init */
+	_curr_cpu[0] = &(_kernel.cpus[0]);
+
+	bcr.val = z_arc_v2_aux_reg_read(_ARC_V2_CONNECT_BCR);
+
+	if (bcr.dbg) {
+		/* configure inter-core debug unit if available */
+		arc_connect_debug_mask_update(ARC_MP_PRIMARY_CPU_ID);
+	}
+
+	if (bcr.ipi) {
+	/* register ici interrupt, just need master core to register once */
+		z_arc_connect_ici_clear();
+		IRQ_CONNECT(DT_IRQN(DT_NODELABEL(ici)),
+			    DT_IRQ(DT_NODELABEL(ici), priority),
+			    sched_ipi_handler, NULL, 0);
+
+		irq_enable(DT_IRQN(DT_NODELABEL(ici)));
+	} else {
+		__ASSERT(0,
+			"ARC connect has no inter-core interrupt\n");
+		return -ENODEV;
+	}
+
+	if (bcr.gfrc) {
+		/* global free running count init */
+		z_arc_connect_gfrc_enable();
+
+		/* when all cores halt, gfrc halt */
+		z_arc_connect_gfrc_core_set((1 << arch_num_cpus()) - 1);
+		z_arc_connect_gfrc_clear();
+	} else {
+		__ASSERT(0,
+			"ARC connect has no global free running counter\n");
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+SYS_INIT(arc_smp_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+#endif

arch/arc/core/cache.c

@@ -218,7 +218,8 @@ int arch_icache_flush_and_invd_range(void *addr, size_t size)
 
 static int init_dcache(void)
 {
-	sys_cache_data_enable();
+
+	arch_dcache_enable();
 
 #if defined(CONFIG_DCACHE_LINE_SIZE_DETECT)
 	init_dcache_line_size();

arch/arc/core/cpu_idle.S

@@ -26,7 +26,6 @@ SECTION_VAR(BSS, z_arc_cpu_sleep_mode)
 	.align 4
 	.word 0
 
-#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE
 /*
  * @brief Put the CPU in low-power mode
  *
@@ -49,9 +48,7 @@ SECTION_FUNC(TEXT, arch_cpu_idle)
 	sleep r1
 	j_s [blink]
 	nop
-#endif
 
-#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 /*
  * @brief Put the CPU in low-power mode, entered with IRQs locked
  *
@@ -59,7 +56,6 @@ SECTION_FUNC(TEXT, arch_cpu_idle)
  *
  * void arch_cpu_atomic_idle(unsigned int key)
  */
-
 SECTION_FUNC(TEXT, arch_cpu_atomic_idle)
 
 #ifdef CONFIG_TRACING
@@ -74,4 +70,3 @@ SECTION_FUNC(TEXT, arch_cpu_atomic_idle)
 	sleep r1
 	j_s.d [blink]
 	seti r0
-#endif

arch/arc/core/dsp/Kconfig

@@ -3,8 +3,13 @@
 # Copyright (c) 2022 Synopsys
 # SPDX-License-Identifier: Apache-2.0
 
+config ARC_HAS_DSP
+	bool
+	help
+	  This option is enabled when the ARC CPU has hardware DSP unit.
+
 menu "ARC DSP Options"
-depends on CPU_HAS_DSP
+depends on ARC_HAS_DSP
 
 config ARC_DSP
 	bool "digital signal processing (DSP)"
@@ -17,7 +22,7 @@ config ARC_DSP_TURNED_OFF
 	help
 	  This option disables DSP block via resetting DSP_CRTL register.
 
-config DSP_SHARING
+config ARC_DSP_SHARING
 	bool "DSP register sharing"
 	depends on ARC_DSP && MULTITHREADING
 	select ARC_HAS_ACCL_REGS
@@ -44,7 +49,7 @@ config ARC_XY_ENABLE
 config ARC_AGU_SHARING
 	bool "ARC address generation unit register sharing"
 	depends on ARC_XY_ENABLE && MULTITHREADING
-	default y if DSP_SHARING
+	default y if ARC_DSP_SHARING
 	help
 	  This option enables preservation of the hardware AGU registers
 	  across context switches to allow multiple threads to perform concurrent

arch/arc/core/dsp/dsp_offsets.c

@@ -9,7 +9,7 @@
  * @brief ARCv2 DSP and AGU structure member offset definition file
  *
  */
-#ifdef CONFIG_DSP_SHARING
+#ifdef CONFIG_ARC_DSP_SHARING
 GEN_OFFSET_SYM(_callee_saved_stack_t, dsp_ctrl);
 GEN_OFFSET_SYM(_callee_saved_stack_t, acc0_glo);
 GEN_OFFSET_SYM(_callee_saved_stack_t, acc0_ghi);

arch/arc/core/dsp/swap_dsp_macros.h

@@ -10,7 +10,7 @@
  *
  */
 .macro _save_dsp_regs
-#ifdef CONFIG_DSP_SHARING
+#ifdef CONFIG_ARC_DSP_SHARING
 	ld_s r13, [r2, ___thread_base_t_user_options_OFFSET]
 	bbit0 r13, K_DSP_IDX, dsp_skip_save
 	lr r13, [_ARC_V2_DSP_CTRL]
@@ -136,7 +136,7 @@ agu_skip_save :
 .endm
 
 .macro _load_dsp_regs
-#ifdef CONFIG_DSP_SHARING
+#ifdef CONFIG_ARC_DSP_SHARING
 	ld_s r13, [r2, ___thread_base_t_user_options_OFFSET]
 	bbit0 r13, K_DSP_IDX, dsp_skip_load
 	ld_s r13, [sp, ___callee_saved_stack_t_dsp_ctrl_OFFSET]

arch/arc/core/fatal.c

@@ -17,38 +17,36 @@
 #include <zephyr/arch/cpu.h>
 #include <zephyr/logging/log.h>
 #include <kernel_arch_data.h>
-#include <zephyr/arch/arc/v2/exception.h>
-#include <err_dump_handling.h>
+#include <zephyr/arch/arc/v2/exc.h>
 
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
-#ifdef CONFIG_EXCEPTION_DEBUG
-static void dump_arc_esf(const struct arch_esf *esf)
+#ifdef CONFIG_ARC_EXCEPTION_DEBUG
+static void dump_arc_esf(const z_arch_esf_t *esf)
 {
-	ARC_EXCEPTION_DUMP(" r0: 0x%" PRIxPTR "  r1: 0x%" PRIxPTR "  r2: 0x%" PRIxPTR
-		"  r3: 0x%" PRIxPTR "", esf->r0, esf->r1, esf->r2, esf->r3);
-	ARC_EXCEPTION_DUMP(" r4: 0x%" PRIxPTR "  r5: 0x%" PRIxPTR "  r6: 0x%" PRIxPTR
-		"  r7: 0x%" PRIxPTR "", esf->r4, esf->r5, esf->r6, esf->r7);
-	ARC_EXCEPTION_DUMP(" r8: 0x%" PRIxPTR "  r9: 0x%" PRIxPTR " r10: 0x%" PRIxPTR
-		" r11: 0x%" PRIxPTR "", esf->r8, esf->r9, esf->r10, esf->r11);
-	ARC_EXCEPTION_DUMP("r12: 0x%" PRIxPTR " r13: 0x%" PRIxPTR "  pc: 0x%" PRIxPTR "",
+	LOG_ERR(" r0: 0x%" PRIxPTR "  r1: 0x%" PRIxPTR "  r2: 0x%" PRIxPTR "  r3: 0x%" PRIxPTR "",
+		esf->r0, esf->r1, esf->r2, esf->r3);
+	LOG_ERR(" r4: 0x%" PRIxPTR "  r5: 0x%" PRIxPTR "  r6: 0x%" PRIxPTR "  r7: 0x%" PRIxPTR "",
+		esf->r4, esf->r5, esf->r6, esf->r7);
+	LOG_ERR(" r8: 0x%" PRIxPTR "  r9: 0x%" PRIxPTR " r10: 0x%" PRIxPTR " r11: 0x%" PRIxPTR "",
+		esf->r8, esf->r9, esf->r10, esf->r11);
+	LOG_ERR("r12: 0x%" PRIxPTR " r13: 0x%" PRIxPTR "  pc: 0x%" PRIxPTR "",
 		esf->r12, esf->r13, esf->pc);
-	ARC_EXCEPTION_DUMP(" blink: 0x%" PRIxPTR " status32: 0x%" PRIxPTR "",
-		esf->blink, esf->status32);
+	LOG_ERR(" blink: 0x%" PRIxPTR " status32: 0x%" PRIxPTR "", esf->blink, esf->status32);
 #ifdef CONFIG_ARC_HAS_ZOL
-	ARC_EXCEPTION_DUMP("lp_end: 0x%" PRIxPTR " lp_start: 0x%" PRIxPTR
-			" lp_count: 0x%" PRIxPTR "", esf->lp_end, esf->lp_start, esf->lp_count);
+	LOG_ERR("lp_end: 0x%" PRIxPTR " lp_start: 0x%" PRIxPTR " lp_count: 0x%" PRIxPTR "",
+		esf->lp_end, esf->lp_start, esf->lp_count);
 #endif /* CONFIG_ARC_HAS_ZOL */
 }
 #endif
 
-void z_arc_fatal_error(unsigned int reason, const struct arch_esf *esf)
+void z_arc_fatal_error(unsigned int reason, const z_arch_esf_t *esf)
 {
-#ifdef CONFIG_EXCEPTION_DEBUG
+#ifdef CONFIG_ARC_EXCEPTION_DEBUG
 	if (esf != NULL) {
 		dump_arc_esf(esf);
 	}
-#endif /* CONFIG_EXCEPTION_DEBUG */
+#endif /* CONFIG_ARC_EXCEPTION_DEBUG */
 
 	z_fatal_error(reason, esf);
 }

arch/arc/core/fault.c

@@ -20,8 +20,6 @@
 #include <zephyr/kernel_structs.h>
 #include <zephyr/arch/common/exc_handle.h>
 #include <zephyr/logging/log.h>
-#include <err_dump_handling.h>
-
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 #ifdef CONFIG_USERSPACE
@@ -53,8 +51,9 @@ static const struct z_exc_handle exceptions[] = {
  */
 static bool z_check_thread_stack_fail(const uint32_t fault_addr, uint32_t sp)
 {
-#if defined(CONFIG_MULTITHREADING)
 	uint32_t guard_end, guard_start;
+
+#if defined(CONFIG_MULTITHREADING)
 	const struct k_thread *thread = _current;
 
 	if (!thread) {
@@ -70,7 +69,7 @@ static bool z_check_thread_stack_fail(const uint32_t fault_addr, uint32_t sp)
 			 * "guard" installed in this case, instead what's
 			 * happening is that the stack pointer is crashing
 			 * into the privilege mode stack buffer which
-			 * immediately precedes it.
+			 * immediately precededs it.
 			 */
 			guard_end = thread->stack_info.start;
 			guard_start = (uint32_t)thread->stack_obj;
@@ -89,6 +88,7 @@ static bool z_check_thread_stack_fail(const uint32_t fault_addr, uint32_t sp)
 		guard_end = thread->stack_info.start;
 		guard_start = guard_end - Z_ARC_STACK_GUARD_SIZE;
 	}
+#endif /* CONFIG_MULTITHREADING */
 
 	 /* treat any MPU exceptions within the guard region as a stack
 	  * overflow.As some instrustions
@@ -99,13 +99,12 @@ static bool z_check_thread_stack_fail(const uint32_t fault_addr, uint32_t sp)
 	if (fault_addr < guard_end && fault_addr >= guard_start) {
 		return true;
 	}
-#endif /* CONFIG_MULTITHREADING */
 
 	return false;
 }
 #endif
 
-#ifdef CONFIG_EXCEPTION_DEBUG
+#ifdef CONFIG_ARC_EXCEPTION_DEBUG
 /* For EV_ProtV, the numbering/semantics of the parameter are consistent across
  * several codes, although not all combination will be reported.
  *
@@ -138,32 +137,32 @@ static void dump_protv_exception(uint32_t cause, uint32_t parameter)
 {
 	switch (cause) {
 	case 0x0:
-		ARC_EXCEPTION_DUMP("Instruction fetch violation (%s)",
+		LOG_ERR("Instruction fetch violation (%s)",
 			get_protv_access_err(parameter));
 		break;
 	case 0x1:
-		ARC_EXCEPTION_DUMP("Memory read protection violation (%s)",
+		LOG_ERR("Memory read protection violation (%s)",
 			get_protv_access_err(parameter));
 		break;
 	case 0x2:
-		ARC_EXCEPTION_DUMP("Memory write protection violation (%s)",
+		LOG_ERR("Memory write protection violation (%s)",
 			get_protv_access_err(parameter));
 		break;
 	case 0x3:
-		ARC_EXCEPTION_DUMP("Memory read-modify-write violation (%s)",
+		LOG_ERR("Memory read-modify-write violation (%s)",
 			get_protv_access_err(parameter));
 		break;
 	case 0x10:
-		ARC_EXCEPTION_DUMP("Normal vector table in secure memory");
+		LOG_ERR("Normal vector table in secure memory");
 		break;
 	case 0x11:
-		ARC_EXCEPTION_DUMP("NS handler code located in S memory");
+		LOG_ERR("NS handler code located in S memory");
 		break;
 	case 0x12:
-		ARC_EXCEPTION_DUMP("NSC Table Range Violation");
+		LOG_ERR("NSC Table Range Violation");
 		break;
 	default:
-		ARC_EXCEPTION_DUMP("unknown");
+		LOG_ERR("unknown");
 		break;
 	}
 }
@@ -172,46 +171,46 @@ static void dump_machine_check_exception(uint32_t cause, uint32_t parameter)
 {
 	switch (cause) {
 	case 0x0:
-		ARC_EXCEPTION_DUMP("double fault");
+		LOG_ERR("double fault");
 		break;
 	case 0x1:
-		ARC_EXCEPTION_DUMP("overlapping TLB entries");
+		LOG_ERR("overlapping TLB entries");
 		break;
 	case 0x2:
-		ARC_EXCEPTION_DUMP("fatal TLB error");
+		LOG_ERR("fatal TLB error");
 		break;
 	case 0x3:
-		ARC_EXCEPTION_DUMP("fatal cache error");
+		LOG_ERR("fatal cache error");
 		break;
 	case 0x4:
-		ARC_EXCEPTION_DUMP("internal memory error on instruction fetch");
+		LOG_ERR("internal memory error on instruction fetch");
 		break;
 	case 0x5:
-		ARC_EXCEPTION_DUMP("internal memory error on data fetch");
+		LOG_ERR("internal memory error on data fetch");
 		break;
 	case 0x6:
-		ARC_EXCEPTION_DUMP("illegal overlapping MPU entries");
+		LOG_ERR("illegal overlapping MPU entries");
 		if (parameter == 0x1) {
-			ARC_EXCEPTION_DUMP(" - jump and branch target");
+			LOG_ERR(" - jump and branch target");
 		}
 		break;
 	case 0x10:
-		ARC_EXCEPTION_DUMP("secure vector table not located in secure memory");
+		LOG_ERR("secure vector table not located in secure memory");
 		break;
 	case 0x11:
-		ARC_EXCEPTION_DUMP("NSC jump table not located in secure memory");
+		LOG_ERR("NSC jump table not located in secure memory");
 		break;
 	case 0x12:
-		ARC_EXCEPTION_DUMP("secure handler code not located in secure memory");
+		LOG_ERR("secure handler code not located in secure memory");
 		break;
 	case 0x13:
-		ARC_EXCEPTION_DUMP("NSC target address not located in secure memory");
+		LOG_ERR("NSC target address not located in secure memory");
 		break;
 	case 0x80:
-		ARC_EXCEPTION_DUMP("uncorrectable ECC or parity error in vector memory");
+		LOG_ERR("uncorrectable ECC or parity error in vector memory");
 		break;
 	default:
-		ARC_EXCEPTION_DUMP("unknown");
+		LOG_ERR("unknown");
 		break;
 	}
 }
@@ -220,54 +219,54 @@ static void dump_privilege_exception(uint32_t cause, uint32_t parameter)
 {
 	switch (cause) {
 	case 0x0:
-		ARC_EXCEPTION_DUMP("Privilege violation");
+		LOG_ERR("Privilege violation");
 		break;
 	case 0x1:
-		ARC_EXCEPTION_DUMP("disabled extension");
+		LOG_ERR("disabled extension");
 		break;
 	case 0x2:
-		ARC_EXCEPTION_DUMP("action point hit");
+		LOG_ERR("action point hit");
 		break;
 	case 0x10:
 		switch (parameter) {
 		case 0x1:
-			ARC_EXCEPTION_DUMP("N to S return using incorrect return mechanism");
+			LOG_ERR("N to S return using incorrect return mechanism");
 			break;
 		case 0x2:
-			ARC_EXCEPTION_DUMP("N to S return with incorrect operating mode");
+			LOG_ERR("N to S return with incorrect operating mode");
 			break;
 		case 0x3:
-			ARC_EXCEPTION_DUMP("IRQ/exception return fetch from wrong mode");
+			LOG_ERR("IRQ/exception return fetch from wrong mode");
 			break;
 		case 0x4:
-			ARC_EXCEPTION_DUMP("attempt to halt secure processor in NS mode");
+			LOG_ERR("attempt to halt secure processor in NS mode");
 			break;
 		case 0x20:
-			ARC_EXCEPTION_DUMP("attempt to access secure resource from normal mode");
+			LOG_ERR("attempt to access secure resource from normal mode");
 			break;
 		case 0x40:
-			ARC_EXCEPTION_DUMP("SID violation on resource access (APEX/UAUX/key NVM)");
+			LOG_ERR("SID violation on resource access (APEX/UAUX/key NVM)");
 			break;
 		default:
-			ARC_EXCEPTION_DUMP("unknown");
+			LOG_ERR("unknown");
 			break;
 		}
 		break;
 	case 0x13:
 		switch (parameter) {
 		case 0x20:
-			ARC_EXCEPTION_DUMP("attempt to access secure APEX feature from NS mode");
+			LOG_ERR("attempt to access secure APEX feature from NS mode");
 			break;
 		case 0x40:
-			ARC_EXCEPTION_DUMP("SID violation on access to APEX feature");
+			LOG_ERR("SID violation on access to APEX feature");
 			break;
 		default:
-			ARC_EXCEPTION_DUMP("unknown");
+			LOG_ERR("unknown");
 			break;
 		}
 		break;
 	default:
-		ARC_EXCEPTION_DUMP("unknown");
+		LOG_ERR("unknown");
 		break;
 	}
 }
@@ -275,7 +274,7 @@ static void dump_privilege_exception(uint32_t cause, uint32_t parameter)
 static void dump_exception_info(uint32_t vector, uint32_t cause, uint32_t parameter)
 {
 	if (vector >= 0x10 && vector <= 0xFF) {
-		ARC_EXCEPTION_DUMP("interrupt %u", vector);
+		LOG_ERR("interrupt %u", vector);
 		return;
 	}
 
@@ -284,59 +283,59 @@ static void dump_exception_info(uint32_t vector, uint32_t cause, uint32_t parame
 	 */
 	switch (vector) {
 	case ARC_EV_RESET:
-		ARC_EXCEPTION_DUMP("Reset");
+		LOG_ERR("Reset");
 		break;
 	case ARC_EV_MEM_ERROR:
-		ARC_EXCEPTION_DUMP("Memory Error");
+		LOG_ERR("Memory Error");
 		break;
 	case ARC_EV_INS_ERROR:
-		ARC_EXCEPTION_DUMP("Instruction Error");
+		LOG_ERR("Instruction Error");
 		break;
 	case ARC_EV_MACHINE_CHECK:
-		ARC_EXCEPTION_DUMP("EV_MachineCheck");
+		LOG_ERR("EV_MachineCheck");
 		dump_machine_check_exception(cause, parameter);
 		break;
 	case ARC_EV_TLB_MISS_I:
-		ARC_EXCEPTION_DUMP("EV_TLBMissI");
+		LOG_ERR("EV_TLBMissI");
 		break;
 	case ARC_EV_TLB_MISS_D:
-		ARC_EXCEPTION_DUMP("EV_TLBMissD");
+		LOG_ERR("EV_TLBMissD");
 		break;
 	case ARC_EV_PROT_V:
-		ARC_EXCEPTION_DUMP("EV_ProtV");
+		LOG_ERR("EV_ProtV");
 		dump_protv_exception(cause, parameter);
 		break;
 	case ARC_EV_PRIVILEGE_V:
-		ARC_EXCEPTION_DUMP("EV_PrivilegeV");
+		LOG_ERR("EV_PrivilegeV");
 		dump_privilege_exception(cause, parameter);
 		break;
 	case ARC_EV_SWI:
-		ARC_EXCEPTION_DUMP("EV_SWI");
+		LOG_ERR("EV_SWI");
 		break;
 	case ARC_EV_TRAP:
-		ARC_EXCEPTION_DUMP("EV_Trap");
+		LOG_ERR("EV_Trap");
 		break;
 	case ARC_EV_EXTENSION:
-		ARC_EXCEPTION_DUMP("EV_Extension");
+		LOG_ERR("EV_Extension");
 		break;
 	case ARC_EV_DIV_ZERO:
-		ARC_EXCEPTION_DUMP("EV_DivZero");
+		LOG_ERR("EV_DivZero");
 		break;
 	case ARC_EV_DC_ERROR:
-		ARC_EXCEPTION_DUMP("EV_DCError");
+		LOG_ERR("EV_DCError");
 		break;
 	case ARC_EV_MISALIGNED:
-		ARC_EXCEPTION_DUMP("EV_Misaligned");
+		LOG_ERR("EV_Misaligned");
 		break;
 	case ARC_EV_VEC_UNIT:
-		ARC_EXCEPTION_DUMP("EV_VecUnit");
+		LOG_ERR("EV_VecUnit");
 		break;
 	default:
-		ARC_EXCEPTION_DUMP("unknown");
+		LOG_ERR("unknown");
 		break;
 	}
 }
-#endif /* CONFIG_EXCEPTION_DEBUG */
+#endif /* CONFIG_ARC_EXCEPTION_DEBUG */
 
 /*
  * @brief Fault handler
@@ -346,7 +345,7 @@ static void dump_exception_info(uint32_t vector, uint32_t cause, uint32_t parame
  * invokes the user provided routine k_sys_fatal_error_handler() which is
  * responsible for implementing the error handling policy.
  */
-void _Fault(struct arch_esf *esf, uint32_t old_sp)
+void _Fault(z_arch_esf_t *esf, uint32_t old_sp)
 {
 	uint32_t vector, cause, parameter;
 	uint32_t exc_addr = z_arc_v2_aux_reg_read(_ARC_V2_EFA);
@@ -385,11 +384,10 @@ void _Fault(struct arch_esf *esf, uint32_t old_sp)
 		return;
 	}
 
-#ifdef CONFIG_EXCEPTION_DEBUG
-	ARC_EXCEPTION_DUMP("***** Exception vector: 0x%x, cause code: 0x%x, parameter 0x%x",
+	LOG_ERR("***** Exception vector: 0x%x, cause code: 0x%x, parameter 0x%x",
 		vector, cause, parameter);
-	ARC_EXCEPTION_DUMP("Address 0x%x", exc_addr);
-
+	LOG_ERR("Address 0x%x", exc_addr);
+#ifdef CONFIG_ARC_EXCEPTION_DEBUG
 	dump_exception_info(vector, cause, parameter);
 #endif
 

arch/arc/core/irq_manage.c

@@ -44,11 +44,11 @@ K_KERNEL_STACK_DEFINE(_firq_interrupt_stack, CONFIG_ARC_FIRQ_STACK_SIZE);
 void z_arc_firq_stack_set(void)
 {
 #ifdef CONFIG_SMP
-	char *firq_sp = K_KERNEL_STACK_BUFFER(
+	char *firq_sp = Z_KERNEL_STACK_BUFFER(
 		  _firq_interrupt_stack[z_arc_v2_core_id()]) +
 		  CONFIG_ARC_FIRQ_STACK_SIZE;
 #else
-	char *firq_sp = K_KERNEL_STACK_BUFFER(_firq_interrupt_stack) +
+	char *firq_sp = Z_KERNEL_STACK_BUFFER(_firq_interrupt_stack) +
 		  CONFIG_ARC_FIRQ_STACK_SIZE;
 #endif
 

arch/arc/core/isr_wrapper.S

@@ -26,7 +26,7 @@ GTEXT(_isr_wrapper)
 GTEXT(_isr_demux)
 
 #if defined(CONFIG_PM)
-GTEXT(pm_system_resume)
+GTEXT(z_pm_save_idle_exit)
 #endif
 
 /*
@@ -253,7 +253,7 @@ rirq_path:
 
 	st 0, [r1, _kernel_offset_to_idle] /* zero idle duration */
 	PUSHR blink
-	jl pm_system_resume
+	jl z_pm_save_idle_exit
 	POPR blink
 
 _skip_pm_save_idle_exit:

arch/arc/core/mpu/Kconfig

@@ -35,7 +35,5 @@ config ARC_MPU
 	select GEN_PRIV_STACKS if !(ARC_MPU_VER = 4 || ARC_MPU_VER = 8)
 	select MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT if !(ARC_MPU_VER = 4 || ARC_MPU_VER = 8)
 	select MPU_REQUIRES_NON_OVERLAPPING_REGIONS if (ARC_MPU_VER = 4 || ARC_MPU_VER = 8)
-	select ARCH_MEM_DOMAIN_SUPPORTS_ISOLATED_STACKS
-	select MEM_DOMAIN_ISOLATED_STACKS
 	help
 	  Target has ARC MPU

arch/arc/core/mpu/arc_core_mpu.c

@@ -34,7 +34,7 @@ int arch_mem_domain_max_partitions_get(void)
 /*
  * Validate the given buffer is user accessible or not
  */
-int arch_buffer_validate(const void *addr, size_t size, int write)
+int arch_buffer_validate(void *addr, size_t size, int write)
 {
 	return arc_core_mpu_buffer_validate(addr, size, write);
 }

arch/arc/core/mpu/arc_mpu_common_internal.h

@@ -207,7 +207,7 @@ int arc_core_mpu_get_max_domain_partition_regions(void)
 /**
  * @brief validate the given buffer is user accessible or not
  */
-int arc_core_mpu_buffer_validate(const void *addr, size_t size, int write)
+int arc_core_mpu_buffer_validate(void *addr, size_t size, int write)
 {
 	/*
 	 * For ARC MPU, smaller region number takes priority.

arch/arc/core/mpu/arc_mpu_v2_internal.h

@@ -118,7 +118,7 @@ static inline bool _is_enabled_region(uint32_t r_index)
 }
 
 /**
- * This internal function check if the given buffer is in the region
+ * This internal function check if the given buffer in in the region
  */
 static inline bool _is_in_region(uint32_t r_index, uint32_t start, uint32_t size)
 {

arch/arc/core/mpu/arc_mpu_v4_internal.h

@@ -779,7 +779,7 @@ int arc_core_mpu_get_max_domain_partition_regions(void)
 /**
  * @brief validate the given buffer is user accessible or not
  */
-int arc_core_mpu_buffer_validate(const void *addr, size_t size, int write)
+int arc_core_mpu_buffer_validate(void *addr, size_t size, int write)
 {
 	int r_index;
 	int key = arch_irq_lock();

arch/arc/core/mpu/arc_mpu_v6_internal.h

@@ -156,7 +156,7 @@ static inline bool _is_enabled_region(uint32_t r_index)
 }
 
 /**
- * This internal function check if the given buffer is in the region
+ * This internal function check if the given buffer in in the region
  */
 static inline bool _is_in_region(uint32_t r_index, uint32_t start, uint32_t size)
 {

arch/arc/core/offsets/offsets.c

@@ -26,7 +26,7 @@
 #include <kernel_arch_data.h>
 #include <gen_offset.h>
 #include <kernel_offsets.h>
-#ifdef CONFIG_DSP_SHARING
+#ifdef CONFIG_ARC_DSP_SHARING
 #include "../dsp/dsp_offsets.c"
 #endif
 

arch/arc/core/prep_c.c

@@ -20,10 +20,10 @@
 #include <zephyr/toolchain.h>
 #include <zephyr/linker/linker-defs.h>
 #include <zephyr/arch/arc/v2/aux_regs.h>
-#include <zephyr/arch/arc/cluster.h>
 #include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 
+
 /* XXX - keep for future use in full-featured cache APIs */
 #if 0
 /**
@@ -67,51 +67,6 @@ static void invalidate_dcache(void)
 }
 #endif
 
-#ifdef CONFIG_ISA_ARCV3
-/* NOTE: it will be called from early C code - we must NOT use global / static variables in it! */
-static void arc_cluster_scm_enable(void)
-{
-	unsigned int cluster_version;
-
-	/* Check that we have cluster and its version is supported */
-	cluster_version = z_arc_v2_aux_reg_read(_ARC_REG_CLN_BCR) & _ARC_CLN_BCR_VER_MAJOR_MASK;
-	if (cluster_version < _ARC_REG_CLN_BCR_VER_MAJOR_ARCV3_MIN) {
-		return;
-	}
-
-	/* Check that we have shared cache in cluster */
-	if (!(z_arc_v2_aux_reg_read(_ARC_CLNR_BCR_0) & _ARC_CLNR_BCR_0_HAS_SCM)) {
-		return;
-	}
-
-	/* Disable SCM, just in case. */
-	arc_cln_write_reg_nolock(ARC_CLN_CACHE_STATUS, 0);
-
-	/* Invalidate SCM before enabling. */
-	arc_cln_write_reg_nolock(ARC_CLN_CACHE_CMD,
-				 ARC_CLN_CACHE_CMD_OP_REG_INV | ARC_CLN_CACHE_CMD_INCR);
-	while (arc_cln_read_reg_nolock(ARC_CLN_CACHE_STATUS) & ARC_CLN_CACHE_STATUS_BUSY)
-		;
-
-	arc_cln_write_reg_nolock(ARC_CLN_CACHE_STATUS, ARC_CLN_CACHE_STATUS_EN);
-}
-#endif /* CONFIG_ISA_ARCV3 */
-
-#ifdef __CCAC__
-extern char __device_states_start[];
-extern char __device_states_end[];
-/**
- * @brief Clear device_states section
- *
- * This routine clears the device_states section,
- * as MW compiler marks the section with NOLOAD flag.
- */
-static void dev_state_zero(void)
-{
-	z_early_memset(__device_states_start, 0, __device_states_end - __device_states_start);
-}
-#endif
-
 extern FUNC_NORETURN void z_cstart(void);
 /**
  * @brief Prepare to and run C code
@@ -119,16 +74,9 @@ extern FUNC_NORETURN void z_cstart(void);
  * This routine prepares for the execution of and runs C code.
  */
 
-void z_prep_c(void)
+void _PrepC(void)
 {
-#ifdef CONFIG_ISA_ARCV3
-	arc_cluster_scm_enable();
-#endif
-
 	z_bss_zero();
-#ifdef __CCAC__
-	dev_state_zero();
-#endif
 	z_data_copy();
 	z_cstart();
 	CODE_UNREACHABLE;

arch/arc/core/reset.S

@@ -40,7 +40,7 @@ GTEXT(__start)
  *
  * Locking interrupts prevents anything from interrupting the CPU.
  *
- * When these steps are completed, jump to z_prep_c(), which will finish setting
+ * When these steps are completed, jump to _PrepC(), which will finish setting
  * up the system for running C code.
  */
 
@@ -151,16 +151,6 @@ done_mpu_regions_reset:
 #endif
 #endif
 
-#ifdef CONFIG_ISA_ARCV3
-	/* Enable HW prefetcher if exist */
-	lr r0, [_ARC_HW_PF_BUILD]
-	breq r0, 0, hw_pf_setup_done
-	lr r1, [_ARC_HW_PF_CTRL]
-	or r1, r1, _ARC_HW_PF_CTRL_ENABLE
-	sr r1, [_ARC_HW_PF_CTRL]
-hw_pf_setup_done:
-#endif
-
 #if defined(CONFIG_SMP) || CONFIG_MP_MAX_NUM_CPUS  > 1
 	_get_cpu_id r0
 	breq r0, 0, _master_core_startup
@@ -184,7 +174,7 @@ _slave_core_wait:
 	jl z_arc_firq_stack_set
 	pop r0
 #endif
-	j arch_secondary_cpu_init
+	j z_arc_slave_start
 
 _master_core_startup:
 #endif
@@ -212,4 +202,4 @@ _master_core_startup:
 	jl z_arc_firq_stack_set
 #endif
 
-	j z_prep_c
+	j _PrepC

arch/arc/core/smp.c

@@ -1,198 +0,0 @@
-/*
- * Copyright (c) 2019 Synopsys.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @file
- * @brief codes required for ARC multicore and Zephyr smp support
- *
- */
-#include <zephyr/device.h>
-#include <zephyr/kernel.h>
-#include <zephyr/kernel_structs.h>
-#include <ksched.h>
-#include <ipi.h>
-#include <zephyr/init.h>
-#include <zephyr/irq.h>
-#include <arc_irq_offload.h>
-
-volatile struct {
-	arch_cpustart_t fn;
-	void *arg;
-} arc_cpu_init[CONFIG_MP_MAX_NUM_CPUS];
-
-/*
- * arc_cpu_wake_flag is used to sync up master core and slave cores
- * Slave core will spin for arc_cpu_wake_flag until master core sets
- * it to the core id of slave core. Then, slave core clears it to notify
- * master core that it's waken
- *
- */
-volatile uint32_t arc_cpu_wake_flag;
-
-volatile char *arc_cpu_sp;
-/*
- * _curr_cpu is used to record the struct of _cpu_t of each cpu.
- * for efficient usage in assembly
- */
-volatile _cpu_t *_curr_cpu[CONFIG_MP_MAX_NUM_CPUS];
-
-/* Called from Zephyr initialization */
-void arch_cpu_start(int cpu_num, k_thread_stack_t *stack, int sz,
-		    arch_cpustart_t fn, void *arg)
-{
-	_curr_cpu[cpu_num] = &(_kernel.cpus[cpu_num]);
-	arc_cpu_init[cpu_num].fn = fn;
-	arc_cpu_init[cpu_num].arg = arg;
-
-	/* set the initial sp of target sp through arc_cpu_sp
-	 * arc_cpu_wake_flag will protect arc_cpu_sp that
-	 * only one slave cpu can read it per time
-	 */
-	arc_cpu_sp = K_KERNEL_STACK_BUFFER(stack) + sz;
-
-	arc_cpu_wake_flag = cpu_num;
-
-	/* wait slave cpu to start */
-	while (arc_cpu_wake_flag != 0U) {
-		;
-	}
-}
-
-#ifdef CONFIG_SMP
-static void arc_connect_debug_mask_update(int cpu_num)
-{
-	uint32_t core_mask = 1 << cpu_num;
-
-	/*
-	 * MDB debugger may modify debug_select and debug_mask registers on start, so we can't
-	 * rely on debug_select reset value.
-	 */
-	if (cpu_num != ARC_MP_PRIMARY_CPU_ID) {
-		core_mask |= z_arc_connect_debug_select_read();
-	}
-
-	z_arc_connect_debug_select_set(core_mask);
-	/* Debugger halts cores at all conditions:
-	 * ARC_CONNECT_CMD_DEBUG_MASK_H: Core global halt.
-	 * ARC_CONNECT_CMD_DEBUG_MASK_AH: Actionpoint halt.
-	 * ARC_CONNECT_CMD_DEBUG_MASK_BH: Software breakpoint halt.
-	 * ARC_CONNECT_CMD_DEBUG_MASK_SH: Self halt.
-	 */
-	z_arc_connect_debug_mask_set(core_mask,	(ARC_CONNECT_CMD_DEBUG_MASK_SH
-		| ARC_CONNECT_CMD_DEBUG_MASK_BH | ARC_CONNECT_CMD_DEBUG_MASK_AH
-		| ARC_CONNECT_CMD_DEBUG_MASK_H));
-}
-#endif
-
-void arc_core_private_intc_init(void);
-
-/* the C entry of slave cores */
-void arch_secondary_cpu_init(int cpu_num)
-{
-	arch_cpustart_t fn;
-
-#ifdef CONFIG_SMP
-	struct arc_connect_bcr bcr;
-
-	bcr.val = z_arc_v2_aux_reg_read(_ARC_V2_CONNECT_BCR);
-
-	if (bcr.dbg) {
-		/* configure inter-core debug unit if available */
-		arc_connect_debug_mask_update(cpu_num);
-	}
-
-	z_irq_setup();
-
-	arc_core_private_intc_init();
-
-	arc_irq_offload_init_smp();
-
-	z_arc_connect_ici_clear();
-	z_irq_priority_set(DT_IRQN(DT_NODELABEL(ici)),
-			   DT_IRQ(DT_NODELABEL(ici), priority), 0);
-	irq_enable(DT_IRQN(DT_NODELABEL(ici)));
-#endif
-	/* call the function set by arch_cpu_start */
-	fn = arc_cpu_init[cpu_num].fn;
-
-	fn(arc_cpu_init[cpu_num].arg);
-}
-
-#ifdef CONFIG_SMP
-
-static void sched_ipi_handler(const void *unused)
-{
-	ARG_UNUSED(unused);
-
-	z_arc_connect_ici_clear();
-	z_sched_ipi();
-}
-
-void arch_sched_directed_ipi(uint32_t cpu_bitmap)
-{
-	unsigned int i;
-	unsigned int num_cpus = arch_num_cpus();
-
-	/* Send sched_ipi request to other cores
-	 * if the target is current core, hardware will ignore it
-	 */
-
-	for (i = 0U; i < num_cpus; i++) {
-		if ((cpu_bitmap & BIT(i)) != 0) {
-			z_arc_connect_ici_generate(i);
-		}
-	}
-}
-
-void arch_sched_broadcast_ipi(void)
-{
-	arch_sched_directed_ipi(IPI_ALL_CPUS_MASK);
-}
-
-int arch_smp_init(void)
-{
-	struct arc_connect_bcr bcr;
-
-	/* necessary master core init */
-	_curr_cpu[0] = &(_kernel.cpus[0]);
-
-	bcr.val = z_arc_v2_aux_reg_read(_ARC_V2_CONNECT_BCR);
-
-	if (bcr.dbg) {
-		/* configure inter-core debug unit if available */
-		arc_connect_debug_mask_update(ARC_MP_PRIMARY_CPU_ID);
-	}
-
-	if (bcr.ipi) {
-	/* register ici interrupt, just need master core to register once */
-		z_arc_connect_ici_clear();
-		IRQ_CONNECT(DT_IRQN(DT_NODELABEL(ici)),
-			    DT_IRQ(DT_NODELABEL(ici), priority),
-			    sched_ipi_handler, NULL, 0);
-
-		irq_enable(DT_IRQN(DT_NODELABEL(ici)));
-	} else {
-		__ASSERT(0,
-			"ARC connect has no inter-core interrupt\n");
-		return -ENODEV;
-	}
-
-	if (bcr.gfrc) {
-		/* global free running count init */
-		z_arc_connect_gfrc_enable();
-
-		/* when all cores halt, gfrc halt */
-		z_arc_connect_gfrc_core_set((1 << arch_num_cpus()) - 1);
-		z_arc_connect_gfrc_clear();
-	} else {
-		__ASSERT(0,
-			"ARC connect has no global free running counter\n");
-		return -ENODEV;
-	}
-
-	return 0;
-}
-#endif

arch/arc/core/thread.c

@@ -19,7 +19,7 @@
 #include <zephyr/arch/arc/v2/mpu/arc_core_mpu.h>
 #endif
 
-#if defined(CONFIG_ARC_DSP) && defined(CONFIG_DSP_SHARING)
+#if defined(CONFIG_ARC_DSP) && defined(CONFIG_ARC_DSP_SHARING)
 #include <zephyr/arch/arc/v2/dsp/arc_dsp.h>
 static struct k_spinlock lock;
 #endif
@@ -283,10 +283,10 @@ FUNC_NORETURN void z_arc_switch_to_main_no_multithreading(k_thread_entry_t main_
 							  void *p1, void *p2, void *p3)
 {
 	_kernel.cpus[0].id = 0;
-	_kernel.cpus[0].irq_stack = (K_KERNEL_STACK_BUFFER(z_interrupt_stacks[0]) +
+	_kernel.cpus[0].irq_stack = (Z_KERNEL_STACK_BUFFER(z_interrupt_stacks[0]) +
 				     K_KERNEL_STACK_SIZEOF(z_interrupt_stacks[0]));
 
-	void *main_stack = (K_THREAD_STACK_BUFFER(z_main_stack) +
+	void *main_stack = (Z_THREAD_STACK_BUFFER(z_main_stack) +
 			    K_THREAD_STACK_SIZEOF(z_main_stack));
 
 	arch_irq_unlock(_ARC_V2_INIT_IRQ_LOCK_KEY);
@@ -297,7 +297,7 @@ FUNC_NORETURN void z_arc_switch_to_main_no_multithreading(k_thread_entry_t main_
 }
 #endif /* !CONFIG_MULTITHREADING */
 
-#if defined(CONFIG_ARC_DSP) && defined(CONFIG_DSP_SHARING)
+#if defined(CONFIG_ARC_DSP) && defined(CONFIG_ARC_DSP_SHARING)
 void arc_dsp_disable(struct k_thread *thread, unsigned int options)
 {
 	/* Ensure a preemptive context switch does not occur */
@@ -319,4 +319,4 @@ void arc_dsp_enable(struct k_thread *thread, unsigned int options)
 
 	k_spin_unlock(&lock, key);
 }
-#endif /* CONFIG_ARC_DSP && CONFIG_DSP_SHARING */
+#endif /* CONFIG_ARC_DSP && CONFIG_ARC_DSP_SHARING */

arch/arc/include/err_dump_handling.h

@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2023 Synopsys.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_ARCH_ARC_INCLUDE_ERR_DUMP_HANDLING_H_
-#define ZEPHYR_ARCH_ARC_INCLUDE_ERR_DUMP_HANDLING_H_
-
-#if defined CONFIG_LOG
-#define ARC_EXCEPTION_DUMP(...) LOG_ERR(__VA_ARGS__)
-#else
-#define ARC_EXCEPTION_DUMP(format, ...) printk(format "\n", ##__VA_ARGS__)
-#endif
-
-#endif /* ZEPHYR_ARCH_ARC_INCLUDE_ERR_DUMP_HANDLING_H_ */

arch/arc/include/kernel_arch_data.h

@@ -36,7 +36,7 @@ extern "C" {
 #endif
 
 #ifdef CONFIG_ARC_HAS_SECURE
-struct arch_esf {
+struct _irq_stack_frame {
 #ifdef CONFIG_ARC_HAS_ZOL
 	uintptr_t lp_end;
 	uintptr_t lp_start;
@@ -72,7 +72,7 @@ struct arch_esf {
 	uintptr_t status32;
 };
 #else
-struct arch_esf {
+struct _irq_stack_frame {
 	uintptr_t r0;
 	uintptr_t r1;
 	uintptr_t r2;
@@ -108,7 +108,7 @@ struct arch_esf {
 };
 #endif
 
-typedef struct arch_esf _isf_t;
+typedef struct _irq_stack_frame _isf_t;
 
 
 
@@ -160,7 +160,7 @@ struct _callee_saved_stack {
 #endif
 #endif
 
-#ifdef CONFIG_DSP_SHARING
+#ifdef CONFIG_ARC_DSP_SHARING
 #ifdef CONFIG_ARC_DSP_BFLY_SHARING
 	uintptr_t dsp_fft_ctrl;
 	uintptr_t dsp_bfly0;

arch/arc/include/kernel_arch_func.h

@@ -62,7 +62,9 @@ extern void z_arc_userspace_enter(k_thread_entry_t user_entry, void *p1,
 		 void *p2, void *p3, uint32_t stack, uint32_t size,
 		 struct k_thread *thread);
 
-extern void z_arc_fatal_error(unsigned int reason, const struct arch_esf *esf);
+extern void z_arc_fatal_error(unsigned int reason, const z_arch_esf_t *esf);
+
+extern void arch_sched_ipi(void);
 
 extern void z_arc_switch(void *switch_to, void **switched_from);
 

arch/arc/include/offsets_short_arch.h

@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_ARCH_ARC_INCLUDE_OFFSETS_SHORT_ARCH_H_
 #define ZEPHYR_ARCH_ARC_INCLUDE_OFFSETS_SHORT_ARCH_H_
 
-#include <zephyr/offsets.h>
+#include <offsets.h>
 
 /* kernel */
 

arch/arc/include/vector_table.h

@@ -46,7 +46,7 @@ GTEXT(__ev_div_zero)
 GTEXT(__ev_dc_error)
 GTEXT(__ev_maligned)
 
-GTEXT(z_prep_c)
+GTEXT(_PrepC)
 GTEXT(_isr_wrapper)
 
 #else

arch/archs.yml

@@ -1,21 +0,0 @@
-archs:
-  - name: arc
-    path: arc
-  - name: arm
-    path: arm
-  - name: arm64
-    path: arm64
-  - name: mips
-    path: mips
-  - name: nios2
-    path: nios2
-  - name: posix
-    path: posix
-  - name: riscv
-    path: riscv
-  - name: sparc
-    path: sparc
-  - name: xtensa
-    path: xtensa
-  - name: x86
-    path: x86

arch/arm/CMakeLists.txt

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_BIG_ENDIAN)
-  set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT elf32-bigarm)
-else()
-  set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT elf32-littlearm)
-endif()
+set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT elf32-littlearm)
 
 add_subdirectory(core)

arch/arm/Kconfig

@@ -16,88 +16,23 @@ config CPU_CORTEX
 
 config ARM_CUSTOM_INTERRUPT_CONTROLLER
 	bool
+	depends on !CPU_CORTEX_M
 	help
 	  This option indicates that the ARM CPU is connected to a custom (i.e.
-	  non-GIC or NVIC) interrupt controller.
+	  non-GIC) interrupt controller.
 
 	  A number of Cortex-A and Cortex-R cores (Cortex-A5, Cortex-R4/5, ...)
 	  allow interfacing to a custom external interrupt controller and this
 	  option must be selected when such cores are connected to an interrupt
-	  controller that is not the ARM Generic Interrupt Controller (GIC) or
-	  the Cortex-M ARM Nested Vectored Interrupt Controller (NVIC).
+	  controller that is not the ARM Generic Interrupt Controller (GIC).
 
 	  When this option is selected, the architecture interrupt control
 	  functions are mapped to the SoC interrupt control interface, which is
 	  implemented at the SoC level.
 
-	  N.B. Since all Cortex-M cores have a NVIC, if this option is selected it
-	  is assumed that the custom interrupt control interface implementation
-	  assumes responsibility for handling the NVIC.
-
-config ROMSTART_RELOCATION_ROM
-	bool "Relocate rom_start region"
-	default n
-	help
-	  Relocates the rom_start region containing the boot-vector data and
-	  irq vectors to the region specified by configurations:
-	  ROMSTART_REGION_ADDRESS and ROMSTART_REGION_SIZE
-
-	  This is useful for the Linux Remoteproc framework that uses the elf-loader
-	  such that it is able to load the correct boot-vector (contained in rom_start)
-	  into the correct memory location independent of the chosen zephyr,flash
-	  ROM region.
-
-	  Most SOCs include an alias for the boot-vector at address 0x00000000
-	  so a default which might be supported by the corresponding Linux rproc driver.
-	  If it is not, additionnal options allows to specify the addresses.
-
-	  In general this option should be chosen if the zephyr,flash chosen node
-	  is not placed into the boot-vector memory area.
-
-	  While this aims at generating a correct zephyr.elf file, it has the side
-	  effect of enlarging the bin file. If the zephyr.bin file is used to boot the
-	  secondary core, this option should be disabled.
-
-	  Example:
-		on IMX7D, the chosen zephyr,flash can be OCRAM/OCRAM_S/TCM/DDR memories
-		for code location. But the boot-vector must be placed into OCRAM_S for the
-		CORTEX-M to boot (alias 0, real 0x00180000/32K available).
-
-if ROMSTART_RELOCATION_ROM
-
-	config ROMSTART_REGION_ADDRESS
-		hex "Base address of the rom_start region"
-		default 0x00000000
-		help
-		  Start address of the rom_start region.
-		  This setting can be derived from a DT node reg property or specified directly.
-
-		  A default value of 0x00000000 might work in most cases as SOCs have an alias
-		  to the right memory region of the boot-vector.
-
-		  Examples:
-		  -IMX7D the boot-vector is OCRAM_S (0x00180000, aliased at 0x0).
-		  -IMX6SX the boot-vector is TCML (0x007F8000, aliased at 0x0).
-		  -IMX8MQ the boot-vector is TCML (0x007E0000, aliased at 0x0).
-		  -IMX8MN the boot-vector is ITCM (0x007E0000, aliased at 0x0).
-
-		  Example of DT definition:
-		  $(dt_nodelabel_reg_addr_hex,ocram_s_sys)
-
-	config ROMSTART_REGION_SIZE
-		hex "Size of the rom_start region"
-		default 1
-		help
-		  Size of the rom_start region in KB.
-
-		  Default is 1KB which is enough to store the boot and irq vectors.
-
-		  This setting can be derived from a DT node reg property or specified directly.
-
-		  Example for IMX7D that needs the boot-vector into OCRAM_S (0x00180000):
-		  $(dt_nodelabel_reg_size_hex,ocram_s_sys,0,K)
-
-endif
+	  N.B. This option is only applicable to the Cortex-A and Cortex-R
+	       family cores. The Cortex-M family cores are always equipped with
+	       the ARM Nested Vectored Interrupt Controller (NVIC).
 
 config CODE_DATA_RELOCATION_SRAM
 	bool "Relocate code/data sections to SRAM"
@@ -147,47 +82,4 @@ config ARM_ON_EXIT_CPU_IDLE
 rsource "core/Kconfig"
 rsource "core/Kconfig.vfp"
 
-# General options signifying CPU capabilities of ARM SoCs
-config CPU_HAS_ARM_MPU
-	bool
-	select CPU_HAS_MPU
-	help
-	  This option is enabled when the CPU has a Memory Protection Unit (MPU)
-	  in ARM flavor.
-
-config CPU_HAS_NXP_MPU
-	bool
-	select CPU_HAS_MPU
-	help
-	  This option is enabled when the CPU has a Memory Protection Unit (MPU)
-	  in NXP flavor.
-
-config CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
-	bool "Custom fixed SoC MPU region definition"
-	help
-	  If enabled, this option signifies that the SoC will
-	  define and configure its own fixed MPU regions in the
-	  SoC definition. These fixed MPU regions are currently
-	  used to set Flash and SRAM default access policies and
-	  they are programmed at boot time.
-
-config CPU_HAS_ARM_SAU
-	bool
-	select CPU_HAS_TEE
-	help
-	  MCU implements the ARM Security Attribution Unit (SAU).
-
-config CPU_HAS_NRF_IDAU
-	bool
-	select CPU_HAS_TEE
-	help
-	  MCU implements the nRF (vendor-specific) Security Attribution Unit.
-	  (IDAU: "Implementation-Defined Attribution Unit", in accordance with
-	  ARM terminology).
-
-config HAS_SWO
-	bool
-	help
-	  When enabled, indicates that SoC has an SWO output
-
 endmenu

arch/arm/core/CMakeLists.txt

@@ -14,7 +14,6 @@ zephyr_library_sources_ifdef(CONFIG_THREAD_LOCAL_STORAGE tls.c)
 zephyr_library_sources_ifdef(CONFIG_USERSPACE userspace.S)
 zephyr_library_sources_ifdef(CONFIG_ARM_ZIMAGE_HEADER header.S)
 zephyr_library_sources_ifdef(CONFIG_LLEXT elf.c)
-zephyr_library_sources_ifdef(CONFIG_GDBSTUB gdbstub.c)
 
 add_subdirectory_ifdef(CONFIG_CPU_CORTEX_M cortex_m)
 add_subdirectory_ifdef(CONFIG_CPU_CORTEX_M_HAS_CMSE cortex_m/cmse)
@@ -35,11 +34,3 @@ else()
 zephyr_linker_sources(ROM_START SORT_KEY 0x0vectors vector_table.ld)
 zephyr_linker_sources(ROM_START SORT_KEY 0x1vectors cortex_m/vector_table_pad.ld)
 endif()
-
-if(CONFIG_GEN_SW_ISR_TABLE)
-  if(CONFIG_DYNAMIC_INTERRUPTS)
-    zephyr_linker_sources(RWDATA swi_tables.ld)
-  else()
-    zephyr_linker_sources(RODATA swi_tables.ld)
-  endif()
-endif()

arch/arm/core/Kconfig

@@ -34,12 +34,11 @@ config CPU_AARCH32_CORTEX_R
 	select HAS_CMSIS_CORE
 	select ARCH_HAS_NESTED_EXCEPTION_DETECTION
 	select HAS_FLASH_LOAD_OFFSET
-	select ARCH_HAS_USERSPACE if ARM_MPU && !USE_SWITCH
-	select ARCH_HAS_EXTRA_EXCEPTION_INFO if !USE_SWITCH
+	select ARCH_HAS_USERSPACE if ARM_MPU
+	select ARCH_HAS_EXTRA_EXCEPTION_INFO
 	select ARCH_HAS_CODE_DATA_RELOCATION
 	select ARCH_HAS_NOCACHE_MEMORY_SUPPORT if ARM_MPU && CPU_HAS_ARM_MPU && CPU_HAS_DCACHE
 	select ARCH_SUPPORTS_ROM_START
-	select USE_SWITCH_SUPPORTED
 	help
 	  This option signifies the use of a CPU of the Cortex-R family.
 
@@ -55,21 +54,11 @@ config CPU_AARCH32_CORTEX_A
 	select CPU_HAS_MMU
 	select HAS_CMSIS_CORE
 	select HAS_FLASH_LOAD_OFFSET
-	select ARCH_HAS_EXTRA_EXCEPTION_INFO if !USE_SWITCH
+	select ARCH_HAS_EXTRA_EXCEPTION_INFO
 	select ARCH_HAS_NOCACHE_MEMORY_SUPPORT
-	select USE_SWITCH_SUPPORTED
-	# GDBSTUB has not yet been tested on Cortex M or R SoCs
-	select ARCH_HAS_GDBSTUB
-	# GDB on ARM needs the extra registers
-	select EXTRA_EXCEPTION_INFO if GDBSTUB
 	help
 	  This option signifies the use of a CPU of the Cortex-A family.
 
-config GDBSTUB_BUF_SZ
-	# GDB for ARM expects up to 18 4-byte plus 8 12-byte
-	# registers - 336 HEX letters
-	default 350 if GDBSTUB
-
 config ISA_THUMB2
 	bool
 	help
@@ -277,11 +266,17 @@ choice
 
 config FP_HARDABI
 	bool "Floating point Hard ABI"
+	# TF-M build system does not build the NS app and libraries correctly with Hard ABI.
+	# This limitation should be removed in the next TF-M synchronization.
+	depends on !TFM_BUILD_NS
+	depends on !(BUILD_WITH_TFM && !TFM_IPC)
 	help
 	  This option selects the Floating point ABI in which hardware floating
 	  point instructions are generated and uses FPU-specific calling
 	  conventions.
 
+	  Note: When building with TF-M enabled only the IPC mode is supported.
+
 config FP_SOFTABI
 	bool "Floating point Soft ABI"
 	help

arch/arm/core/cortex_a_r/CMakeLists.txt

@@ -4,6 +4,7 @@ zephyr_library()
 
 zephyr_library_sources(
   exc.S
+  exc_exit.S
   fault.c
   irq_init.c
   reboot.c
@@ -11,11 +12,12 @@ zephyr_library_sources(
   stacks.c
   tcm.c
   vector_table.S
+  swap.c
+  swap_helper.S
   irq_manage.c
   prep_c.c
   thread.c
   cpu_idle.S
-  smp.c
   )
 
 zephyr_library_sources_ifdef(CONFIG_GEN_SW_ISR_TABLE isr_wrapper.S)
@@ -23,5 +25,3 @@ zephyr_library_sources_ifdef(CONFIG_USERSPACE thread.c)
 zephyr_library_sources_ifdef(CONFIG_SEMIHOST semihost.c)
 zephyr_library_sources_ifdef(CONFIG_THREAD_LOCAL_STORAGE __aeabi_read_tp.S)
 zephyr_library_sources_ifdef(CONFIG_ARCH_CACHE cache.c)
-zephyr_library_sources_ifdef(CONFIG_USE_SWITCH switch.S)
-zephyr_library_sources_ifndef(CONFIG_USE_SWITCH swap.c swap_helper.S exc_exit.S)

arch/arm/core/cortex_a_r/Kconfig

@@ -99,7 +99,7 @@ config CPU_CORTEX_R52
 	select AARCH32_ARMV8_R
 	select CPU_HAS_ICACHE
 	select CPU_HAS_DCACHE
-	select VFP_SP_D16 if !USE_SWITCH
+	select VFP_SP_D16
 	help
 	  This option signifies the use of a Cortex-R52 CPU
 
@@ -130,8 +130,6 @@ config ARMV7_R_FP
 config AARCH32_ARMV8_R
 	bool
 	select ATOMIC_OPERATIONS_BUILTIN
-	select SCHED_IPI_SUPPORTED if SMP
-	select ARCH_HAS_DIRECTED_IPIS
 	help
 	  This option signifies the use of an ARMv8-R AArch32 processor
 	  implementation.
@@ -190,6 +188,3 @@ config ICACHE_LINE_SIZE
 	default 32
 
 endif # CPU_AARCH32_CORTEX_R
-
-config TEST_EXTRA_STACK_SIZE
-	default 1024 if SMP

arch/arm/core/cortex_a_r/__aeabi_read_tp.S

@@ -11,8 +11,5 @@ _ASM_FILE_PROLOGUE
 GTEXT(__aeabi_read_tp)
 
 SECTION_FUNC(text, __aeabi_read_tp)
-	/*
-	 * TPIDRURW will be used as a base pointer point to TLS aera.
-	 */
-	mrc 15, 0, r0, c13, c0, 2
+	mrc 15, 0, r0, c13, c0, 3
 	bx lr

arch/arm/core/cortex_a_r/boot.h

@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2023 Arm Limited (or its affiliates). All rights reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @file
- * @brief Definitions for boot code
- */
-
-#ifndef _BOOT_H_
-#define _BOOT_H_
-
-#ifndef _ASMLANGUAGE
-
-extern void *_vector_table[];
-extern void __start(void);
-
-#endif /* _ASMLANGUAGE */
-
-/* Offsets into the boot_params structure */
-#define BOOT_PARAM_MPID_OFFSET		0
-#define BOOT_PARAM_IRQ_SP_OFFSET	4
-#define BOOT_PARAM_FIQ_SP_OFFSET	8
-#define BOOT_PARAM_ABT_SP_OFFSET	12
-#define BOOT_PARAM_UDF_SP_OFFSET	16
-#define BOOT_PARAM_SVC_SP_OFFSET	20
-#define BOOT_PARAM_SYS_SP_OFFSET	24
-#define BOOT_PARAM_VOTING_OFFSET	28
-
-#endif /* _BOOT_H_ */

arch/arm/core/cortex_a_r/cpu_idle.S

@@ -49,7 +49,6 @@ _skip_\@:
 #endif /* CONFIG_ARM_ON_ENTER_CPU_IDLE_HOOK */
 .endm
 
-#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE
 SECTION_FUNC(TEXT, arch_cpu_idle)
 #ifdef CONFIG_TRACING
 	push	{r0, lr}
@@ -69,9 +68,6 @@ SECTION_FUNC(TEXT, arch_cpu_idle)
 
 	bx	lr
 
-#endif
-
-#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 SECTION_FUNC(TEXT, arch_cpu_atomic_idle)
 #ifdef CONFIG_TRACING
 	push	{r0, lr}
@@ -97,4 +93,3 @@ SECTION_FUNC(TEXT, arch_cpu_atomic_idle)
 _irq_disabled:
 
 	bx	lr
-#endif

arch/arm/core/cortex_a_r/exc.S

@@ -27,7 +27,6 @@
 #include <zephyr/linker/sections.h>
 #include <offsets_short.h>
 #include <zephyr/arch/cpu.h>
-#include "macro_priv.inc"
 
 _ASM_FILE_PROLOGUE
 
@@ -42,8 +41,6 @@ GTEXT(z_arm_undef_instruction)
 GTEXT(z_arm_prefetch_abort)
 GTEXT(z_arm_data_abort)
 
-#ifndef CONFIG_USE_SWITCH
-
 .macro exception_entry mode
 	/*
 	 * Store r0-r3, r12, lr, lr_und and spsr_und into the stack to
@@ -89,10 +86,10 @@ GTEXT(z_arm_data_abort)
 #endif
 
 	/* Increment exception nesting count */
-	get_cpu r2
-	ldr r1, [r2, #___cpu_t_nested_OFFSET]
+	ldr r2, =_kernel
+	ldr r1, [r2, #_kernel_offset_to_nested]
 	add r1, r1, #1
-	str r1, [r2, #___cpu_t_nested_OFFSET]
+	str r1, [r2, #_kernel_offset_to_nested]
 .endm
 
 .macro exception_exit
@@ -131,10 +128,10 @@ SECTION_SUBSEC_FUNC(TEXT, __exc, z_arm_undef_instruction)
 	sub sp, #24
 
 	/* Increment exception nesting count */
-	get_cpu r2
-	ldr r1, [r2, #___cpu_t_nested_OFFSET]
+	ldr r2, =_kernel
+	ldr r1, [r2, #_kernel_offset_to_nested]
 	add r1, r1, #1
-	str r1, [r2, #___cpu_t_nested_OFFSET]
+	str r1, [r2, #_kernel_offset_to_nested]
 
 #if defined(CONFIG_FPU_SHARING)
 	sub sp, #___fpu_t_SIZEOF
@@ -235,59 +232,3 @@ SECTION_SUBSEC_FUNC(TEXT, __exc, z_arm_data_abort)
 	streq r1, [sp, #24 + FPU_SF_SIZE]
 
 	b z_arm_exc_exit
-
-#else
-/**
- * @brief Undefined instruction exception handler
- *
- * An undefined instruction (UNDEF) exception is generated when an undefined
- * instruction, or a VFP instruction when the VFP is not enabled, is
- * encountered.
- */
-SECTION_SUBSEC_FUNC(TEXT, __exc, z_arm_undef_instruction)
-	/*
-	 * The undefined instruction address is offset by 2 if the previous
-	 * mode is Thumb; otherwise, it is offset by 4.
-	 */
-	push {r0}
-	mrs r0, spsr
-	tst r0, #T_BIT
-	subeq lr, #4	/* ARM   (!T_BIT) */
-	subne lr, #2	/* Thumb (T_BIT) */
-	pop {r0}
-
-	z_arm_cortex_ar_enter_exc
-	bl z_arm_fault_undef_instruction
-	b z_arm_cortex_ar_exit_exc
-
-/**
- * @brief Prefetch abort exception handler
- *
- * A prefetch abort (PABT) exception is generated when the processor marks the
- * prefetched instruction as invalid and the instruction is executed.
- */
-SECTION_SUBSEC_FUNC(TEXT, __exc, z_arm_prefetch_abort)
-	/*
-	 * The faulting instruction address is always offset by 4 for the
-	 * prefetch abort exceptions.
-	 */
-	sub lr, #4
-	z_arm_cortex_ar_enter_exc
-	bl z_arm_fault_prefetch
-	b z_arm_cortex_ar_exit_exc
-
-/**
- * @brief Data abort exception handler
- *
- * A data abort (DABT) exception is generated when an error occurs on a data
- * memory access. This exception can be either synchronous or asynchronous,
- * depending on the type of fault that caused it.
- */
-SECTION_SUBSEC_FUNC(TEXT, __exc, z_arm_data_abort)
-	sub lr, #8
-
-	z_arm_cortex_ar_enter_exc
-	bl z_arm_fault_data
-	b z_arm_cortex_ar_exit_exc
-
-#endif

arch/arm/core/cortex_a_r/exc_exit.S

@@ -18,7 +18,6 @@
 #include <zephyr/linker/sections.h>
 #include <offsets_short.h>
 #include <zephyr/arch/cpu.h>
-#include "macro_priv.inc"
 
 _ASM_FILE_PROLOGUE
 
@@ -53,8 +52,8 @@ GDATA(_kernel)
 	bne system_thread_exit\@
 
 	/* Restore user stack pointer */
-	get_cpu r0
-	ldr r0, [r0, #___cpu_t_current_OFFSET]
+	ldr r0, =_kernel
+	ldr r0, [r0, #_kernel_offset_to_current]
 	cps #MODE_SYS
 	ldr sp, [r0, #_thread_offset_to_sp_usr] /* sp_usr */
 	cps #MODE_SVC
@@ -69,8 +68,8 @@ system_thread_exit\@:
 	 * If the floating point context pointer is null, then a context was
 	 * saved so restore the float context from the exception stack frame.
 	 */
-	get_cpu r2
-	ldr r1, [r2, #___cpu_t_fp_ctx_OFFSET]
+	ldr r2, =_kernel
+	ldr r1, [r2, #_kernel_offset_to_fp_ctx]
 	cmp r1, #0
 	beq vfp_restore\@
 
@@ -80,7 +79,7 @@ system_thread_exit\@:
 	 */
 	cmp r0, #0
 	moveq r1, #0
-	streq r1, [r2, #___cpu_t_fp_ctx_OFFSET]
+	streq r1, [r2, #_kernel_offset_to_fp_ctx]
 	b vfp_exit\@
 
 vfp_restore\@:
@@ -141,24 +140,23 @@ SECTION_SUBSEC_FUNC(TEXT, _HandlerModeExit, z_arm_int_exit)
 
 #ifdef CONFIG_PREEMPT_ENABLED
 	/* Do not context switch if exiting a nested interrupt */
-	get_cpu r3
-	ldr r0, [r3, #___cpu_t_nested_OFFSET]
+	ldr r3, =_kernel
+	ldr r0, [r3, #_kernel_offset_to_nested]
 	cmp r0, #1
 	bhi __EXIT_INT
 
-	ldr r1, [r3, #___cpu_t_current_OFFSET]
-	ldr r2, =_kernel
-	ldr r0, [r2, #_kernel_offset_to_ready_q_cache]
+	ldr r1, [r3, #_kernel_offset_to_current]
+	ldr r0, [r3, #_kernel_offset_to_ready_q_cache]
 	cmp r0, r1
 	blne z_arm_do_swap
 __EXIT_INT:
 #endif /* CONFIG_PREEMPT_ENABLED */
 
 	/* Decrement interrupt nesting count */
-	get_cpu r2
-	ldr r0, [r2, #___cpu_t_nested_OFFSET]
+	ldr r2, =_kernel
+	ldr r0, [r2, #_kernel_offset_to_nested]
 	sub r0, r0, #1
-	str r0, [r2, #___cpu_t_nested_OFFSET]
+	str r0, [r2, #_kernel_offset_to_nested]
 
 	/* Restore previous stack pointer */
 	pop {r2, r3}
@@ -209,8 +207,8 @@ __EXIT_INT:
  */
 SECTION_SUBSEC_FUNC(TEXT, _HandlerModeExit, z_arm_exc_exit)
 	/* Do not context switch if exiting a nested exception */
-	get_cpu r3
-	ldr r1, [r3, #___cpu_t_nested_OFFSET]
+	ldr r3, =_kernel
+	ldr r1, [r3, #_kernel_offset_to_nested]
 	cmp r1, #1
 	bhi __EXIT_EXC
 
@@ -241,10 +239,10 @@ SECTION_SUBSEC_FUNC(TEXT, _HandlerModeExit, z_arm_exc_exit)
 	bl z_arm_do_swap
 
 	/* Decrement exception nesting count */
-	get_cpu r3
-	ldr r0, [r3, #___cpu_t_nested_OFFSET]
+	ldr r3, =_kernel
+	ldr r0, [r3, #_kernel_offset_to_nested]
 	sub r0, r0, #1
-	str r0, [r3, #___cpu_t_nested_OFFSET]
+	str r0, [r3, #_kernel_offset_to_nested]
 
 	/* Return to the switched thread */
 	cps #MODE_SYS
@@ -257,9 +255,9 @@ SECTION_SUBSEC_FUNC(TEXT, _HandlerModeExit, z_arm_exc_exit)
 
 __EXIT_EXC:
 	/* Decrement exception nesting count */
-	ldr r0, [r3, #___cpu_t_nested_OFFSET]
+	ldr r0, [r3, #_kernel_offset_to_nested]
 	sub r0, r0, #1
-	str r0, [r3, #___cpu_t_nested_OFFSET]
+	str r0, [r3, #_kernel_offset_to_nested]
 
 #if defined(CONFIG_FPU_SHARING)
 	add sp, sp, #___fpu_t_SIZEOF

arch/arm/core/cortex_a_r/fault.c

@@ -10,11 +10,6 @@
 #include <kernel_internal.h>
 #include <zephyr/arch/common/exc_handle.h>
 #include <zephyr/logging/log.h>
-#if defined(CONFIG_GDBSTUB)
-#include <zephyr/arch/arm/gdbstub.h>
-#include <zephyr/debug/gdbstub.h>
-#endif
-
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 #define FAULT_DUMP_VERBOSE	(CONFIG_FAULT_DUMP == 2)
@@ -152,7 +147,7 @@ bool z_arm_fault_undef_instruction_fp(void)
 
 	__set_FPEXC(FPEXC_EN);
 
-	if (_current_cpu->nested > 1) {
+	if (_kernel.cpus[0].nested > 1) {
 		/*
 		 * If the nested count is greater than 1, the undefined
 		 * instruction exception came from an irq/svc context.  (The
@@ -160,12 +155,12 @@ bool z_arm_fault_undef_instruction_fp(void)
 		 * the undef exception would increment it to 2).
 		 */
 		struct __fpu_sf *spill_esf =
-			(struct __fpu_sf *)_current_cpu->fp_ctx;
+			(struct __fpu_sf *)_kernel.cpus[0].fp_ctx;
 
 		if (spill_esf == NULL)
 			return false;
 
-		_current_cpu->fp_ctx = NULL;
+		_kernel.cpus[0].fp_ctx = NULL;
 
 		/*
 		 * If the nested count is 2 and the current thread has used the
@@ -175,9 +170,9 @@ bool z_arm_fault_undef_instruction_fp(void)
 		 * saved exception stack frame, then save the floating point
 		 * context because it is about to be overwritten.
 		 */
-		if (((_current_cpu->nested == 2)
+		if (((_kernel.cpus[0].nested == 2)
 				&& (_current->base.user_options & K_FP_REGS))
-			|| ((_current_cpu->nested > 2)
+			|| ((_kernel.cpus[0].nested > 2)
 				&& (spill_esf->undefined & FPEXC_EN))) {
 			/*
 			 * Spill VFP registers to specified exception stack
@@ -206,7 +201,7 @@ bool z_arm_fault_undef_instruction_fp(void)
  *
  * @return Returns true if the fault is fatal
  */
-bool z_arm_fault_undef_instruction(struct arch_esf *esf)
+bool z_arm_fault_undef_instruction(z_arch_esf_t *esf)
 {
 #if defined(CONFIG_FPU_SHARING)
 	/*
@@ -218,12 +213,6 @@ bool z_arm_fault_undef_instruction(struct arch_esf *esf)
 	z_arm_fpu_caller_save(&esf->fpu);
 #endif
 
-#if defined(CONFIG_GDBSTUB)
-	z_gdb_entry(esf, GDB_EXCEPTION_INVALID_INSTRUCTION);
-	/* Might not be fatal if GDB stub placed it in the code. */
-	return false;
-#endif
-
 	/* Print fault information */
 	LOG_ERR("***** UNDEFINED INSTRUCTION ABORT *****");
 
@@ -243,7 +232,7 @@ bool z_arm_fault_undef_instruction(struct arch_esf *esf)
  *
  * @return Returns true if the fault is fatal
  */
-bool z_arm_fault_prefetch(struct arch_esf *esf)
+bool z_arm_fault_prefetch(z_arch_esf_t *esf)
 {
 	uint32_t reason = K_ERR_CPU_EXCEPTION;
 
@@ -258,17 +247,6 @@ bool z_arm_fault_prefetch(struct arch_esf *esf)
 	/* Read Instruction Fault Address Register (IFAR) */
 	uint32_t ifar = __get_IFAR();
 
-#if defined(CONFIG_GDBSTUB)
-	/* The BKPT instruction could have caused a software breakpoint */
-	if (fs == IFSR_DEBUG_EVENT) {
-		/* Debug event, call the gdbstub handler */
-		z_gdb_entry(esf, GDB_EXCEPTION_BREAKPOINT);
-	} else {
-		/* Fatal */
-		z_gdb_entry(esf, GDB_EXCEPTION_MEMORY_FAULT);
-	}
-	return false;
-#endif
 	/* Print fault information*/
 	LOG_ERR("***** PREFETCH ABORT *****");
 	if (FAULT_DUMP_VERBOSE) {
@@ -299,7 +277,7 @@ static const struct z_exc_handle exceptions[] = {
  *
  * @return true if error is recoverable, otherwise return false.
  */
-static bool memory_fault_recoverable(struct arch_esf *esf)
+static bool memory_fault_recoverable(z_arch_esf_t *esf)
 {
 	for (int i = 0; i < ARRAY_SIZE(exceptions); i++) {
 		/* Mask out instruction mode */
@@ -321,7 +299,7 @@ static bool memory_fault_recoverable(struct arch_esf *esf)
  *
  * @return Returns true if the fault is fatal
  */
-bool z_arm_fault_data(struct arch_esf *esf)
+bool z_arm_fault_data(z_arch_esf_t *esf)
 {
 	uint32_t reason = K_ERR_CPU_EXCEPTION;
 
@@ -336,12 +314,6 @@ bool z_arm_fault_data(struct arch_esf *esf)
 	/* Read Data Fault Address Register (DFAR) */
 	uint32_t dfar = __get_DFAR();
 
-#if defined(CONFIG_GDBSTUB)
-	z_gdb_entry(esf, GDB_EXCEPTION_MEMORY_FAULT);
-	/* return false - non-fatal error */
-	return false;
-#endif
-
 #if defined(CONFIG_USERSPACE)
 	if ((fs == COND_CODE_1(CONFIG_AARCH32_ARMV8_R,
 				(FSR_FS_TRANSLATION_FAULT),

arch/arm/core/cortex_a_r/irq_manage.c

@@ -71,7 +71,7 @@ void z_arm_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
 }
 #endif /* !CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER */
 
-void z_arm_fatal_error(unsigned int reason, const struct arch_esf *esf);
+void z_arm_fatal_error(unsigned int reason, const z_arch_esf_t *esf);
 
 /**
  *
@@ -98,7 +98,7 @@ void _arch_isr_direct_pm(void)
 
 	if (_kernel.idle) {
 		_kernel.idle = 0;
-		pm_system_resume();
+		z_pm_save_idle_exit();
 	}
 
 	irq_unlock(key);

arch/arm/core/cortex_a_r/isr_wrapper.S

@@ -22,7 +22,6 @@
 #include <offsets_short.h>
 #include <zephyr/arch/cpu.h>
 #include <zephyr/sw_isr_table.h>
-#include "macro_priv.inc"
 
 
 _ASM_FILE_PROLOGUE
@@ -32,7 +31,6 @@ GDATA(_sw_isr_table)
 GTEXT(_isr_wrapper)
 GTEXT(z_arm_int_exit)
 
-#ifndef CONFIG_USE_SWITCH
 /**
  *
  * @brief Wrapper around ISRs when inserted in software ISR table
@@ -59,8 +57,8 @@ SECTION_FUNC(TEXT, _isr_wrapper)
 	cmp r0, #MODE_USR
 	bne isr_system_thread
 
-	get_cpu r0
-	ldr r0, [r0, #___cpu_t_current_OFFSET]
+	ldr r0, =_kernel
+	ldr r0, [r0, #_kernel_offset_to_current]
 
 	/* Save away user stack pointer */
 	cps #MODE_SYS
@@ -110,10 +108,10 @@ _vfp_not_enabled:
 	 * Mark where to store the floating context for the undefined
 	 * instruction handler
 	 */
-	get_cpu r2
-	ldr r0, [r2, #___cpu_t_fp_ctx_OFFSET]
+	ldr r2, =_kernel
+	ldr r0, [r2, #_kernel_offset_to_fp_ctx]
 	cmp r0, #0
-	streq sp, [r2, #___cpu_t_fp_ctx_OFFSET]
+	streq sp, [r2, #_kernel_offset_to_fp_ctx]
 #endif /* CONFIG_FPU_SHARING */
 
 	/*
@@ -141,10 +139,10 @@ _vfp_not_enabled:
 	push {r2, r3}
 
 	/* Increment interrupt nesting count */
-	get_cpu r2
-	ldr r0, [r2, #___cpu_t_nested_OFFSET]
+	ldr r2, =_kernel
+	ldr r0, [r2, #_kernel_offset_to_nested]
 	add r0, r0, #1
-	str r0, [r2, #___cpu_t_nested_OFFSET]
+	str r0, [r2, #_kernel_offset_to_nested]
 
 #ifdef CONFIG_TRACING_ISR
 	bl sys_trace_isr_enter
@@ -156,7 +154,7 @@ _vfp_not_enabled:
 	 * idle, this ensures that the calculation and programming of the
 	 * device for the next timer deadline is not interrupted.  For
 	 * non-tickless idle, this ensures that the clearing of the kernel idle
-	 * state is not interrupted.  In each case, pm_system_resume
+	 * state is not interrupted.  In each case, z_pm_save_idle_exit
 	 * is called with interrupts disabled.
 	 */
 
@@ -170,7 +168,7 @@ _vfp_not_enabled:
 	movs r1, #0
 	/* clear kernel idle state */
 	str r1, [r2, #_kernel_offset_to_idle]
-	bl pm_system_resume
+	bl z_pm_save_idle_exit
 _idle_state_cleared:
 
 #endif /* CONFIG_PM */
@@ -189,7 +187,7 @@ _idle_state_cleared:
 	 *
 	 * Note that interrupts are disabled up to this point on the ARM
 	 * architecture variants other than the Cortex-M. It is also important
-	 * to note that most interrupt controllers require that the nested
+	 * to note that that most interrupt controllers require that the nested
 	 * interrupts are handled after the active interrupt is acknowledged;
 	 * this is be done through the `get_active` interrupt controller
 	 * interface function.
@@ -229,154 +227,3 @@ spurious_continue:
 	 * z_arm_int_exit() */
 	ldr r1, =z_arm_int_exit
 	bx r1
-
-#else
-/**
- *
- * @brief Wrapper around ISRs when inserted in software ISR table
- *
- * When inserted in the vector table, _isr_wrapper() demuxes the ISR table
- * using the running interrupt number as the index, and invokes the registered
- * ISR with its corresponding argument. When returning from the ISR, it
- * determines if a context switch needs to happen and invoke the arch_switch
- * function if so.
- *
- */
-SECTION_FUNC(TEXT, _isr_wrapper)
-	sub lr, #4
-	z_arm_cortex_ar_enter_exc
-
-	/* Increment interrupt nesting count */
-	get_cpu r2
-	ldr r0, [r2, #___cpu_t_nested_OFFSET]
-	add r0, #1
-	str r0, [r2, #___cpu_t_nested_OFFSET]
-
-	/* If not nested: switch to IRQ stack and save current sp on it. */
-	cmp r0, #1
-	bhi 1f
-	mov r0, sp
-	cps #MODE_IRQ
-	push {r0}
-1:
-#ifdef CONFIG_TRACING_ISR
-	bl sys_trace_isr_enter
-#endif /* CONFIG_TRACING_ISR */
-
-#ifdef CONFIG_PM
-	/*
-	 * All interrupts are disabled when handling idle wakeup.  For tickless
-	 * idle, this ensures that the calculation and programming of the
-	 * device for the next timer deadline is not interrupted.  For
-	 * non-tickless idle, this ensures that the clearing of the kernel idle
-	 * state is not interrupted.  In each case, pm_system_resume
-	 * is called with interrupts disabled.
-	 */
-
-	/* is this a wakeup from idle ? */
-	ldr r2, =_kernel
-	/* requested idle duration, in ticks */
-	ldr r0, [r2, #_kernel_offset_to_idle]
-	cmp r0, #0
-
-	beq _idle_state_cleared
-	movs r1, #0
-	/* clear kernel idle state */
-	str r1, [r2, #_kernel_offset_to_idle]
-	bl pm_system_resume
-_idle_state_cleared:
-#endif /* CONFIG_PM */
-
-	/* Get active IRQ number from the interrupt controller */
-#if !defined(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER)
-	bl arm_gic_get_active
-#else
-	bl z_soc_irq_get_active
-#endif /* !CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER */
-
-	push {r0, r1}
-	lsl r0, r0, #3	/* table is 8-byte wide */
-
-	/*
-	 * Skip calling the isr if it is a spurious interrupt.
-	 */
-	mov r1, #CONFIG_NUM_IRQS
-	lsl r1, r1, #3
-	cmp r0, r1
-	bge spurious_continue
-
-	ldr r1, =_sw_isr_table
-	add r1, r1, r0	/* table entry: ISRs must have their MSB set to stay
-			 * in thumb mode */
-	ldm r1!,{r0,r3}	/* arg in r0, ISR in r3 */
-
-	/*
-	 * Enable and disable interrupts again to allow nested in exception handlers.
-	 */
-	cpsie i
-	blx r3		/* call ISR */
-	cpsid i
-
-spurious_continue:
-	/* Signal end-of-interrupt */
-	pop {r0, r1}
-#if !defined(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER)
-	bl arm_gic_eoi
-#else
-	bl z_soc_irq_eoi
-#endif /* !CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER */
-
-#ifdef CONFIG_TRACING_ISR
-	bl sys_trace_isr_exit
-#endif
-
-GTEXT(z_arm_cortex_ar_irq_done)
-z_arm_cortex_ar_irq_done:
-	/* Decrement interrupt nesting count */
-	get_cpu r2
-	ldr r0, [r2, #___cpu_t_nested_OFFSET]
-	sub r0, r0, #1
-	str r0, [r2, #___cpu_t_nested_OFFSET]
-	/* Do not context switch if exiting a nested interrupt */
-	cmp r0, #0
-	/* Note that this function is only called from `z_arm_svc`,
-	 *	while handling irq_offload, with below modes set:
-	 *	```
-	 *		if (cpu interrupts are nested)
-	 *			mode=MODE_SYS
-	 *		else
-	 *			mode=MODE_IRQ
-	 *	```
-	 */
-	bhi __EXIT_INT
-
-	/* retrieve pointer to the current thread */
-	pop {r0}
-	cps #MODE_SYS
-	mov sp, r0
-
-	ldr r1, [r2, #___cpu_t_current_OFFSET]
-	push {r1}
-	mov r0, #0
-	bl z_get_next_switch_handle
-
-	pop {r1}
-	cmp r0, #0
-	beq __EXIT_INT
-
-	/*
-	 * Switch thread
-	 * r0: new thread
-	 * r1: old thread
-	 */
-	bl z_arm_context_switch
-
-__EXIT_INT:
-
-#ifdef CONFIG_STACK_SENTINEL
-	bl z_check_stack_sentinel
-#endif /* CONFIG_STACK_SENTINEL */
-
-	b z_arm_cortex_ar_exit_exc
-
-#endif

arch/arm/core/cortex_a_r/macro_priv.inc

@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2023 Arm Limited (or its affiliates). All rights reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef _MACRO_PRIV_INC_
-#define _MACRO_PRIV_INC_
-
-#include <zephyr/arch/arm/cortex_a_r/tpidruro.h>
-
-/*
- * Get CPU id
- */
-
-.macro get_cpu_id rreg0
-	/* Read MPIDR register */
-	mrc p15, 0, \rreg0, c0, c0, 5
-	ubfx	\rreg0, \rreg0, #0, #24
-.endm
-
-/*
- * Get CPU logic id by looking up cpu_node_list
- * returns
- *   reg0: MPID
- *   reg1: logic id (0 ~ CONFIG_MP_MAX_NUM_CPUS - 1)
- * clobbers: reg0, reg1, reg2, reg3
- */
-.macro get_cpu_logic_id reg0, reg1, reg2, reg3
-	get_cpu_id \reg0
-	ldr	\reg3, =cpu_node_list
-	mov	\reg1, #0
-1:	ldr	\reg2, [\reg3, \reg1, lsl #2]
-	cmp	\reg2, \reg0
-	beq	2f
-	add	\reg1, \reg1, #1
-	cmp	\reg1, #CONFIG_MP_MAX_NUM_CPUS
-	bne	1b
-	b	.
-2:
-.endm
-
-.macro get_cpu rreg0
-	/*
-         * Get CPU pointer.
-	 */
-	mrc p15, 0, \rreg0, c13, c0, 3
-        and \rreg0, #TPIDRURO_CURR_CPU
-.endm
-
-.macro z_arm_cortex_ar_enter_exc
-	/*
-	 * Store r0-r3, r12, lr into the stack to construct an exception
-	 * stack frame.
-	 */
-	srsdb sp!, #MODE_SYS
-	cps #MODE_SYS
-	push {r0-r3, r12, lr}
-
-	/* TODO: EXTRA_EXCEPTION_INFO */
-	mov r0, sp
-
-	/* increment exception depth */
-	get_cpu r2
-	ldrb r1, [r2, #_cpu_offset_to_exc_depth]
-	add r1, r1, #1
-	strb r1, [r2, #_cpu_offset_to_exc_depth]
-.endm
-
-#endif /* _MACRO_PRIV_INC_ */