soc: Remove soc_legacy folder and move ARM Kconfig

Removes the soc_legacy folder which is left over from the
transition to hwmv2 and moves the Kconfig for ARM to arch

Signed-off-by: Jamie McCrae <jamie.mccrae@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,8 @@ 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 +82,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

@@ -11,9 +11,9 @@ updates:
 At this time, with the latest release of v3.6, the supported
 versions are:
 
-  - v3.7: Current LTS
-  - v3.6: Prior release
-  - v2.7: Prior LTS
+  - v2.7: Current LTS
+  - v3.5: Prior release
+  - v3.6: Current release
 
 ## Reporting process
 

.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/**"
@@ -31,16 +30,22 @@ concurrency:
 jobs:
   bsim-test:
     if: github.repository_owner == 'zephyrproject-rtos'
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
+    runs-on: zephyr-runner-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.13.20240601
+      image: ghcr.io/zephyrproject-rtos/ci:v0.26.7
       options: '--entrypoint /bin/bash'
+      volumes:
+        - /repo-cache/zephyrproject:/github/cache/zephyrproject
     env:
       ZEPHYR_TOOLCHAIN_VARIANT: zephyr
       BSIM_OUT_PATH: /opt/bsim/
       BSIM_COMPONENTS_PATH: /opt/bsim/components
       EDTT_PATH: ../tools/edtt
+      bsim_bt_52_test_results_file: ./bsim_bt/52_bsim_results.xml
+      bsim_bt_53_test_results_file: ./bsim_bt/53_bsim_results.xml
+      bsim_bt_53split_test_results_file: ./bsim_bt/53_bsim_split_results.xml
+      bsim_net_52_test_results_file: ./bsim_net/52_bsim_results.xml
+      bsim_uart_test_results_file: ./bsim_uart/uart_bsim_results.xml
     steps:
       - name: Apply container owner mismatch workaround
         run: |
@@ -50,16 +55,10 @@ jobs:
           #        GitHub comes up with a fundamental fix for this problem.
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
-      - name: Print cloud service information
-        run: |
-          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
       - name: Clone cached Zephyr repository
         continue-on-error: true
         run: |
-          git clone --shared /repo-cache/zephyrproject/zephyr .
+          git clone --shared /github/cache/zephyrproject/zephyr .
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: Checkout
@@ -79,56 +78,56 @@ jobs:
           west init -l . || true
           west config manifest.group-filter -- +ci
           west config --global update.narrow true
-          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 update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
           west forall -c 'git reset --hard HEAD'
 
           echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
 
       - name: Check common triggering files
-        uses: tj-actions/changed-files@v44
+        uses: tj-actions/changed-files@v41
         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@v41
         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@v41
         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
+        uses: tj-actions/changed-files@v41
         id: check-uart-files
         with:
           files: |
-            tests/bsim/drivers/uart/
+            tests/bsim/drivers/uart/**
             drivers/serial/*nrfx*
-            tests/drivers/uart/
+            tests/drivers/uart/**
 
       - name: Update BabbleSim to manifest revision
         if: >
@@ -141,46 +140,70 @@ jobs:
           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}
+          export WORK_DIR=${ZEPHYR_BASE}/bsim_bt
+          # Build and run the BT tests for nrf52_bsim:
+          nice tests/bsim/bluetooth/compile.sh
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_52_test_results_file} \
+          TESTS_FILE=tests/bsim/bluetooth/tests.nrf52bsim.txt tests/bsim/run_parallel.sh
+          # Build and run the BT controller tests also for the nrf5340bsim_nrf5340_cpunet
+          BOARD=nrf5340bsim_nrf5340_cpunet \
+          nice tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpunet.sh
+          BOARD=nrf5340bsim_nrf5340_cpunet \
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_53_test_results_file} \
+          TESTS_FILE=tests/bsim/bluetooth/tests.nrf5340bsim_nrf5340_cpunet.txt \
+          tests/bsim/run_parallel.sh
+          # Build and run the nrf5340 split stack tests set
+          BOARD=nrf5340bsim_nrf5340_cpuapp \
+          nice tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpuapp.sh
+          BOARD=nrf5340bsim_nrf5340_cpuapp \
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_53split_test_results_file} \
+          TESTS_FILE=tests/bsim/bluetooth/tests.nrf5340bsim_nrf5340_cpuapp.txt \
+          tests/bsim/run_parallel.sh
 
       - name: Run Networking Tests with BSIM
         if: steps.check-networking-files.outputs.any_changed == 'true' || steps.check-common-files.outputs.any_changed == 'true'
         run: |
-          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
+          echo "UART: Single device tests"
+          ./scripts/twister -T tests/drivers/uart/ --force-color --inline-logs -v -M -p nrf52_bsim \
+            --fixture gpio_loopback -- -uart0_loopback
+          echo "UART: Multi device tests"
+          export ZEPHYR_BASE=${PWD}
+          WORK_DIR=${ZEPHYR_BASE}/bsim_uart nice tests/bsim/drivers/uart/compile.sh
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_uart_test_results_file} \
+          SEARCH_PATH=tests/bsim/drivers/uart/ tests/bsim/run_parallel.sh
 
-      - name: 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
         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_bt/53_bsim_split_results.xml
+            ./bsim_net/52_bsim_results.xml
+            ./bsim_uart/uart_bsim_results.xml
+            ./twister-out/twister.xml
+            ./twister-out/twister.json
+            ${{ github.event_path }}
+          if-no-files-found: warn
 
       - name: Upload Event Details
         if: always()

.github/workflows/bug_snapshot.yaml

@@ -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

@@ -9,19 +9,17 @@ concurrency:
 jobs:
   clang-build:
     if: github.repository_owner == 'zephyrproject-rtos'
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
+    runs-on: zephyr-runner-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.13.20240601
+      image: ghcr.io/zephyrproject-rtos/ci:v0.26.7
       options: '--entrypoint /bin/bash'
+      volumes:
+        - /repo-cache/zephyrproject:/github/cache/zephyrproject
     strategy:
       fail-fast: false
       matrix:
         platform: ["native_sim"]
     env:
-      CCACHE_DIR: /node-cache/ccache-zephyr
-      CCACHE_REMOTE_STORAGE: "redis://cache-*.keydb-cache.svc.cluster.local|shards=1,2,3"
-      CCACHE_REMOTE_ONLY: "true"
       LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-16
       COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
       BASE_REF: ${{ github.base_ref }}
@@ -36,16 +34,10 @@ jobs:
           #        GitHub comes up with a fundamental fix for this problem.
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
-      - name: Print cloud service information
-        run: |
-          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
       - name: Clone cached Zephyr repository
         continue-on-error: true
         run: |
-          git clone --shared /repo-cache/zephyrproject/zephyr .
+          git clone --shared /github/cache/zephyrproject/zephyr .
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: Checkout
@@ -71,7 +63,7 @@ jobs:
           # So first retry to update, if that does not work, remove all modules
           # and start over. (Workaround until we implement more robust module
           # 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)
+          west update --path-cache /github/cache/zephyrproject 2>&1 1> west.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west2.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
 
           echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
 
@@ -82,22 +74,31 @@ jobs:
           gcc --version
           ls -la
 
-      - name: Set up ccache
+      - name: Prepare ccache timestamp/data
+        id: ccache_cache_timestamp
+        shell: cmake -P {0}
         run: |
-          mkdir -p ${CCACHE_DIR}
-          ccache -M 10G
-          ccache -p
-          ccache -z -s -vv
+          string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+          string(REPLACE "/" "_" repo ${{github.repository}})
+          string(REPLACE "-" "_" repo2 ${repo})
+          file(APPEND $ENV{GITHUB_OUTPUT} "repo=${repo2}\n")
 
-      - name: Update BabbleSim to manifest revision
+      - name: use cache
+        id: cache-ccache
+        uses: zephyrproject-rtos/action-s3-cache@v1.2.0
+        with:
+          key: ${{ steps.ccache_cache_timestamp.outputs.repo }}-${{ github.ref_name }}-clang-${{ matrix.platform }}-ccache
+          path: /github/home/.cache/ccache
+          aws-s3-bucket: ccache.zephyrproject.org
+          aws-access-key-id: ${{ vars.AWS_CCACHE_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_CCACHE_SECRET_ACCESS_KEY }}
+          aws-region: us-east-2
+
+      - name: ccache stats initial
         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
+          mkdir -p /github/home/.cache
+          test -d github/home/.cache/ccache && rm -rf /github/home/.cache/ccache && mv github/home/.cache/ccache /github/home/.cache/ccache
+          ccache -M 10G -s
 
       - name: Run Tests with Twister
         id: twister
@@ -118,10 +119,10 @@ jobs:
             echo "report_needed=0" >> $GITHUB_OUTPUT
           fi
 
-      - name: Print ccache stats
-        if: always()
+      - name: ccache stats post
         run: |
-          ccache -s -vv
+          ccache -s
+          ccache -p
 
       - name: Upload Unit Test Results
         if: always() && steps.twister.outputs.report_needed != 0

.github/workflows/codecov.yaml

@@ -2,7 +2,7 @@ name: Code Coverage with codecov
 
 on:
   schedule:
-    - cron: '25 06,18 * * *'
+    - cron: '25 06,18 * * 1-5'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
@@ -10,31 +10,17 @@ concurrency:
 
 jobs:
   codecov:
-    if: github.repository_owner == 'zephyrproject-rtos'
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
+    if: github.repository == 'zephyrproject-rtos/zephyr'
+    runs-on: zephyr-runner-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.13.20240601
+      image: ghcr.io/zephyrproject-rtos/ci:v0.26.7
       options: '--entrypoint /bin/bash'
+      volumes:
+        - /repo-cache/zephyrproject:/github/cache/zephyrproject
     strategy:
       fail-fast: false
       matrix:
         platform: ["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'
-    env:
-      CCACHE_DIR: /node-cache/ccache-zephyr
-      CCACHE_REMOTE_STORAGE: "redis://cache-*.keydb-cache.svc.cluster.local|shards=1,2,3"
-      CCACHE_REMOTE_ONLY: "true"
-      # `--specs` is ignored because ccache is unable to resovle the toolchain specs file path.
-      CCACHE_IGNOREOPTIONS: '--specs=*'
     steps:
       - name: Apply container owner mismatch workaround
         run: |
@@ -44,12 +30,6 @@ jobs:
           #        GitHub comes up with a fundamental fix for this problem.
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
-      - name: Print cloud service information
-        run: |
-          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
       - name: Update PATH for west
         run: |
           echo "$HOME/.local/bin" >> $GITHUB_PATH
@@ -57,7 +37,7 @@ jobs:
       - name: Clone cached Zephyr repository
         continue-on-error: true
         run: |
-          git clone --shared /repo-cache/zephyrproject/zephyr .
+          git clone --shared /github/cache/zephyrproject/zephyr .
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: checkout
@@ -78,22 +58,30 @@ jobs:
 
           echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
 
-      - name: Set up ccache
+      - name: Prepare ccache keys
+        id: ccache_cache_prop
+        shell: cmake -P {0}
         run: |
-          mkdir -p ${CCACHE_DIR}
-          ccache -M 10G
-          ccache -p
-          ccache -z -s -vv
+          string(REPLACE "/" "_" repo ${{github.repository}})
+          string(REPLACE "-" "_" repo2 ${repo})
+          file(APPEND $ENV{GITHUB_OUTPUT} "repo=${repo2}\n")
 
-      - name: Update BabbleSim to manifest revision
+      - name: use cache
+        id: cache-ccache
+        uses: zephyrproject-rtos/action-s3-cache@v1.2.0
+        with:
+          key: ${{ steps.ccache_cache_prop.outputs.repo }}-${{github.event_name}}-${{matrix.platform}}-codecov-ccache
+          path: /github/home/.cache/ccache
+          aws-s3-bucket: ccache.zephyrproject.org
+          aws-access-key-id: ${{ vars.AWS_CCACHE_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_CCACHE_SECRET_ACCESS_KEY }}
+          aws-region: us-east-2
+
+      - name: ccache stats initial
         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
+          mkdir -p /github/home/.cache
+          test -d github/home/.cache/ccache && mv github/home/.cache/ccache /github/home/.cache/ccache
+          ccache -M 10G -s
 
       - name: Run Tests with Twister (Push)
         continue-on-error: true
@@ -102,31 +90,24 @@ jobs:
           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 -i --force-color -N -v --filter runnable -p ${{ matrix.platform }} --coverage -T tests --coverage-tool gcovr -xCONFIG_TEST_EXTRA_STACK_SIZE=4096 -e nano
 
-      - name: Print ccache stats
-        if: always()
+      - name: ccache stats post
         run: |
-          ccache -s -vv
+          ccache -s
+          ccache -p
 
       - name: Rename coverage files
         if: always()
         run: |
-          mv twister-out/coverage.json coverage/reports/${{matrix.normalized}}.json
+          cp twister-out/coverage.json coverage/reports/${{ matrix.platform }}.json
 
       - name: Upload Coverage Results
         if: always()
         uses: actions/upload-artifact@v4
         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 }}.json
 
   codecov-results:
     name: "Publish Coverage Results"
@@ -140,7 +121,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
       - name: Download Artifacts
         uses: actions/download-artifact@v4
         with:
@@ -148,9 +128,7 @@ jobs:
 
       - 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/*/*.json ./coverage/reports
           ls -la ./coverage/reports
 
       - name: Generate list of coverage files
@@ -181,49 +159,26 @@ jobs:
 
       - name: Merge coverage files
         run: |
-          pushd ./coverage/reports
+          cd ./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
+      - name: Upload Merged Coverage Results
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: Coverage Data and report
+          name: Merged Coverage Data
           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
 
       - 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.xml

.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:
@@ -23,11 +17,6 @@ jobs:
         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
       with:
@@ -38,7 +27,7 @@ jobs:
       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
@@ -58,14 +47,6 @@ jobs:
         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
-
     - name: Run Compliance Tests
       continue-on-error: true
       id: compliance
@@ -94,33 +75,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 }}

.github/workflows/devicetree_checks.yml

@@ -26,10 +26,10 @@ 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', '3.11', '3.12']
+        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
@@ -37,7 +37,7 @@ jobs:
     - name: checkout
       uses: actions/checkout@v4
     - 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

.github/workflows/doc-build.yml

@@ -17,10 +17,7 @@ env:
   # 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:
@@ -37,54 +34,34 @@ jobs:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
     - name: Check if Documentation related files changed
-      uses: tj-actions/changed-files@v44
+      uses: tj-actions/changed-files@v42
       id: check-doc-files
       with:
         files: |
-          doc/
+          doc/**
           **.rst
-          include/
+          include/**
           kernel/include/kernel_arch_interface.h
           lib/libc/**
           subsys/testsuite/ztest/include/**
-          tests/
+          tests/**
           **/Kconfig*
           west.yml
-          scripts/dts/
+          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
+    if: github.repository_owner == 'zephyrproject-rtos' && needs.doc-file-check.outputs.file_check == 'true'
+    runs-on: zephyr-runner-linux-x64-4xlarge
+    timeout-minutes: 45
     concurrency:
       group: doc-build-html-${{ github.ref }}
       cancel-in-progress: true
 
     steps:
-    - 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: install-pkgs
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y wget python3-pip git ninja-build graphviz lcov
-        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
       with:
@@ -103,6 +80,14 @@ jobs:
         git rebase origin/${BASE_REF}
         git log --graph --oneline HEAD...${PR_HEAD}
 
+    - name: install-pkgs
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y ninja-build graphviz lcov
+        wget --no-verbose "https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz"
+        tar xf doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz
+        echo "${PWD}/doxygen-${DOXYGEN_VERSION}/bin" >> $GITHUB_PATH
+
     - name: cache-pip
       uses: actions/cache@v4
       with:
@@ -135,11 +120,7 @@ jobs:
         else
           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}
+        DOC_TAG=${DOC_TAG} 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
@@ -149,9 +130,9 @@ jobs:
 
     - 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
+        tar cfJ api-output.tar.xz --directory=doc/_build html/doxygen/html
+        tar cfJ api-coverage.tar.xz coverage-report
 
     - name: upload-build
       uses: actions/upload-artifact@v4
@@ -188,14 +169,12 @@ jobs:
 
   doc-build-pdf:
     name: "Documentation Build (PDF)"
-    needs: [doc-file-check]
     if: |
       github.event_name != 'pull_request' &&
       github.repository_owner == 'zephyrproject-rtos'
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
+    runs-on: zephyr-runner-linux-x64-4xlarge
     container: texlive/texlive:latest
-    timeout-minutes: 120
+    timeout-minutes: 60
     concurrency:
       group: doc-build-pdf-${{ github.ref }}
       cancel-in-progress: true
@@ -205,19 +184,13 @@ jobs:
       run: |
         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: checkout
       uses: actions/checkout@v4
 
     - 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
@@ -252,10 +225,7 @@ 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()

.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,10 @@ 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
+        tar xf api-coverage/api-coverage.tar.xz -C api-coverage
 
     - 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 +62,6 @@ 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
+        aws s3 sync --quiet api-coverage/coverage-report/ \
+          s3://builds.zephyrproject.org/${{ github.event.repository.name }}/pr/${PR_NUM}/api-coverage \
+          --delete

.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,10 @@ 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
+        tar xf api-coverage/api-coverage.tar.xz -C api-coverage
 
     - 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 +53,5 @@ 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 sync --quiet api-coverage/coverage-report/ s3://docs.zephyrproject.org/api-coverage/${VERSION} --delete
         aws s3 cp --quiet pdf-output/zephyr.pdf s3://docs.zephyrproject.org/${VERSION}/zephyr.pdf

.github/workflows/errno.yml

@@ -10,7 +10,7 @@ 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.7
 
     steps:
       - name: Apply container owner mismatch workaround

.github/workflows/footprint-tracking.yml

@@ -22,11 +22,10 @@ concurrency:
 
 jobs:
   footprint-tracking:
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
+    runs-on: zephyr-runner-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:v0.26.7
       options: '--entrypoint /bin/bash'
     strategy:
       fail-fast: false
@@ -41,12 +40,6 @@ jobs:
           #        GitHub comes up with a fundamental fix for this problem.
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
-      - name: Print cloud service information
-        run: |
-          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
       - name: Update PATH for west
         run: |
           echo "$HOME/.local/bin" >> $GITHUB_PATH
@@ -74,7 +67,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/hello_world_multiplatform.yaml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14, windows-2022]
+        os: [ubuntu-22.04, macos-12, macos-14, windows-2022]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -49,7 +49,7 @@ jobs:
           git log --graph --oneline HEAD...${PR_HEAD}
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
         with:
           python-version: 3.11
 

.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'
@@ -42,7 +42,7 @@ jobs:
         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/manifest.yml

@@ -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.2
         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,13 +25,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.10', '3.11', '3.12']
+        python-version: [3.8, 3.9, '3.10', '3.11', '3.12']
         os: [ubuntu-22.04]
     steps:
     - name: checkout
       uses: actions/checkout@v4
     - 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

.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,7 +25,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.10', '3.11', '3.12']
+        python-version: [3.8, 3.9, '3.10', '3.11', '3.12']
         os: [ubuntu-20.04]
     steps:
       - name: checkout
@@ -46,7 +46,7 @@ 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 }}
 

.github/workflows/twister.yaml

@@ -22,18 +22,19 @@ concurrency:
 jobs:
   twister-build-prep:
     if: github.repository_owner == 'zephyrproject-rtos'
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
+    runs-on: zephyr-runner-linux-x64-4xlarge
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.14.20240823
+      image: ghcr.io/zephyrproject-rtos/ci:v0.26.7
       options: '--entrypoint /bin/bash'
+      volumes:
+        - /repo-cache/zephyrproject:/github/cache/zephyrproject
     outputs:
       subset: ${{ steps.output-services.outputs.subset }}
       size: ${{ steps.output-services.outputs.size }}
       fullrun: ${{ steps.output-services.outputs.fullrun }}
     env:
       MATRIX_SIZE: 10
-      PUSH_MATRIX_SIZE: 20
+      PUSH_MATRIX_SIZE: 15
       DAILY_MATRIX_SIZE: 80
       BSIM_OUT_PATH: /opt/bsim/
       BSIM_COMPONENTS_PATH: /opt/bsim/components
@@ -49,17 +50,11 @@ jobs:
           #        GitHub comes up with a fundamental fix for this problem.
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
 
-      - name: Print cloud service information
-        run: |
-          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
       - name: Clone cached Zephyr repository
         if: github.event_name == 'pull_request_target'
         continue-on-error: true
         run: |
-          git clone --shared /repo-cache/zephyrproject/zephyr .
+          git clone --shared /github/cache/zephyrproject/zephyr .
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: Checkout
@@ -81,7 +76,7 @@ jobs:
           west init -l . || true
           west config manifest.group-filter -- +ci,+optional
           west config --global update.narrow true
-          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 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
@@ -124,39 +119,28 @@ jobs:
           echo "fullrun=${TWISTER_FULL}" >> $GITHUB_OUTPUT
 
   twister-build:
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
+    runs-on: zephyr-runner-linux-x64-4xlarge
     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:v0.26.7
       options: '--entrypoint /bin/bash'
+      volumes:
+        - /repo-cache/zephyrproject:/github/cache/zephyrproject
     strategy:
       fail-fast: false
       matrix:
         subset: ${{fromJSON(needs.twister-build-prep.outputs.subset)}}
-    timeout-minutes: 1440
     env:
-      CCACHE_DIR: /node-cache/ccache-zephyr
-      CCACHE_REMOTE_STORAGE: "redis://cache-*.keydb-cache.svc.cluster.local|shards=1,2,3"
-      CCACHE_REMOTE_ONLY: "true"
-      # `--specs` is ignored because ccache is unable to resolve the toolchain specs file path.
-      CCACHE_IGNOREOPTIONS: '--specs=*'
       BSIM_OUT_PATH: /opt/bsim/
       BSIM_COMPONENTS_PATH: /opt/bsim/components
-      TWISTER_COMMON: ' --force-color --inline-logs -v -N -M --retry-failed 3 --timeout-multiplier 2 '
+      TWISTER_COMMON: ' --force-color --inline-logs -v -N -M --retry-failed 3 '
       DAILY_OPTIONS: ' -M --build-only --all --show-footprint'
       PR_OPTIONS: ' --clobber-output --integration'
       PUSH_OPTIONS: ' --clobber-output -M --show-footprint'
       COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
       BASE_REF: ${{ github.base_ref }}
     steps:
-      - 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: Apply container owner mismatch workaround
         run: |
           # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
@@ -168,7 +152,7 @@ jobs:
       - name: Clone cached Zephyr repository
         continue-on-error: true
         run: |
-          git clone --shared /repo-cache/zephyrproject/zephyr .
+          git clone --shared /github/cache/zephyrproject/zephyr .
           git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
 
       - name: Checkout
@@ -188,43 +172,56 @@ 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
           west config --global update.narrow true
-          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 update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
           west forall -c 'git reset --hard HEAD'
 
+          # Hotfix until we have kitware ninja in the docker image.
+          # Needed for full functionality of the job server functionality in twister which only works with
+          # kitware supplied ninja version.
+          wget -c    https://github.com/Kitware/ninja/releases/download/v1.11.1.g95dee.kitware.jobserver-1/ninja-1.11.1.g95dee.kitware.jobserver-1_x86_64-linux-gnu.tar.gz -O - | tar xz --strip-components=1
+          sudo cp ninja /usr/local/bin
+
           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 }}"
           echo "github.ref_name: ${{ github.ref_name }}"
 
-      - name: Set up ccache
+      - name: Prepare ccache timestamp/data
+        id: ccache_cache_timestamp
+        shell: cmake -P {0}
         run: |
-          mkdir -p ${CCACHE_DIR}
-          ccache -M 10G
-          ccache -p
-          ccache -z -s -vv
+          string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+          string(REPLACE "/" "_" repo ${{github.repository}})
+          string(REPLACE "-" "_" repo2 ${repo})
+          file(APPEND $ENV{GITHUB_OUTPUT} "repo=${repo2}\n")
 
-      - name: Update BabbleSim to manifest revision
+      - name: use cache
+        id: cache-ccache
+        uses: zephyrproject-rtos/action-s3-cache@v1.2.0
+        continue-on-error: true
+        with:
+          key: ${{ steps.ccache_cache_timestamp.outputs.repo }}-${{ github.ref_name }}-${{github.event_name}}-${{ matrix.subset }}-ccache
+          path: /github/home/.cache/ccache
+          aws-s3-bucket: ccache.zephyrproject.org
+          aws-access-key-id: ${{ vars.AWS_CCACHE_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_CCACHE_SECRET_ACCESS_KEY }}
+          aws-region: us-east-2
+
+      - name: ccache stats initial
         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
+          mkdir -p /github/home/.cache
+          test -d github/home/.cache/ccache && rm -rf /github/home/.cache/ccache && mv github/home/.cache/ccache /github/home/.cache/ccache
+          ccache -M 10G -s
 
       - if: github.event_name == 'push'
         name: Run Tests with Twister (Push)
@@ -267,10 +264,10 @@ jobs:
             fi
           fi
 
-      - name: Print ccache stats
-        if: always()
+      - name: ccache stats post
         run: |
-          ccache -s -vv
+          ccache -p
+          ccache -s
 
       - name: Upload Unit Test Results
         if: always()

.github/workflows/twister_tests.yml

@@ -8,13 +8,11 @@ on:
     branches:
     - main
     - v*-branch
-    - collab-*
     paths:
     - 'scripts/pylib/**'
     - 'scripts/twister'
     - 'scripts/tests/twister/**'
     - '.github/workflows/twister_tests.yml'
-    - 'scripts/schemas/twister/'
   pull_request:
     branches:
     - main
@@ -24,7 +22,6 @@ on:
     - 'scripts/twister'
     - 'scripts/tests/twister/**'
     - '.github/workflows/twister_tests.yml'
-    - 'scripts/schemas/twister/'
 
 jobs:
   twister-tests:
@@ -32,13 +29,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.10', '3.11', '3.12']
+        python-version: [3.8, 3.9, '3.10', '3.11', '3.12']
         os: [ubuntu-22.04]
     steps:
     - name: checkout
       uses: actions/checkout@v4
     - 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

.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,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.10', '3.11', '3.12']
+        python-version: [3.8, 3.9, '3.10', '3.11', '3.12']
         os: [ubuntu-22.04]
     container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.13
+      image: ghcr.io/zephyrproject-rtos/ci:v0.26.7
 
     steps:
     - name: Apply Container Owner Mismatch Workaround
@@ -43,8 +41,6 @@ jobs:
         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'
@@ -52,7 +48,7 @@ jobs:
         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,10 +27,10 @@ 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', '3.11', '3.12']
+        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
@@ -40,7 +38,7 @@ jobs:
     - name: checkout
       uses: actions/checkout@v4
     - 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

.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
@@ -88,7 +70,6 @@ tags
 BinaryFiles.txt
 BoardYml.txt
 Checkpatch.txt
-ClangFormat.txt
 DevicetreeBindings.txt
 GitDiffCheck.txt
 Gitlint.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
@@ -192,7 +188,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 +199,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)
@@ -222,30 +214,10 @@ endif()
 zephyr_compile_options(${OPTIMIZATION_FLAG})
 
 if(CONFIG_LTO)
-  zephyr_compile_options($<TARGET_PROPERTY:compiler,optimization_lto>)
+  add_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 +247,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)
 
@@ -548,9 +519,9 @@ 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>"
@@ -559,13 +530,13 @@ add_custom_command(
   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>"
@@ -574,9 +545,7 @@ if(EXISTS ${APPLICATION_SOURCE_DIR}/VERSION)
     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()
 
@@ -631,8 +600,7 @@ 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 +694,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 +731,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 +751,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 +770,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,7 +803,7 @@ 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
@@ -890,7 +839,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 +876,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,19 +939,14 @@ 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()
@@ -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>
@@ -1317,20 +1254,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)
@@ -1613,14 +1536,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,8 +1633,9 @@ 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)
+  set(KERNEL_META_PATH  ${PROJECT_BINARY_DIR}/${KERNEL_META_NAME} CACHE INTERNAL "")
+
   list(APPEND
     post_build_commands
     COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/zephyr_module.py
@@ -1728,9 +1649,6 @@ if(CONFIG_BUILD_OUTPUT_META)
     post_build_byproducts
     ${KERNEL_META_PATH}
   )
-else(CONFIG_BUILD_OUTPUT_META)
-  # Prevent spdx to use invalid data
-  file(REMOVE ${KERNEL_META_PATH})
 endif()
 
 # Cleanup intermediate files
@@ -1771,7 +1689,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 +1754,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
@@ -1891,20 +1798,6 @@ 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
-    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
-  )
-
-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}>
@@ -1919,13 +1812,12 @@ if(NOT CMAKE_C_COMPILER_ID STREQUAL "ARMClang")
   )
 
   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()
+    add_custom_target(
+      check_init_priorities
+      ALL
+      COMMAND ${check_init_priorities_command}
+      DEPENDS ${check_init_priorities_dependencies}
+    )
   endif()
 
   add_custom_target(
@@ -1983,47 +1875,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
@@ -2132,53 +2004,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

@@ -21,11 +21,12 @@
 /soc/arm/aspeed/                          @aspeeddylan
 /soc/atmel/                               @nandojve
 /soc/arm/bcm*/                            @sbranden
-/soc/arm/ene/                             @ene-steven
 /soc/arm/infineon_cat1/                   @ifyall @npal-cy
 /soc/arm/infineon_xmc/                    @parthitce
 /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
@@ -39,10 +40,7 @@
 /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
 /boards/arm/96b_argonkey/                 @avisconti
 /boards/arm/96b_avenger96/                @Mani-Sadhasivam
 /boards/arm/96b_carbon/                   @idlethread
@@ -54,6 +52,8 @@
 /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 +64,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 +74,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 +82,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
@@ -99,13 +103,14 @@
 /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/arm/stm32_min_dev/                @sidcha
-/boards/ezurio/*                          @rerickson1
 /boards/riscv/rv32m1_vega/                @dleach02
 /boards/riscv/adp_xc7k_ae350/             @cwshu @kevinwang821020 @jimmyzhe
 /boards/riscv/longan_nano/                @soburi
@@ -113,7 +118,6 @@
 /boards/riscv/niosv*/                     @sweeaun
 /boards/riscv/sparkfun_red_v_things_plus/ @soburi
 /boards/riscv/stamp_c3/                   @soburi
-/boards/starfive/visionfive2/	 	  @kanakshilledar @pfarwsi
 /boards/shields/atmel_rf2xx/              @nandojve
 /boards/shields/esp_8266/                 @nandojve
 /boards/shields/inventek_eswifi/          @nandojve
@@ -143,7 +147,9 @@
 /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
@@ -156,8 +162,7 @@
 /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/adc/adc_ad5592.c                 @bbilas
 /drivers/audio/*nrfx*                     @anangl
 /drivers/auxdisplay/*pt6314*              @xingrz
 /drivers/auxdisplay/*                      @thedjnK
@@ -182,13 +187,12 @@
 /drivers/display/*rm68200*                @mmahadevan108
 /drivers/display/display_ili9342c.*       @extremegtx
 /drivers/dac/*ad56xx*                     @benediktibk
-/drivers/dac/dac_ad559x.c                 @bbilas
+/drivers/dac/dac_ad5592.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
@@ -202,6 +206,7 @@
 /drivers/entropy/*b91*                    @andy-liu-telink
 /drivers/entropy/*bt_hci*                 @JordanYates
 /drivers/entropy/*rv32m1*                 @dleach02
+/drivers/entropy/*litex*                  @mateusz-holenko @kgugala @pgielda
 /drivers/ethernet/*dwmac*                 @npitre
 /drivers/ethernet/*stm32*                 @Nukersson @lochej
 /drivers/ethernet/*w5500*                 @parthitce
@@ -223,6 +228,7 @@
 /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 +237,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/gpio/gpio_ad5592.c               @bbilas
 /drivers/i2c/i2c_common.c                 @sjg20
 /drivers/i2c/i2c_emul.c                   @sjg20
 /drivers/i2c/i2c_ite_enhance.c            @GTLin08
@@ -245,13 +250,13 @@
 /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/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
@@ -272,7 +277,7 @@
 /drivers/kscan/*ft5336*                   @MaureenHelm
 /drivers/kscan/*ht16k33*                  @henrikbrixandersen
 /drivers/led_strip/                       @mbolivar-ampere
-/drivers/mfd/mfd_ad559x.c                 @bbilas
+/drivers/mfd/mfd_ad5592.c                 @bbilas
 /drivers/mfd/mfd_max20335.c               @bbilas
 /drivers/misc/ft8xx/                      @hubertmis
 /drivers/modem/hl7800.c                   @rerickson1
@@ -282,7 +287,6 @@
 /drivers/modem/Kconfig.simcom-sim7080     @lgehreke
 /drivers/pinctrl/*esp32*                  @sylvioalves
 /drivers/pinctrl/*it8xxx2*                @ite
-/drivers/pinctrl/*kb1200*                 @ene-steven
 /drivers/pm_cpu_ops/psci_shell.c          @nbalabak @gdengi
 /drivers/power_domain/                    @ceolin
 /drivers/ps2/*xec*                        @franciscomunoz @sjvasanth1
@@ -301,7 +305,6 @@
 /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
@@ -321,13 +324,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
@@ -346,7 +348,7 @@
 /drivers/serial/Kconfig.it8xxx2           @GTLin08
 /drivers/serial/uart_ite_it8xxx2.c        @GTLin08
 /drivers/serial/*intel_lw*                @shilinte
-/drivers/serial/*kb1200*                  @ene-steven
+/drivers/disk/sdmmc_sdhc.h                @JunYangNXP
 /drivers/disk/sdmmc_stm32.c               @anthonybrandon
 /drivers/ptp_clock/                       @tbursztyka @jukkar
 /drivers/spi/*b91*                        @andy-liu-telink
@@ -363,11 +365,13 @@
 /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
@@ -390,17 +394,16 @@
 /drivers/watchdog/*rpi_pico*              @thedjnK
 /drivers/watchdog/*dw*                    @softwarecki @pbalsundar
 /drivers/watchdog/*ifx*                   @sreeramIfx
-/drivers/watchdog/*kb1200*                @ene-steven
 /drivers/wifi/esp_at/                     @mniestroj
 /drivers/wifi/eswifi/                     @loicpoulain @nandojve
 /drivers/wifi/winc1500/                   @kludentwo
 /drivers/virtualization/		  @tbursztyka
+/dts/arc/                                 @abrodkin @ruuddw @iriszzw @evgeniy-paltsev
 /dts/arm/acsip/                           @NorthernDean
 /dts/arm/aspeed/                          @aspeeddylan
 /dts/arm/atmel/                           @galak @nandojve
 /dts/arm/broadcom/                        @sbranden
 /dts/arm/cypress/                         @ifyall @npal-cy
-/dts/arm/ene/kb1200                       @ene-steven
 /dts/arm/gd/                              @nandojve
 /dts/arm/infineon/xmc4*                   @parthitce @ifyall @npal-cy
 /dts/arm/infineon/psoc6/                  @ifyall @npal-cy
@@ -410,6 +413,7 @@
 /dts/arm64/renesas/                       @lorc @xakep-amatop
 /dts/arm/quicklogic/                      @fkokosinski @kgugala
 /dts/arm/seeed_studio/                    @str4t0m
+/dts/arm/st/                              @erwango
 /dts/arm/st/h7/*stm32h735*                @benediktibk
 /dts/arm/st/l4/*stm32l451*                @benediktibk
 /dts/arm/ti/cc13?2*                       @bwitherspoon
@@ -432,7 +436,8 @@
 /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
@@ -463,8 +468,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

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
@@ -318,13 +316,6 @@ 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)
@@ -347,84 +338,6 @@ 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
@@ -480,7 +393,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 +405,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
@@ -523,9 +429,7 @@ 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
+	depends on (!(GEN_ISR_TABLES || GEN_IRQ_VECTOR_TABLE) || ISR_TABLES_LOCAL_DECLARATION) && !NATIVE_LIBRARY
 	select EXPERIMENTAL
 	help
 	  This option enables Link Time Optimization.
@@ -614,17 +518,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 +565,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
@@ -793,11 +686,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 +710,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
@@ -949,8 +820,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
@@ -1034,6 +903,15 @@ config BOOTLOADER_SRAM_SIZE_DEPRECATED
 	  Non-prompt symbol to indicate that the deprecated BOOTLOADER_SRAM_SIZE Kconfig has a
 	  non-0 value. Please transition to using devicetree.
 
+config BOOTLOADER_ESP_IDF
+	bool "ESP-IDF bootloader support"
+	depends on SOC_FAMILY_ESPRESSIF_ESP32 && !BOOTLOADER_MCUBOOT && !MCUBOOT
+	default	y
+	help
+	  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"
 	select USE_DT_CODE_PARTITION
@@ -1076,20 +954,3 @@ config BOOTLOADER_BOSSA_ADAFRUIT_UF2
 endchoice
 
 endmenu
-
-menu "Compatibility"
-
-config LEGACY_GENERATED_INCLUDE_PATH
-	bool "Legacy include path for generated headers"
-	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.
-
-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 +1 @@
-0.16.8
+0.16.5

VERSION

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

arch/Kconfig

@@ -24,7 +24,6 @@ config ARC
 	imply XIP
 	select ARCH_HAS_THREAD_LOCAL_STORAGE
 	select ARCH_SUPPORTS_ROM_START
-	select ARCH_HAS_DIRECTED_IPIS
 	help
 	  ARC architecture
 
@@ -32,7 +31,6 @@ config ARM
 	bool
 	select ARCH_IS_SET
 	select ARCH_SUPPORTS_COREDUMP if CPU_CORTEX_M
-	select ARCH_SUPPORTS_COREDUMP_THREADS if CPU_CORTEX_M
 	# 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
@@ -52,7 +50,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
 
@@ -88,13 +85,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
 
@@ -111,15 +107,13 @@ config RISCV
 	bool
 	select ARCH_IS_SET
 	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
@@ -134,8 +128,6 @@ config XTENSA
 	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
 	help
 	  Xtensa architecture
 
@@ -151,12 +143,6 @@ config ARCH_POSIX
 	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 +202,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 +214,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 +222,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,21 +391,6 @@ 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
@@ -655,9 +624,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 +636,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 +654,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
 #
@@ -771,13 +727,6 @@ 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
@@ -813,7 +762,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"
@@ -1078,28 +1027,9 @@ config TOOLCHAIN_HAS_BUILTIN_FFS
 	help
 	  Hidden option to signal that toolchain has __builtin_ffs*().
 
-config ARCH_HAS_CUSTOM_CPU_IDLE
-	bool
+config ARCH_CPU_IDLE_CUSTOM
+	bool "Custom arch_cpu_idle implementation"
+	default n
 	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/arc/Kconfig

@@ -18,7 +18,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
 

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/fatal.c

@@ -23,7 +23,7 @@
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 #ifdef CONFIG_EXCEPTION_DEBUG
-static void dump_arc_esf(const struct arch_esf *esf)
+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);
@@ -42,7 +42,7 @@ static void dump_arc_esf(const struct arch_esf *esf)
 }
 #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
 	if (esf != NULL) {

arch/arc/core/fault.c

@@ -53,8 +53,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) {
@@ -89,6 +90,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,7 +101,6 @@ 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;
 }
@@ -346,7 +347,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);

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/smp.c

@@ -13,7 +13,6 @@
 #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>
@@ -40,7 +39,7 @@ volatile char *arc_cpu_sp;
 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,
+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]);
@@ -51,7 +50,7 @@ void arch_cpu_start(int cpu_num, k_thread_stack_t *stack, int sz,
 	 * 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_sp = Z_KERNEL_STACK_BUFFER(stack) + sz;
 
 	arc_cpu_wake_flag = cpu_num;
 
@@ -115,7 +114,7 @@ void arch_secondary_cpu_init(int cpu_num)
 			   DT_IRQ(DT_NODELABEL(ici), priority), 0);
 	irq_enable(DT_IRQN(DT_NODELABEL(ici)));
 #endif
-	/* call the function set by arch_cpu_start */
+	/* call the function set by arch_start_cpu */
 	fn = arc_cpu_init[cpu_num].fn;
 
 	fn(arc_cpu_init[cpu_num].arg);
@@ -131,27 +130,21 @@ static void sched_ipi_handler(const void *unused)
 	z_sched_ipi();
 }
 
-void arch_sched_directed_ipi(uint32_t cpu_bitmap)
+/* arch implementation of sched_ipi */
+void arch_sched_ipi(void)
 {
-	unsigned int i;
-	unsigned int num_cpus = arch_num_cpus();
+	uint32_t i;
 
-	/* Send sched_ipi request to other cores
+	/* 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++) {
-		if ((cpu_bitmap & BIT(i)) != 0) {
-			z_arc_connect_ici_generate(i);
-		}
+		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;
@@ -195,4 +188,5 @@ int arch_smp_init(void)
 
 	return 0;
 }
+SYS_INIT(arch_smp_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 #endif

arch/arc/core/thread.c

@@ -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);

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;
 
 
 

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/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

@@ -34,71 +34,6 @@ config ARM_CUSTOM_INTERRUPT_CONTROLLER
 	  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
-
 config CODE_DATA_RELOCATION_SRAM
 	bool "Relocate code/data sections to SRAM"
 	depends on CPU_CORTEX_M

arch/arm/core/Kconfig

@@ -60,7 +60,7 @@ config CPU_AARCH32_CORTEX_A
 	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
+	# GDB on ARM needs the etxra registers
 	select EXTRA_EXCEPTION_INFO if GDBSTUB
 	help
 	  This option signifies the use of a CPU of the Cortex-A family.

arch/arm/core/cortex_a_r/Kconfig

@@ -131,7 +131,6 @@ 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.

arch/arm/core/cortex_a_r/boot.h

@@ -26,6 +26,5 @@ extern void __start(void);
 #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/fault.c

@@ -206,7 +206,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)
 	/*
@@ -243,7 +243,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;
 
@@ -299,7 +299,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 +321,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;
 

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

@@ -156,7 +156,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 +170,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 +189,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.
@@ -269,7 +269,7 @@ SECTION_FUNC(TEXT, _isr_wrapper)
 	 * 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.
 	 */
 
@@ -283,7 +283,7 @@ SECTION_FUNC(TEXT, _isr_wrapper)
 	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 */
 
@@ -339,15 +339,6 @@ z_arm_cortex_ar_irq_done:
 	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 */

arch/arm/core/cortex_a_r/macro_priv.inc

@@ -18,27 +18,6 @@
 	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.
@@ -54,7 +33,8 @@
 	 */
 	srsdb sp!, #MODE_SYS
 	cps #MODE_SYS
-	push {r0-r3, r12, lr}
+	stmdb sp, {r0-r3, r12, lr}^
+	sub sp, #24
 
 	/* TODO: EXTRA_EXCEPTION_INFO */
 	mov r0, sp

arch/arm/core/cortex_a_r/reset.S

@@ -200,62 +200,23 @@ EL1_Reset_Handler:
 #endif /* CONFIG_DCLS */
 
     ldr r0, =arm_cpu_boot_params
-
 #if CONFIG_MP_MAX_NUM_CPUS > 1
-    /*
-     * This code uses voting locks, like arch/arm64/core/reset.S, to determine primary CPU.
-     */
+    get_cpu_id r1
 
-    /*
-     * Get the "logic" id defined by cpu_node_list statically for voting lock self-identify.
-     * It is worth noting that this is NOT the final logic id (arch_curr_cpu()->id)
-     */
-    get_cpu_logic_id r1, r2, r3, r4 // r1: MPID, r2: logic id
-
-    add r4, r0, #BOOT_PARAM_VOTING_OFFSET
-
-    /* signal our desire to vote */
-    mov r5, #1
-    strb r5, [r4, r2]
-    ldr r3, [r0, #BOOT_PARAM_MPID_OFFSET]
-    cmn r3, #1
-    beq 1f
-
-    /* some core already won, release */
-    mov r7, #0
-    strb r7, [r4, r2]
-    b _secondary_core
-
-    /* suggest current core then release */
-1:  str r1, [r0, #BOOT_PARAM_MPID_OFFSET]
-    strb r7, [r4, r2]
-    dmb
-
-    /* then wait until every core else is done voting */
-    mov r5, #0
-2:  ldrb r3, [r4, r5]
-    tst r3, #255
-    /* wait */
-    bne 2b
-    add r5, r5, #1
-    cmp r5, #CONFIG_MP_MAX_NUM_CPUS
-    bne 2b
-
-    /* check if current core won */
-    dmb
-    ldr r3, [r0, #BOOT_PARAM_MPID_OFFSET]
-    cmp r3, r1
+    ldrex r2, [r0, #BOOT_PARAM_MPID_OFFSET]
+    cmp r2, #-1
+    bne 1f
+    strex r3, r1, [r0, #BOOT_PARAM_MPID_OFFSET]
+    cmp r3, #0
     beq _primary_core
-    /* fallthrough secondary */
 
-    /* loop until our turn comes */
-_secondary_core:
-    dmb
+1:
+    dmb ld
     ldr r2, [r0, #BOOT_PARAM_MPID_OFFSET]
     cmp r1, r2
-    bne _secondary_core
+    bne 1b
 
-    /* we can now load our stack pointer values and move on */
+    /* we can now move on */
     ldr r4, =arch_secondary_cpu_init
     ldr r5, [r0, #BOOT_PARAM_FIQ_SP_OFFSET]
     ldr r6, [r0, #BOOT_PARAM_IRQ_SP_OFFSET]

arch/arm/core/cortex_a_r/smp.c

@@ -7,7 +7,6 @@
 #include <zephyr/kernel.h>
 #include <zephyr/arch/arm/cortex_a_r/lib_helpers.h>
 #include <zephyr/drivers/interrupt_controller/gic.h>
-#include <ipi.h>
 #include "boot.h"
 #include "zephyr/cache.h"
 #include "zephyr/kernel/thread_stack.h"
@@ -51,7 +50,6 @@ struct boot_params {
 	char *udf_sp;
 	char *svc_sp;
 	char *sys_sp;
-	uint8_t voting[CONFIG_MP_MAX_NUM_CPUS];
 	arch_cpustart_t fn;
 	void *arg;
 	int cpu_num;
@@ -65,7 +63,6 @@ BUILD_ASSERT(offsetof(struct boot_params, abt_sp) == BOOT_PARAM_ABT_SP_OFFSET);
 BUILD_ASSERT(offsetof(struct boot_params, udf_sp) == BOOT_PARAM_UDF_SP_OFFSET);
 BUILD_ASSERT(offsetof(struct boot_params, svc_sp) == BOOT_PARAM_SVC_SP_OFFSET);
 BUILD_ASSERT(offsetof(struct boot_params, sys_sp) == BOOT_PARAM_SYS_SP_OFFSET);
-BUILD_ASSERT(offsetof(struct boot_params, voting) == BOOT_PARAM_VOTING_OFFSET);
 
 volatile struct boot_params arm_cpu_boot_params = {
 	.mpid = -1,
@@ -77,7 +74,7 @@ volatile struct boot_params arm_cpu_boot_params = {
 	.sys_sp = (char *)(z_arm_sys_stack + CONFIG_ARMV7_SYS_STACK_SIZE),
 };
 
-const uint32_t cpu_node_list[] = {
+static const uint32_t cpu_node_list[] = {
 	DT_FOREACH_CHILD_STATUS_OKAY_SEP(DT_PATH(cpus), DT_REG_ADDR, (,))};
 
 /* cpu_map saves the maping of core id and mpid */
@@ -93,7 +90,7 @@ extern int z_arm_mmu_init(void);
 #endif
 
 /* Called from Zephyr initialization */
-void arch_cpu_start(int cpu_num, k_thread_stack_t *stack, int sz, arch_cpustart_t fn, void *arg)
+void arch_start_cpu(int cpu_num, k_thread_stack_t *stack, int sz, arch_cpustart_t fn, void *arg)
 {
 	int cpu_count, i, j;
 	uint32_t cpu_mpid = 0;
@@ -123,16 +120,16 @@ void arch_cpu_start(int cpu_num, k_thread_stack_t *stack, int sz, arch_cpustart_
 	}
 
 	/* Pass stack address to secondary core */
-	arm_cpu_boot_params.irq_sp = K_KERNEL_STACK_BUFFER(stack) + sz;
-	arm_cpu_boot_params.fiq_sp = K_KERNEL_STACK_BUFFER(z_arm_fiq_stack[cpu_num])
+	arm_cpu_boot_params.irq_sp = Z_KERNEL_STACK_BUFFER(stack) + sz;
+	arm_cpu_boot_params.fiq_sp = Z_KERNEL_STACK_BUFFER(z_arm_fiq_stack[cpu_num])
 				     + CONFIG_ARMV7_FIQ_STACK_SIZE;
-	arm_cpu_boot_params.abt_sp = K_KERNEL_STACK_BUFFER(z_arm_abort_stack[cpu_num])
+	arm_cpu_boot_params.abt_sp = Z_KERNEL_STACK_BUFFER(z_arm_abort_stack[cpu_num])
 				     + CONFIG_ARMV7_EXCEPTION_STACK_SIZE;
-	arm_cpu_boot_params.udf_sp = K_KERNEL_STACK_BUFFER(z_arm_undef_stack[cpu_num])
+	arm_cpu_boot_params.udf_sp = Z_KERNEL_STACK_BUFFER(z_arm_undef_stack[cpu_num])
 				     + CONFIG_ARMV7_EXCEPTION_STACK_SIZE;
-	arm_cpu_boot_params.svc_sp = K_KERNEL_STACK_BUFFER(z_arm_svc_stack[cpu_num])
+	arm_cpu_boot_params.svc_sp = Z_KERNEL_STACK_BUFFER(z_arm_svc_stack[cpu_num])
 				     + CONFIG_ARMV7_SVC_STACK_SIZE;
-	arm_cpu_boot_params.sys_sp = K_KERNEL_STACK_BUFFER(z_arm_sys_stack[cpu_num])
+	arm_cpu_boot_params.sys_sp = Z_KERNEL_STACK_BUFFER(z_arm_sys_stack[cpu_num])
 				     + CONFIG_ARMV7_SYS_STACK_SIZE;
 
 	arm_cpu_boot_params.fn = fn;
@@ -213,7 +210,7 @@ void arch_secondary_cpu_init(void)
 
 #ifdef CONFIG_SMP
 
-static void send_ipi(unsigned int ipi, uint32_t cpu_bitmap)
+static void broadcast_ipi(unsigned int ipi)
 {
 	uint32_t mpidr = MPIDR_TO_CORE(GET_MPIDR());
 
@@ -223,10 +220,6 @@ static void send_ipi(unsigned int ipi, uint32_t cpu_bitmap)
 	unsigned int num_cpus = arch_num_cpus();
 
 	for (int i = 0; i < num_cpus; i++) {
-		if ((cpu_bitmap & BIT(i)) == 0) {
-			continue;
-		}
-
 		uint32_t target_mpidr = cpu_map[i];
 		uint8_t aff0;
 
@@ -246,14 +239,10 @@ void sched_ipi_handler(const void *unused)
 	z_sched_ipi();
 }
 
-void arch_sched_broadcast_ipi(void)
+/* arch implementation of sched_ipi */
+void arch_sched_ipi(void)
 {
-	send_ipi(SGI_SCHED_IPI, IPI_ALL_CPUS_MASK);
-}
-
-void arch_sched_directed_ipi(uint32_t cpu_bitmap)
-{
-	send_ipi(SGI_SCHED_IPI, cpu_bitmap);
+	broadcast_ipi(SGI_SCHED_IPI);
 }
 
 int arch_smp_init(void)
@@ -270,4 +259,6 @@ int arch_smp_init(void)
 	return 0;
 }
 
+SYS_INIT(arch_smp_init, PRE_KERNEL_2, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+
 #endif

arch/arm/core/cortex_a_r/stacks.c

@@ -28,7 +28,7 @@ void z_arm_init_stacks(void)
 	memset(z_arm_svc_stack, 0xAA, CONFIG_ARMV7_SVC_STACK_SIZE);
 	memset(z_arm_abort_stack, 0xAA, CONFIG_ARMV7_EXCEPTION_STACK_SIZE);
 	memset(z_arm_undef_stack, 0xAA, CONFIG_ARMV7_EXCEPTION_STACK_SIZE);
-	memset(K_KERNEL_STACK_BUFFER(z_interrupt_stacks[0]), 0xAA,
+	memset(Z_KERNEL_STACK_BUFFER(z_interrupt_stacks[0]), 0xAA,
 	       K_KERNEL_STACK_SIZEOF(z_interrupt_stacks[0]));
 }
 #endif

arch/arm/core/cortex_a_r/thread.c

@@ -14,7 +14,6 @@
  */
 
 #include <zephyr/kernel.h>
-#include <zephyr/llext/symbol.h>
 #include <ksched.h>
 #include <zephyr/sys/barrier.h>
 #include <stdbool.h>
@@ -95,10 +94,6 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
 	iframe->a4 = (uint32_t)p3;
 
 	iframe->xpsr = A_BIT | MODE_SYS;
-#if defined(CONFIG_BIG_ENDIAN)
-	iframe->xpsr |= E_BIT;
-#endif /* CONFIG_BIG_ENDIAN */
-
 #if defined(CONFIG_COMPILER_ISA_THUMB2)
 	iframe->xpsr |= T_BIT;
 #endif /* CONFIG_COMPILER_ISA_THUMB2 */
@@ -252,7 +247,7 @@ bool z_arm_thread_is_in_user_mode(void)
 	value = __get_CPSR();
 	return ((value & CPSR_M_Msk) == CPSR_M_USR);
 }
-EXPORT_SYMBOL(z_arm_thread_is_in_user_mode);
+
 #endif
 
 #if defined(CONFIG_MPU_STACK_GUARD) || defined(CONFIG_USERSPACE)
@@ -365,7 +360,7 @@ uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp
 			guard_len,
 			fault_addr, psp)) {
 		/* Thread stack corruption */
-		return (uint32_t)K_THREAD_STACK_BUFFER(z_main_stack);
+		return (uint32_t)Z_THREAD_STACK_BUFFER(z_main_stack);
 	}
 #endif
 #endif /* CONFIG_USERSPACE */

arch/arm/core/cortex_a_r/vector_table.S

@@ -41,11 +41,6 @@ SECTION_SUBSEC_FUNC(exc_vector_table,_vector_table_section,_vector_table)
 GTEXT(z_arm_cortex_ar_exit_exc)
 SECTION_SUBSEC_FUNC(TEXT, _HandlerModeExit, z_arm_cortex_ar_exit_exc)
 
-	/* Note:
-	 * This function is expected to be *always* called with
-	 * processor mode set to MODE_SYS.
-	 */
-
 	/* decrement exception depth */
 	get_cpu r2
 	ldrb r1, [r2, #_cpu_offset_to_exc_depth]
@@ -56,6 +51,7 @@ SECTION_SUBSEC_FUNC(TEXT, _HandlerModeExit, z_arm_cortex_ar_exit_exc)
 	 * Restore r0-r3, r12, lr, lr_und and spsr_und from the exception stack
 	 * and return to the current thread.
 	 */
-	pop {r0-r3, r12, lr}
+	ldmia sp, {r0-r3, r12, lr}^
+	add sp, #24
 	rfeia sp!
 #endif

arch/arm/core/cortex_m/CMakeLists.txt

@@ -3,7 +3,7 @@
 zephyr_library()
 
 zephyr_library_sources(
-  exc_exit.c
+  exc_exit.S
   fault.c
   fault_s.S
   fpu.c
@@ -16,11 +16,11 @@ zephyr_library_sources(
   irq_manage.c
   prep_c.c
   thread.c
-  cpu_idle.c
+  cpu_idle.S
   )
 
 zephyr_library_sources_ifndef(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER irq_init.c)
-zephyr_library_sources_ifdef(CONFIG_GEN_SW_ISR_TABLE isr_wrapper.c)
+zephyr_library_sources_ifdef(CONFIG_GEN_SW_ISR_TABLE isr_wrapper.S)
 zephyr_library_sources_ifdef(CONFIG_DEBUG_COREDUMP coredump.c)
 zephyr_library_sources_ifdef(CONFIG_THREAD_LOCAL_STORAGE __aeabi_read_tp.S)
 zephyr_library_sources_ifdef(CONFIG_SEMIHOST semihost.c)

arch/arm/core/cortex_m/Kconfig

@@ -73,17 +73,6 @@ config CPU_CORTEX_M55
 	help
 	  This option signifies the use of a Cortex-M55 CPU
 
-config CPU_CORTEX_M85
-	bool
-	select CPU_CORTEX_M
-	select ARMV8_1_M_MAINLINE
-	select ARMV8_M_SE if CPU_HAS_TEE
-	select ARMV7_M_ARMV8_M_FP if CPU_HAS_FPU
-	select CPU_HAS_DCACHE
-	select CPU_HAS_ICACHE
-	help
-	  This option signifies the use of a Cortex-M85 CPU
-
 config CPU_CORTEX_M7
 	bool
 	select CPU_CORTEX_M
@@ -330,7 +319,7 @@ config ZERO_LATENCY_IRQS
 config ZERO_LATENCY_LEVELS
 	int "Number of interrupt priority levels reserved for zero latency"
 	depends on ZERO_LATENCY_IRQS
-	range 1 $(UINT8_MAX)
+	range 1 255
 	help
 	  The amount of interrupt priority levels reserved for zero latency
 	  interrupts. Increase this value to reserve more than one priority

arch/arm/core/cortex_m/__aeabi_read_tp.S

@@ -12,14 +12,8 @@ GTEXT(__aeabi_read_tp)
 
 GDATA(z_arm_tls_ptr)
 
-/* Grab the TLS pointer and store in R0.
- * According to the Run-Time ABI for the Arm® Architecture section 5.3.5, this
- * function may only clobber r0, ip, lr & CPSR.
- *
- * This can only be guaranteed by either implementing a naked C function with
- * inline assembly, or plain assembly.
- */
 SECTION_FUNC(TEXT, __aeabi_read_tp)
+	/* Grab the TLS pointer and store in R0 */
 	ldr r0, =z_arm_tls_ptr
 	ldr r0, [r0]
 	bx lr

arch/arm/core/cortex_m/coredump.c

@@ -41,7 +41,7 @@ struct arm_arch_block {
  */
 static struct arm_arch_block arch_blk;
 
-void arch_coredump_info_dump(const struct arch_esf *esf)
+void arch_coredump_info_dump(const z_arch_esf_t *esf)
 {
 	struct coredump_arch_hdr_t hdr = {
 		.id = COREDUMP_ARCH_HDR_ID,

arch/arm/core/cortex_m/cpu_idle.S

@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) 2013-2014 Wind River Systems, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief ARM Cortex-M power management
+ *
+ */
+
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+
+#if defined(CONFIG_ARM_ON_EXIT_CPU_IDLE)
+#include <soc_cpu_idle.h>
+#endif
+
+_ASM_FILE_PROLOGUE
+
+GTEXT(z_arm_cpu_idle_init)
+GTEXT(arch_cpu_idle)
+GTEXT(arch_cpu_atomic_idle)
+
+#define _SCB_SCR		0xE000ED10
+
+#define _SCB_SCR_SEVONPEND	(1 << 4)
+#define _SCB_SCR_SLEEPDEEP	(1 << 2)
+#define _SCB_SCR_SLEEPONEXIT	(1 << 1)
+#define _SCR_INIT_BITS		_SCB_SCR_SEVONPEND
+
+.macro _sleep_if_allowed wait_instruction
+#if defined(CONFIG_ARM_ON_ENTER_CPU_IDLE_HOOK)
+	push	{r0, lr}
+	bl	z_arm_on_enter_cpu_idle
+	/* Skip the wait instruction if on_enter_cpu_idle() returns false. */
+	cmp	r0, #0
+	beq	_skip_\@
+#endif /* CONFIG_ARM_ON_ENTER_CPU_IDLE_HOOK */
+
+	/*
+	 * Wait for all memory transactions to complete before entering low
+	 * power state.
+	 */
+	dsb
+	\wait_instruction
+
+#if defined(CONFIG_ARM_ON_EXIT_CPU_IDLE)
+	/* Inline the macro provided by SoC-specific code */
+	SOC_ON_EXIT_CPU_IDLE
+#endif /* CONFIG_ARM_ON_EXIT_CPU_IDLE */
+
+#if defined(CONFIG_ARM_ON_ENTER_CPU_IDLE_HOOK)
+_skip_\@:
+#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
+	pop	{r0, r1}
+	mov	lr, r1
+#else
+	pop	{r0, lr}
+#endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
+#endif /* CONFIG_ARM_ON_ENTER_CPU_IDLE_HOOK */
+.endm
+
+/**
+ *
+ * @brief Initialization of CPU idle
+ *
+ * Only called by arch_kernel_init(). Sets SEVONPEND bit once for the system's
+ * duration.
+ *
+ * C function prototype:
+ *
+ * void z_arm_cpu_idle_init(void);
+ */
+
+SECTION_FUNC(TEXT, z_arm_cpu_idle_init)
+	ldr	r1, =_SCB_SCR
+	movs.n	r2, #_SCR_INIT_BITS
+	str	r2, [r1]
+	bx	lr
+
+SECTION_FUNC(TEXT, arch_cpu_idle)
+#if defined(CONFIG_TRACING) || \
+    defined(CONFIG_ARM_ON_ENTER_CPU_IDLE_PREPARE_HOOK)
+	push	{r0, lr}
+
+#ifdef CONFIG_TRACING
+	bl	sys_trace_idle
+#endif
+#ifdef CONFIG_ARM_ON_ENTER_CPU_IDLE_PREPARE_HOOK
+	bl	z_arm_on_enter_cpu_idle_prepare
+#endif
+
+#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
+	pop	{r0, r1}
+	mov	lr, r1
+#else
+	pop	{r0, lr}
+#endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
+#endif
+
+#if defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
+	/*
+	 * PRIMASK is always cleared on ARMv7-M and ARMv8-M Mainline (not used
+	 * for interrupt locking), and configuring BASEPRI to the lowest
+	 * priority to ensure wake-up will cause interrupts to be serviced
+	 * before entering low power state.
+	 *
+	 * Set PRIMASK before configuring BASEPRI to prevent interruption
+	 * before wake-up.
+	 */
+	cpsid	i
+
+	/*
+	 * Set wake-up interrupt priority to the lowest and synchronise to
+	 * ensure that this is visible to the WFI instruction.
+	 */
+	eors.n	r0, r0
+	msr	BASEPRI, r0
+	isb
+#else
+	/*
+	 * For all the other ARM architectures that do not implement BASEPRI,
+	 * PRIMASK is used as the interrupt locking mechanism, and it is not
+	 * necessary to set PRIMASK here, as PRIMASK would have already been
+	 * set by the caller as part of interrupt locking if necessary
+	 * (i.e. if the caller sets _kernel.idle).
+	 */
+#endif /* CONFIG_ARMV7_M_ARMV8_M_MAINLINE */
+
+	/* Enter low power state */
+	_sleep_if_allowed wfi
+
+	/*
+	 * Clear PRIMASK and flush instruction buffer to immediately service
+	 * the wake-up interrupt.
+	 */
+	cpsie	i
+	isb
+
+	bx	lr
+
+SECTION_FUNC(TEXT, arch_cpu_atomic_idle)
+#if defined(CONFIG_TRACING) || \
+    defined(CONFIG_ARM_ON_ENTER_CPU_IDLE_PREPARE_HOOK)
+	push	{r0, lr}
+
+#ifdef CONFIG_TRACING
+	bl	sys_trace_idle
+#endif
+#ifdef CONFIG_ARM_ON_ENTER_CPU_IDLE_PREPARE_HOOK
+	bl	z_arm_on_enter_cpu_idle_prepare
+#endif
+
+#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
+	pop	{r0, r1}
+	mov	lr, r1
+#else
+	pop	{r0, lr}
+#endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
+#endif
+	/*
+	 * Lock PRIMASK while sleeping: wfe will still get interrupted by
+	 * incoming interrupts but the CPU will not service them right away.
+	 */
+	cpsid	i
+
+	/*
+	 * No need to set SEVONPEND, it's set once in z_arm_cpu_idle_init()
+	 * and never touched again.
+	 */
+
+	/* r0: interrupt mask from caller */
+
+#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
+	/* No BASEPRI, call wfe directly
+	 * (SEVONPEND is set in z_arm_cpu_idle_init())
+	 */
+	_sleep_if_allowed wfe
+
+	cmp	r0, #0
+	bne	_irq_disabled
+	cpsie	i
+_irq_disabled:
+
+#elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
+	/* r1: zero, for setting BASEPRI (needs a register) */
+	eors.n	r1, r1
+
+	/* unlock BASEPRI so wfe gets interrupted by incoming interrupts */
+	msr	BASEPRI, r1
+
+	_sleep_if_allowed wfe
+
+	msr	BASEPRI, r0
+	cpsie	i
+#else
+#error Unknown ARM architecture
+#endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
+	bx	lr

arch/arm/core/cortex_m/cpu_idle.c

@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2013-2014 Wind River Systems, Inc.
- * Copyright (c) 2023 Arm Limited
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @file
- * @brief ARM Cortex-M power management
- */
-#include <zephyr/kernel.h>
-#include <cmsis_core.h>
-
-#if defined(CONFIG_ARM_ON_EXIT_CPU_IDLE)
-#include <soc_cpu_idle.h>
-#endif
-
-/**
- * @brief Initialization of CPU idle
- *
- * Only called by arch_kernel_init(). Sets SEVONPEND bit once for the system's
- * duration.
- */
-void z_arm_cpu_idle_init(void)
-{
-	SCB->SCR = SCB_SCR_SEVONPEND_Msk;
-}
-
-#if defined(CONFIG_ARM_ON_EXIT_CPU_IDLE)
-#define ON_EXIT_IDLE_HOOK SOC_ON_EXIT_CPU_IDLE
-#else
-#define ON_EXIT_IDLE_HOOK do {} while (false)
-#endif
-
-#if defined(CONFIG_ARM_ON_ENTER_CPU_IDLE_HOOK)
-#define SLEEP_IF_ALLOWED(wait_instr) do { \
-	/* Skip the wait instr if on_enter_cpu_idle returns false */ \
-	if (z_arm_on_enter_cpu_idle()) { \
-		/* Wait for all memory transaction to complete */ \
-		/* before entering low power state. */ \
-		__DSB(); \
-		wait_instr(); \
-		/* Inline the macro provided by SoC-specific code */ \
-		ON_EXIT_IDLE_HOOK; \
-	} \
-} while (false)
-#else
-#define SLEEP_IF_ALLOWED(wait_instr) do { \
-	__DSB(); \
-	wait_instr(); \
-	ON_EXIT_IDLE_HOOK; \
-} while (false)
-#endif
-
-#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_IDLE
-void arch_cpu_idle(void)
-{
-#if defined(CONFIG_TRACING)
-	sys_trace_idle();
-#endif
-
-#if CONFIG_ARM_ON_ENTER_CPU_IDLE_PREPARE_HOOK
-	z_arm_on_enter_cpu_idle_prepare();
-#endif
-
-#if defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
-	/*
-	 * PRIMASK is always cleared on ARMv7-M and ARMv8-M (not used
-	 * for interrupt locking), and configuring BASEPRI to the lowest
-	 * priority to ensure wake-up will cause interrupts to be serviced
-	 * before entering low power state.
-	 *
-	 * Set PRIMASK before configuring BASEPRI to prevent interruption
-	 * before wake-up.
-	 */
-	__disable_irq();
-
-	/*
-	 * Set wake-up interrupt priority to the lowest and synchronize to
-	 * ensure that this is visible to the WFI instruction.
-	 */
-	__set_BASEPRI(0);
-	__ISB();
-#else
-	/*
-	 * For all the other ARM architectures that do not implement BASEPRI,
-	 * PRIMASK is used as the interrupt locking mechanism, and it is not
-	 * necessary to set PRIMASK here, as PRIMASK would have already been
-	 * set by the caller as part of interrupt locking if necessary
-	 * (i.e. if the caller sets _kernel.idle).
-	 */
-#endif
-
-	SLEEP_IF_ALLOWED(__WFI);
-
-	__enable_irq();
-	__ISB();
-}
-#endif
-
-#ifndef CONFIG_ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
-void arch_cpu_atomic_idle(unsigned int key)
-{
-#if defined(CONFIG_TRACING)
-	sys_trace_idle();
-#endif
-
-#if CONFIG_ARM_ON_ENTER_CPU_IDLE_PREPARE_HOOK
-	z_arm_on_enter_cpu_idle_prepare();
-#endif
-
-	/*
-	 * Lock PRIMASK while sleeping: wfe will still get interrupted by
-	 * incoming interrupts but the CPU will not service them right away.
-	 */
-	__disable_irq();
-
-	/*
-	 * No need to set SEVONPEND, it's set once in z_arm_cpu_idle_init()
-	 * and never touched again.
-	 */
-
-#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
-	/* No BASEPRI, call wfe directly. (SEVONPEND is set in z_arm_cpu_idle_init()) */
-#elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
-	/* unlock BASEPRI so wfe gets interrupted by incoming interrupts  */
-	__set_BASEPRI(0);
-	__ISB();
-#else
-#error Unsupported architecture
-#endif
-
-	SLEEP_IF_ALLOWED(__WFE);
-
-	arch_irq_unlock(key);
-#if defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
-	__enable_irq();
-#endif
-}
-#endif

arch/arm/core/cortex_m/exc_exit.S

@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2013-2014 Wind River Systems, Inc.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief ARM Cortex-M exception/interrupt exit API
+ *
+ * Provides functions for performing kernel handling when exiting exceptions or
+ * interrupts that are installed directly in the vector table (i.e. that are not
+ * wrapped around by _isr_wrapper()).
+ */
+
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <offsets_short.h>
+#include <zephyr/arch/cpu.h>
+
+_ASM_FILE_PROLOGUE
+
+GTEXT(z_arm_exc_exit)
+GTEXT(z_arm_int_exit)
+GDATA(_kernel)
+
+/**
+ *
+ * @brief Kernel housekeeping when exiting interrupt handler installed
+ * 		directly in vector table
+ *
+ * Kernel allows installing interrupt handlers (ISRs) directly into the vector
+ * table to get the lowest interrupt latency possible. This allows the ISR to
+ * be invoked directly without going through a software interrupt table.
+ * However, upon exiting the ISR, some kernel work must still be performed,
+ * namely possible context switching. While ISRs connected in the software
+ * interrupt table do this automatically via a wrapper, ISRs connected directly
+ * in the vector table must invoke z_arm_int_exit() as the *very last* action
+ * before returning.
+ *
+ * e.g.
+ *
+ * void myISR(void)
+ * {
+ * 	printk("in %s\n", __FUNCTION__);
+ * 	doStuff();
+ * 	z_arm_int_exit();
+ * }
+ *
+ */
+
+SECTION_SUBSEC_FUNC(TEXT, _HandlerModeExit, z_arm_int_exit)
+
+/* z_arm_int_exit falls through to z_arm_exc_exit (they are aliases of each
+ * other)
+ */
+
+/**
+ *
+ * @brief Kernel housekeeping when exiting exception handler installed
+ * 		directly in vector table
+ *
+ * See z_arm_int_exit().
+ *
+ */
+
+SECTION_SUBSEC_FUNC(TEXT, _HandlerModeExit, z_arm_exc_exit)
+
+#ifdef CONFIG_PREEMPT_ENABLED
+	ldr r3, =_kernel
+
+	ldr r1, [r3, #_kernel_offset_to_current]
+	ldr r0, [r3, #_kernel_offset_to_ready_q_cache]
+	cmp r0, r1
+	beq _EXIT_EXC
+
+	/* context switch required, pend the PendSV exception */
+	ldr r1, =_SCS_ICSR
+	ldr r2, =_SCS_ICSR_PENDSV
+	str r2, [r1]
+
+_ExcExitWithGdbStub:
+
+_EXIT_EXC:
+#endif /* CONFIG_PREEMPT_ENABLED */
+
+#ifdef CONFIG_STACK_SENTINEL
+	push {r0, lr}
+	bl z_check_stack_sentinel
+#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
+	pop {r0, r1}
+	mov lr, r1
+#else
+	pop {r0, lr}
+#endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
+#endif /* CONFIG_STACK_SENTINEL */
+
+	bx lr

arch/arm/core/cortex_m/exc_exit.c

@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2013-2014 Wind River Systems, Inc.
- * Copyright (c) 2023 Arm Limited
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @file
- * @brief ARM Cortex-M exception/interrupt exit API
- *
- * Provides functions for performing kernel handling when exiting exceptions or
- * interrupts that are installed directly in the vector table (i.e. that are not
- * wrapped around by _isr_wrapper()).
- */
-
-#include <zephyr/kernel.h>
-#include <kswap.h>
-#include <cmsis_core.h>
-
-/**
- *
- * @brief Kernel housekeeping when exiting interrupt handler installed
- * 		directly in vector table
- *
- * Kernel allows installing interrupt handlers (ISRs) directly into the vector
- * table to get the lowest interrupt latency possible. This allows the ISR to
- * be invoked directly without going through a software interrupt table.
- * However, upon exiting the ISR, some kernel work must still be performed,
- * namely possible context switching. While ISRs connected in the software
- * interrupt table do this automatically via a wrapper, ISRs connected directly
- * in the vector table must invoke z_arm_int_exit() as the *very last* action
- * before returning.
- *
- * e.g.
- *
- * void myISR(void)
- * {
- * 	printk("in %s\n", __FUNCTION__);
- * 	doStuff();
- * 	z_arm_int_exit();
- * }
- *
- */
-FUNC_ALIAS(z_arm_exc_exit, z_arm_int_exit, void);
-
-/**
- *
- * @brief Kernel housekeeping when exiting exception handler installed
- * 		directly in vector table
- *
- * See z_arm_int_exit().
- *
- */
-Z_GENERIC_SECTION(.text._HandlerModeExit) void z_arm_exc_exit(void)
-{
-#ifdef CONFIG_PREEMPT_ENABLED
-	/* If thread is preemptible */
-	if (_kernel.cpus->current->base.prio >= 0) {
-		/* and cached thread is not current thread */
-		if (_kernel.ready_q.cache != _kernel.cpus->current) {
-			/* trigger a context switch */
-			SCB->ICSR |= SCB_ICSR_PENDSVSET_Msk;
-		}
-	}
-#endif /* CONFIG_PREEMPT_ENABLED */
-
-#ifdef CONFIG_STACK_SENTINEL
-	z_check_stack_sentinel();
-#endif /* CONFIG_STACK_SENTINEL */
-}

arch/arm/core/cortex_m/fault.c

@@ -146,7 +146,7 @@ LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
  */
 
 #if (CONFIG_FAULT_DUMP == 1)
-static void fault_show(const struct arch_esf *esf, int fault)
+static void fault_show(const z_arch_esf_t *esf, int fault)
 {
 	PR_EXC("Fault! EXC #%d", fault);
 
@@ -165,7 +165,7 @@ static void fault_show(const struct arch_esf *esf, int fault)
  *
  * For Dump level 0, no information needs to be generated.
  */
-static void fault_show(const struct arch_esf *esf, int fault)
+static void fault_show(const z_arch_esf_t *esf, int fault)
 {
 	(void)esf;
 	(void)fault;
@@ -185,7 +185,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, bool synchronous)
+static bool memory_fault_recoverable(z_arch_esf_t *esf, bool synchronous)
 {
 #ifdef CONFIG_USERSPACE
 	for (int i = 0; i < ARRAY_SIZE(exceptions); i++) {
@@ -228,7 +228,7 @@ uint32_t z_check_thread_stack_fail(const uint32_t fault_addr,
  *
  * @return error code to identify the fatal error reason
  */
-static uint32_t mem_manage_fault(struct arch_esf *esf, int from_hard_fault,
+static uint32_t mem_manage_fault(z_arch_esf_t *esf, int from_hard_fault,
 			      bool *recoverable)
 {
 	uint32_t reason = K_ERR_ARM_MEM_GENERIC;
@@ -387,7 +387,7 @@ static uint32_t mem_manage_fault(struct arch_esf *esf, int from_hard_fault,
  * @return error code to identify the fatal error reason.
  *
  */
-static int bus_fault(struct arch_esf *esf, int from_hard_fault, bool *recoverable)
+static int bus_fault(z_arch_esf_t *esf, int from_hard_fault, bool *recoverable)
 {
 	uint32_t reason = K_ERR_ARM_BUS_GENERIC;
 
@@ -549,7 +549,7 @@ static int bus_fault(struct arch_esf *esf, int from_hard_fault, bool *recoverabl
  *
  * @return error code to identify the fatal error reason
  */
-static uint32_t usage_fault(const struct arch_esf *esf)
+static uint32_t usage_fault(const z_arch_esf_t *esf)
 {
 	uint32_t reason = K_ERR_ARM_USAGE_GENERIC;
 
@@ -612,7 +612,7 @@ static uint32_t usage_fault(const struct arch_esf *esf)
  *
  * @return error code to identify the fatal error reason
  */
-static uint32_t secure_fault(const struct arch_esf *esf)
+static uint32_t secure_fault(const z_arch_esf_t *esf)
 {
 	uint32_t reason = K_ERR_ARM_SECURE_GENERIC;
 
@@ -661,7 +661,7 @@ static uint32_t secure_fault(const struct arch_esf *esf)
  * See z_arm_fault_dump() for example.
  *
  */
-static void debug_monitor(struct arch_esf *esf, bool *recoverable)
+static void debug_monitor(z_arch_esf_t *esf, bool *recoverable)
 {
 	*recoverable = false;
 
@@ -687,7 +687,7 @@ static void debug_monitor(struct arch_esf *esf, bool *recoverable)
 #error Unknown ARM architecture
 #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
 
-static inline bool z_arm_is_synchronous_svc(struct arch_esf *esf)
+static inline bool z_arm_is_synchronous_svc(z_arch_esf_t *esf)
 {
 	uint16_t *ret_addr = (uint16_t *)esf->basic.pc;
 	/* SVC is a 16-bit instruction. On a synchronous SVC
@@ -762,7 +762,7 @@ static inline bool z_arm_is_pc_valid(uintptr_t pc)
  *
  * @return error code to identify the fatal error reason
  */
-static uint32_t hard_fault(struct arch_esf *esf, bool *recoverable)
+static uint32_t hard_fault(z_arch_esf_t *esf, bool *recoverable)
 {
 	uint32_t reason = K_ERR_CPU_EXCEPTION;
 
@@ -829,7 +829,7 @@ static uint32_t hard_fault(struct arch_esf *esf, bool *recoverable)
  * See z_arm_fault_dump() for example.
  *
  */
-static void reserved_exception(const struct arch_esf *esf, int fault)
+static void reserved_exception(const z_arch_esf_t *esf, int fault)
 {
 	ARG_UNUSED(esf);
 
@@ -839,7 +839,7 @@ static void reserved_exception(const struct arch_esf *esf, int fault)
 }
 
 /* Handler function for ARM fault conditions. */
-static uint32_t fault_handle(struct arch_esf *esf, int fault, bool *recoverable)
+static uint32_t fault_handle(z_arch_esf_t *esf, int fault, bool *recoverable)
 {
 	uint32_t reason = K_ERR_CPU_EXCEPTION;
 
@@ -893,7 +893,7 @@ static uint32_t fault_handle(struct arch_esf *esf, int fault, bool *recoverable)
  *
  * @param secure_esf Pointer to the secure stack frame.
  */
-static void secure_stack_dump(const struct arch_esf *secure_esf)
+static void secure_stack_dump(const z_arch_esf_t *secure_esf)
 {
 	/*
 	 * In case a Non-Secure exception interrupted the Secure
@@ -918,7 +918,7 @@ static void secure_stack_dump(const struct arch_esf *secure_esf)
 		 * Non-Secure exception entry.
 		 */
 		top_of_sec_stack += ADDITIONAL_STATE_CONTEXT_WORDS;
-		secure_esf = (const struct arch_esf *)top_of_sec_stack;
+		secure_esf = (const z_arch_esf_t *)top_of_sec_stack;
 		sec_ret_addr = secure_esf->basic.pc;
 	} else {
 		/* Exception during Non-Secure function call.
@@ -947,11 +947,11 @@ static void secure_stack_dump(const struct arch_esf *secure_esf)
  *
  * @return ESF pointer on success, otherwise return NULL
  */
-static inline struct arch_esf *get_esf(uint32_t msp, uint32_t psp, uint32_t exc_return,
+static inline z_arch_esf_t *get_esf(uint32_t msp, uint32_t psp, uint32_t exc_return,
 	bool *nested_exc)
 {
 	bool alternative_state_exc = false;
-	struct arch_esf *ptr_esf = NULL;
+	z_arch_esf_t *ptr_esf = NULL;
 
 	*nested_exc = false;
 
@@ -979,14 +979,14 @@ static inline struct arch_esf *get_esf(uint32_t msp, uint32_t psp, uint32_t exc_
 		alternative_state_exc = true;
 
 		/* Dump the Secure stack before handling the actual fault. */
-		struct arch_esf *secure_esf;
+		z_arch_esf_t *secure_esf;
 
 		if (exc_return & EXC_RETURN_SPSEL_PROCESS) {
 			/* Secure stack pointed by PSP */
-			secure_esf = (struct arch_esf *)psp;
+			secure_esf = (z_arch_esf_t *)psp;
 		} else {
 			/* Secure stack pointed by MSP */
-			secure_esf = (struct arch_esf *)msp;
+			secure_esf = (z_arch_esf_t *)msp;
 			*nested_exc = true;
 		}
 
@@ -997,9 +997,9 @@ static inline struct arch_esf *get_esf(uint32_t msp, uint32_t psp, uint32_t exc_
 		 * and supply it to the fault handing function.
 		 */
 		if (exc_return & EXC_RETURN_MODE_THREAD) {
-			ptr_esf = (struct arch_esf *)__TZ_get_PSP_NS();
+			ptr_esf = (z_arch_esf_t *)__TZ_get_PSP_NS();
 		} else {
-			ptr_esf = (struct arch_esf *)__TZ_get_MSP_NS();
+			ptr_esf = (z_arch_esf_t *)__TZ_get_MSP_NS();
 		}
 	}
 #elif defined(CONFIG_ARM_NONSECURE_FIRMWARE)
@@ -1024,10 +1024,10 @@ static inline struct arch_esf *get_esf(uint32_t msp, uint32_t psp, uint32_t exc_
 
 		if (exc_return & EXC_RETURN_SPSEL_PROCESS) {
 			/* Non-Secure stack frame on PSP */
-			ptr_esf = (struct arch_esf *)psp;
+			ptr_esf = (z_arch_esf_t *)psp;
 		} else {
 			/* Non-Secure stack frame on MSP */
-			ptr_esf = (struct arch_esf *)msp;
+			ptr_esf = (z_arch_esf_t *)msp;
 		}
 	} else {
 		/* Exception entry occurred in Non-Secure stack. */
@@ -1046,11 +1046,11 @@ static inline struct arch_esf *get_esf(uint32_t msp, uint32_t psp, uint32_t exc_
 	if (!alternative_state_exc) {
 		if (exc_return & EXC_RETURN_MODE_THREAD) {
 			/* Returning to thread mode */
-			ptr_esf =  (struct arch_esf *)psp;
+			ptr_esf =  (z_arch_esf_t *)psp;
 
 		} else {
 			/* Returning to handler mode */
-			ptr_esf = (struct arch_esf *)msp;
+			ptr_esf = (z_arch_esf_t *)msp;
 			*nested_exc = true;
 		}
 	}
@@ -1095,12 +1095,12 @@ void z_arm_fault(uint32_t msp, uint32_t psp, uint32_t exc_return,
 	uint32_t reason = K_ERR_CPU_EXCEPTION;
 	int fault = SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk;
 	bool recoverable, nested_exc;
-	struct arch_esf *esf;
+	z_arch_esf_t *esf;
 
 	/* Create a stack-ed copy of the ESF to be used during
 	 * the fault handling process.
 	 */
-	struct arch_esf esf_copy;
+	z_arch_esf_t esf_copy;
 
 	/* Force unlock interrupts */
 	arch_irq_unlock(0);
@@ -1123,13 +1123,13 @@ void z_arm_fault(uint32_t msp, uint32_t psp, uint32_t exc_return,
 
 	/* Copy ESF */
 #if !defined(CONFIG_EXTRA_EXCEPTION_INFO)
-	memcpy(&esf_copy, esf, sizeof(struct arch_esf));
+	memcpy(&esf_copy, esf, sizeof(z_arch_esf_t));
 	ARG_UNUSED(callee_regs);
 #else
 	/* the extra exception info is not present in the original esf
 	 * so we only copy the fields before those.
 	 */
-	memcpy(&esf_copy, esf, offsetof(struct arch_esf, extra_info));
+	memcpy(&esf_copy, esf, offsetof(z_arch_esf_t, extra_info));
 	esf_copy.extra_info = (struct __extra_esf_info) {
 		.callee = callee_regs,
 		.exc_return = exc_return,
@@ -1192,7 +1192,5 @@ void z_arm_fault_init(void)
 #endif /* CONFIG_BUILTIN_STACK_GUARD */
 #ifdef CONFIG_TRAP_UNALIGNED_ACCESS
 	SCB->CCR |= SCB_CCR_UNALIGN_TRP_Msk;
-#else
-	SCB->CCR &= ~SCB_CCR_UNALIGN_TRP_Msk;
 #endif /* CONFIG_TRAP_UNALIGNED_ACCESS */
 }

arch/arm/core/cortex_m/irq_manage.c

@@ -94,7 +94,7 @@ void z_arm_irq_priority_set(unsigned int irq, unsigned int prio, uint32_t flags)
 
 #endif /* !defined(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);
 
 /**
  *
@@ -122,7 +122,7 @@ void _arch_isr_direct_pm(void)
 #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
 	/* Lock all interrupts. irq_lock() will on this CPU only disable those
 	 * lower than BASEPRI, which is not what we want. See comments in
-	 * arch/arm/core/cortex_m/isr_wrapper.c
+	 * arch/arm/core/isr_wrapper.S
 	 */
 	__asm__ volatile("cpsid i" : : : "memory");
 #else
@@ -131,7 +131,7 @@ void _arch_isr_direct_pm(void)
 
 	if (_kernel.idle) {
 		_kernel.idle = 0;
-		pm_system_resume();
+		z_pm_save_idle_exit();
 	}
 
 #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)

arch/arm/core/cortex_m/irq_relay.S

@@ -31,7 +31,7 @@ GDATA(z_main_stack)
 
 SECTION_FUNC(TEXT, __vector_relay_handler)
 	mrs	r0, ipsr;
-	lsls	r0, r0, #0x02;
+	lsls	r0, r0, $0x02;
 
 	ldr	r1, =_vector_table_pointer;
 	ldr	r1, [r1];

arch/arm/core/cortex_m/isr_wrapper.S

@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2013-2014 Wind River Systems, Inc.
+ * Copyright (c) 2020 Stephanos Ioannidis <root@stephanos.io>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @file
+ * @brief ARM Cortex-M wrapper for ISRs with parameter
+ *
+ * Wrapper installed in vector table for handling dynamic interrupts that accept
+ * a parameter.
+ */
+/*
+ * Tell armclang that stack alignment are ensured.
+ */
+.eabi_attribute Tag_ABI_align_preserved, 1
+
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <offsets_short.h>
+#include <zephyr/arch/cpu.h>
+#include <zephyr/sw_isr_table.h>
+
+
+_ASM_FILE_PROLOGUE
+
+GDATA(_sw_isr_table)
+
+GTEXT(_isr_wrapper)
+GTEXT(z_arm_int_exit)
+
+/**
+ *
+ * @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 (see documentation for
+ * z_arm_pendsv()) and pends the PendSV exception if so: the latter will
+ * perform the context switch itself.
+ *
+ */
+SECTION_FUNC(TEXT, _isr_wrapper)
+
+	push {r0,lr}		/* r0, lr are now the first items on the stack */
+
+#ifdef CONFIG_TRACING_ISR
+	bl sys_trace_isr_enter
+#endif
+
+#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, z_pm_save_idle_exit
+	 * is called with interrupts disabled.
+	 */
+
+	/*
+	 * Disable interrupts to prevent nesting while exiting idle state. This
+	 * is only necessary for the Cortex-M because it is the only ARM
+	 * architecture variant that automatically enables interrupts when
+	 * entering an ISR.
+	 */
+	cpsid i  /* PRIMASK = 1 */
+
+	/* is this a wakeup from idle ? */
+	ldr r2, =_kernel
+	/* requested idle duration, in ticks */
+	ldr r0, [r2, #_kernel_offset_to_idle]
+	cmp r0, #0
+
+#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
+	beq _idle_state_cleared
+	movs.n r1, #0
+	/* clear kernel idle state */
+	str r1, [r2, #_kernel_offset_to_idle]
+	bl z_pm_save_idle_exit
+_idle_state_cleared:
+
+#elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
+	ittt ne
+	movne	r1, #0
+		/* clear kernel idle state */
+		strne	r1, [r2, #_kernel_offset_to_idle]
+		blne	z_pm_save_idle_exit
+#else
+#error Unknown ARM architecture
+#endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
+
+	cpsie i		/* re-enable interrupts (PRIMASK = 0) */
+
+#endif /* CONFIG_PM */
+
+#if defined(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER)
+	bl z_soc_irq_get_active
+#else
+	mrs r0, IPSR	/* get exception number */
+#endif /* CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER */
+
+#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
+	ldr r1, =16
+	subs r0, r1	/* get IRQ number */
+#if defined(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER)
+	push {r0}
+#endif /* CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER */
+	lsls r0, #3	/* table is 8-byte wide */
+#elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
+	sub r0, r0, #16	/* get IRQ number */
+#if defined(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER)
+	push {r0}
+#endif /* CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER */
+	lsl r0, r0, #3	/* table is 8-byte wide */
+#else
+#error Unknown ARM architecture
+#endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
+
+	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 */
+	blx r3		/* call ISR */
+
+#if defined(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER)
+	pop {r0}
+	bl z_soc_irq_eoi
+#endif /* CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER */
+
+#ifdef CONFIG_TRACING_ISR
+	bl sys_trace_isr_exit
+#endif
+
+#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
+	pop {r0, r3}
+	mov lr, r3
+#elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
+	pop {r0, lr}
+#else
+#error Unknown ARM architecture
+#endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
+
+	/* Use 'bx' instead of 'b' because 'bx' can jump further, and use
+	 * 'bx' instead of 'blx' because exception return is done in
+	 * z_arm_int_exit() */
+	ldr r1, =z_arm_int_exit
+	bx r1

arch/arm/core/cortex_m/isr_wrapper.c

@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2013-2014 Wind River Systems, Inc.
- * Copyright (c) 2020 Stephanos Ioannidis <root@stephanos.io>
- * Copyright (c) 2023 Arm Limited
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @file
- * @brief ARM Cortex-M wrapper for ISRs with parameter
- *
- * Wrapper installed in vector table for handling dynamic interrupts that accept
- * a parameter.
- */
-#include <zephyr/kernel.h>
-#include <zephyr/irq.h>
-#include <zephyr/pm/pm.h>
-#include <cmsis_core.h>
-
-/**
- *
- * @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 (see documentation for
- * z_arm_pendsv()) and pends the PendSV exception if so: the latter will
- * perform the context switch itself.
- *
- */
-void _isr_wrapper(void)
-{
-#ifdef CONFIG_TRACING_ISR
-	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.
-	 */
-
-	/*
-	 * Disable interrupts to prevent nesting while exiting idle state. This
-	 * is only necessary for the Cortex-M because it is the only ARM
-	 * architecture variant that automatically enables interrupts when
-	 * entering an ISR.
-	 */
-	__disable_irq();
-
-	/* is this a wakeup from idle ? */
-	/* requested idle duration, in ticks */
-	if (_kernel.idle != 0) {
-		/* clear kernel idle state */
-		_kernel.idle = 0;
-		pm_system_resume();
-	}
-	/* re-enable interrupts */
-	__enable_irq();
-#endif /* CONFIG_PM */
-
-#if defined(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER)
-	int32_t irq_number = z_soc_irq_get_active();
-#else
-	/* _sw_isr_table does not map the expections, only the interrupts. */
-	int32_t irq_number = __get_IPSR();
-#endif
-	irq_number -= 16;
-
-	struct _isr_table_entry *entry = &_sw_isr_table[irq_number];
-	(entry->isr)(entry->arg);
-
-#if defined(CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER)
-	z_soc_irq_eoi(irq_number);
-#endif
-
-#ifdef CONFIG_TRACING_ISR
-	sys_trace_isr_exit();
-#endif /* CONFIG_TRACING_ISR */
-
-	z_arm_exc_exit();
-}

arch/arm/core/cortex_m/pm_s2ram.S

@@ -14,11 +14,12 @@
 #include <zephyr/arch/cpu.h>
 #include <zephyr/arch/common/pm_s2ram.h>
 
+#define MAGIC (0xDABBAD00)
+
 _ASM_FILE_PROLOGUE
 
-GTEXT(pm_s2ram_mark_set)
-GTEXT(pm_s2ram_mark_check_and_clear)
 GDATA(_cpu_context)
+GDATA(marker)
 
 SECTION_FUNC(TEXT, arch_pm_s2ram_suspend)
 	/*
@@ -63,9 +64,11 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_suspend)
 	str	r2, [r1, #___cpu_context_t_control_OFFSET]
 
 	/*
-	 * Mark entering suspend to RAM.
+	 * Set the marker to MAGIC value
 	 */
-	bl pm_s2ram_mark_set
+	ldr	r1, =marker
+	ldr	r2, =MAGIC
+	str	r2, [r1]
 
 	/*
 	 * Call the system_off function passed as parameter. This should never
@@ -79,29 +82,35 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_suspend)
 	 */
 
 	/*
-	 * Reset the marking of suspend to RAM, return is ignored.
+	 * Reset the marker
 	 */
-	push	{r0}
-	bl pm_s2ram_mark_check_and_clear
-	pop	{r0}
+	ldr	r1, =marker
+	mov	r2, #0x0
+	str	r2, [r1]
 
 	pop	{r4-r12, lr}
 	bx	lr
 
-
 GTEXT(arch_pm_s2ram_resume)
 SECTION_FUNC(TEXT, arch_pm_s2ram_resume)
 	/*
-	 * Check if reset occurred after suspending to RAM.
+	 * Check if the marker is set
 	 */
-	push    {lr}
-	bl      pm_s2ram_mark_check_and_clear
-	cmp	r0, #0x1
-	pop     {lr}
+	ldr	r0, =marker
+	ldr	r0, [r0]
+	ldr	r1, =MAGIC
+	cmp	r0, r1
 	beq	resume
 	bx	lr
 
 resume:
+	/*
+	 * Reset the marker
+	 */
+	ldr	r0, =marker
+	mov	r1, #0x0
+	str	r1, [r0]
+
 	/*
 	 * Restore the CPU context
 	 */

arch/arm/core/cortex_m/pm_s2ram.c

@@ -9,33 +9,12 @@
 
 #include <zephyr/arch/common/pm_s2ram.h>
 
-#define MAGIC (0xDABBAD00)
-
 /**
  * CPU context for S2RAM
  */
 __noinit _cpu_context_t _cpu_context;
 
-#ifndef CONFIG_PM_S2RAM_CUSTOM_MARKING
 /**
  * S2RAM Marker
  */
-static __noinit uint32_t marker;
-
-void pm_s2ram_mark_set(void)
-{
-	marker = MAGIC;
-}
-
-bool pm_s2ram_mark_check_and_clear(void)
-{
-	if (marker == MAGIC) {
-		marker = 0;
-
-		return true;
-	}
-
-	return false;
-}
-
-#endif /* CONFIG_PM_S2RAM_CUSTOM_MARKING */
+__noinit uint32_t marker;

arch/arm/core/cortex_m/swap.c

@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2018 Linaro, Limited
- * Copyright (c) 2023 Arm Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -48,63 +47,3 @@ int arch_swap(unsigned int key)
 	 */
 	return _current->arch.swap_return_value;
 }
-
-uintptr_t z_arm_pendsv_c(uintptr_t exc_ret)
-{
-	/* Store LSB of LR (EXC_RETURN) to the thread's 'mode' word. */
-	IF_ENABLED(CONFIG_ARM_STORE_EXC_RETURN,
-		   (_kernel.cpus[0].current->arch.mode_exc_return = (uint8_t)exc_ret;));
-
-	/* Protect the kernel state while we play with the thread lists */
-	uint32_t basepri = arch_irq_lock();
-
-	/* fetch the thread to run from the ready queue cache */
-	struct k_thread *current = _kernel.cpus[0].current = _kernel.ready_q.cache;
-
-	/*
-	 * Clear PendSV so that if another interrupt comes in and
-	 * decides, with the new kernel state based on the new thread
-	 * being context-switched in, that it needs to reschedule, it
-	 * will take, but that previously pended PendSVs do not take,
-	 * since they were based on the previous kernel state and this
-	 * has been handled.
-	 */
-	SCB->ICSR = SCB_ICSR_PENDSVCLR_Msk;
-
-	/* For Cortex-M, store TLS pointer in a global variable,
-	 * as it lacks the process ID or thread ID register
-	 * to be used by toolchain to access thread data.
-	 */
-	IF_ENABLED(CONFIG_THREAD_LOCAL_STORAGE,
-		   (extern uintptr_t z_arm_tls_ptr; z_arm_tls_ptr = current->tls));
-
-	IF_ENABLED(CONFIG_ARM_STORE_EXC_RETURN,
-		   (exc_ret = (exc_ret & 0xFFFFFF00) | current->arch.mode_exc_return));
-
-	/* Restore previous interrupt disable state (irq_lock key)
-	 * (We clear the arch.basepri field after restoring state)
-	 */
-	basepri = current->arch.basepri;
-	current->arch.basepri = 0;
-
-	arch_irq_unlock(basepri);
-
-#if defined(CONFIG_MPU_STACK_GUARD) || defined(CONFIG_USERSPACE)
-	/* Re-program dynamic memory map */
-	z_arm_configure_dynamic_mpu_regions(current);
-#endif
-
-	/* restore mode */
-	IF_ENABLED(CONFIG_USERSPACE, ({
-			CONTROL_Type ctrl = {.w = __get_CONTROL()};
-			/* exit privileged state when returning to thread mode. */
-			ctrl.b.nPRIV = 0;
-			/* __set_CONTROL inserts an ISB which is may not be necessary here
-			 * (stack pointer may not be touched), but it's recommended to avoid
-			 * executing pre-fetched instructions with the previous privilege.
-			 */
-			__set_CONTROL(ctrl.w | current->arch.mode);
-		}));
-
-	return exc_ret;
-}

arch/arm/core/cortex_m/swap_helper.S

@@ -27,7 +27,6 @@ _ASM_FILE_PROLOGUE
 GTEXT(z_arm_svc)
 GTEXT(z_arm_pendsv)
 GTEXT(z_do_kernel_oops)
-GTEXT(z_arm_pendsv_c)
 #if defined(CONFIG_USERSPACE)
 GTEXT(z_arm_do_syscall)
 #endif
@@ -95,7 +94,7 @@ SECTION_FUNC(TEXT, z_arm_pendsv)
     /* store r8-12 */
     stmea r0!, {r3-r7}
 #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
-    stmia r0, {r4-r11, ip}
+    stmia r0, {v1-v8, ip}
 #ifdef CONFIG_FPU_SHARING
     /* Assess whether switched-out thread had been using the FP registers. */
     tst lr, #_EXC_RETURN_FTYPE_Msk
@@ -118,20 +117,125 @@ out_fp_endif:
 #error Unknown ARM architecture
 #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
 
-    mov r4, lr
-    mov r0, lr
-    bl z_arm_pendsv_c
-    mov lr, r4
+    /* Protect the kernel state while we play with the thread lists */
+#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
+    cpsid i
+#elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
+    movs.n r0, #_EXC_IRQ_DEFAULT_PRIO
+    msr BASEPRI_MAX, r0
+    isb /* Make the effect of disabling interrupts be realized immediately */
+#else
+#error Unknown ARM architecture
+#endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
 
-    ldr r1, =_kernel
-    ldr r2, [r1, #_kernel_offset_to_current]
+    /*
+     * Prepare to clear PendSV with interrupts unlocked, but
+     * don't clear it yet. PendSV must not be cleared until
+     * the new thread is context-switched in since all decisions
+     * to pend PendSV have been taken with the current kernel
+     * state and this is what we're handling currently.
+     */
+    ldr v4, =_SCS_ICSR
+    ldr v3, =_SCS_ICSR_UNPENDSV
+
+    /* _kernel is still in r1 */
+
+    /* fetch the thread to run from the ready queue cache */
+    ldr r2, [r1, #_kernel_offset_to_ready_q_cache]
+
+    str r2, [r1, #_kernel_offset_to_current]
+
+    /*
+     * Clear PendSV so that if another interrupt comes in and
+     * decides, with the new kernel state based on the new thread
+     * being context-switched in, that it needs to reschedule, it
+     * will take, but that previously pended PendSVs do not take,
+     * since they were based on the previous kernel state and this
+     * has been handled.
+     */
+
+    /* _SCS_ICSR is still in v4 and _SCS_ICSR_UNPENDSV in v3 */
+    str v3, [v4, #0]
+
+#if defined(CONFIG_THREAD_LOCAL_STORAGE)
+    /* Grab the TLS pointer */
+    ldr r4, =_thread_offset_to_tls
+    adds r4, r2, r4
+    ldr r0, [r4]
+
+    /* For Cortex-M, store TLS pointer in a global variable,
+     * as it lacks the process ID or thread ID register
+     * to be used by toolchain to access thread data.
+     */
+    ldr r4, =z_arm_tls_ptr
+    str r0, [r4]
+#endif
 
 #if defined(CONFIG_ARM_STORE_EXC_RETURN)
     /* Restore EXC_RETURN value. */
-    mov lr, r0
+    ldrsb lr, [r2, #_thread_offset_to_mode_exc_return]
+#endif
+
+    /* Restore previous interrupt disable state (irq_lock key)
+     * (We clear the arch.basepri field after restoring state)
+     */
+#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE) && (_thread_offset_to_basepri > 124)
+    /* Doing it this way since the offset to thread->arch.basepri can in
+     * some configurations be larger than the maximum of 124 for ldr/str
+     * immediate offsets.
+     */
+    ldr r4, =_thread_offset_to_basepri
+    adds r4, r2, r4
+
+    ldr r0, [r4]
+    movs.n r3, #0
+    str r3, [r4]
+#else
+    ldr r0, [r2, #_thread_offset_to_basepri]
+    movs r3, #0
+    str r3, [r2, #_thread_offset_to_basepri]
 #endif
 
 #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
+    /* BASEPRI not available, previous interrupt disable state
+     * maps to PRIMASK.
+     *
+     * Only enable interrupts if value is 0, meaning interrupts
+     * were enabled before irq_lock was called.
+     */
+    cmp r0, #0
+    bne _thread_irq_disabled
+    cpsie i
+_thread_irq_disabled:
+
+#if defined(CONFIG_MPU_STACK_GUARD) || defined(CONFIG_USERSPACE)
+    /* Re-program dynamic memory map */
+    push {r2,lr}
+    mov r0, r2
+    bl z_arm_configure_dynamic_mpu_regions
+    pop {r2,r3}
+    mov lr, r3
+#endif
+
+#ifdef CONFIG_USERSPACE
+    /* restore mode */
+    ldr r3, =_thread_offset_to_mode
+    adds r3, r2, r3
+    ldr r0, [r3]
+    mrs r3, CONTROL
+    movs.n r1, #1
+    bics r3, r1
+    orrs r3, r0
+    msr CONTROL, r3
+
+    /* ISB is not strictly necessary here (stack pointer is not being
+     * touched), but it's recommended to avoid executing pre-fetched
+     * instructions with the previous privilege.
+     */
+    isb
+
+#endif
+
     ldr r4, =_thread_offset_to_callee_saved
     adds r0, r2, r4
 
@@ -149,6 +253,9 @@ out_fp_endif:
     subs r0, #36
     ldmia r0!, {r4-r7}
 #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
+    /* restore BASEPRI for the incoming thread */
+    msr BASEPRI, r0
+
 #ifdef CONFIG_FPU_SHARING
     /* Assess whether switched-in thread had been using the FP registers. */
     tst lr, #_EXC_RETURN_FTYPE_Msk
@@ -178,9 +285,33 @@ in_fp_endif:
     isb
 #endif
 
+#if defined(CONFIG_MPU_STACK_GUARD) || defined(CONFIG_USERSPACE)
+    /* Re-program dynamic memory map */
+    push {r2,lr}
+    mov r0, r2 /* _current thread */
+    bl z_arm_configure_dynamic_mpu_regions
+    pop {r2,lr}
+#endif
+
+#ifdef CONFIG_USERSPACE
+    /* restore mode */
+    ldr r0, [r2, #_thread_offset_to_mode]
+    mrs r3, CONTROL
+    bic r3, #1
+    orr r3, r0
+    msr CONTROL, r3
+
+    /* ISB is not strictly necessary here (stack pointer is not being
+     * touched), but it's recommended to avoid executing pre-fetched
+     * instructions with the previous privilege.
+     */
+    isb
+
+#endif
+
     /* load callee-saved + psp from thread */
     add r0, r2, #_thread_offset_to_callee_saved
-    ldmia r0, {r4-r11, ip}
+    ldmia r0, {v1-v8, ip}
 #else
 #error Unknown ARM architecture
 #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
@@ -298,8 +429,7 @@ _stack_frame_endif:
 #endif
 
     /* exception return is done in z_arm_int_exit() */
-    ldr r0, =z_arm_int_exit
-    bx r0
+    b z_arm_int_exit
 #endif
 
 _oops:

arch/arm/core/cortex_m/thread.c

@@ -1,7 +1,6 @@
 /*
  * Copyright (c) 2013-2014 Wind River Systems, Inc.
  * Copyright (c) 2021 Lexmark International, Inc.
- * Copyright (c) 2023 Arm Limited
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -15,7 +14,6 @@
  */
 
 #include <zephyr/kernel.h>
-#include <zephyr/llext/symbol.h>
 #include <ksched.h>
 #include <zephyr/sys/barrier.h>
 #include <stdbool.h>
@@ -279,7 +277,6 @@ bool z_arm_thread_is_in_user_mode(void)
 	value = __get_CONTROL();
 	return (value & CONTROL_nPRIV_Msk) != 0;
 }
-EXPORT_SYMBOL(z_arm_thread_is_in_user_mode);
 #endif
 
 #if defined(CONFIG_BUILTIN_STACK_GUARD)
@@ -440,7 +437,7 @@ uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp
 			guard_len,
 			fault_addr, psp)) {
 		/* Thread stack corruption */
-		return (uint32_t)K_THREAD_STACK_BUFFER(z_main_stack);
+		return (uint32_t)Z_THREAD_STACK_BUFFER(z_main_stack);
 	}
 #endif
 #endif /* CONFIG_USERSPACE */
@@ -555,58 +552,39 @@ void arch_switch_to_main_thread(struct k_thread *main_thread, char *stack_ptr,
 #if defined(CONFIG_CPU_CORTEX_M_HAS_SPLIM)
 	__set_PSPLIM(main_thread->stack_info.start);
 #else
-#error "Built-in PSP limit checks not supported by the hardware."
+#error "Built-in PSP limit checks not supported by HW"
 #endif
 #endif /* CONFIG_BUILTIN_STACK_GUARD */
 
 	/*
 	 * Set PSP to the highest address of the main stack
 	 * before enabling interrupts and jumping to main.
-	 *
-	 * The compiler may store _main on the stack, but this
-	 * location is relative to `PSP`.
-	 * This assembly block ensures that _main is stored in
-	 * a callee saved register before switching stack and continuing
-	 * with the thread entry process.
-	 *
-	 * When calling arch_irq_unlock_outlined, LR is lost which is fine since
-	 * we do not intend to return after calling z_thread_entry.
 	 */
 	__asm__ volatile (
-	"mov   r4,  %0\n"	/* force _main to be stored in a register */
-	"msr   PSP, %1\n"	/* __set_PSP(stack_ptr) */
+	"mov   r0,  %0\n\t"	/* Store _main in R0 */
+	"msr   PSP, %1\n\t"	/* __set_PSP(stack_ptr) */
 
-	"mov   r0,  #0\n"	/* arch_irq_unlock(0) */
-	"ldr   r3, =arch_irq_unlock_outlined\n"
-	"blx   r3\n"
-
-	"mov   r0, r4\n"	/* z_thread_entry(_main, NULL, NULL, NULL) */
-	"mov   r1, #0\n"
-	"mov   r2, #0\n"
-	"mov   r3, #0\n"
-	"ldr   r4, =z_thread_entry\n"
-	"bx    r4\n"		/* We don’t intend to return, so there is no need to link. */
-	: "+r" (_main)
-	: "r" (stack_ptr)
-	: "r0", "r1", "r2", "r3", "r4", "ip", "lr");
+	"movs r1, #0\n\t"
+#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
+	"cpsie i\n\t"		/* __enable_irq() */
+#elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
+	"cpsie if\n\t"		/* __enable_irq(); __enable_fault_irq() */
+	"msr   BASEPRI, r1\n\t"	/* __set_BASEPRI(0) */
+#else
+#error Unknown ARM architecture
+#endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
+	"isb\n\t"
+	"movs r2, #0\n\t"
+	"movs r3, #0\n\t"
+	"bl z_thread_entry\n\t"	/* z_thread_entry(_main, 0, 0, 0); */
+	:
+	: "r" (_main), "r" (stack_ptr)
+	: "r0" /* not to be overwritten by msr PSP, %1 */
+	);
 
 	CODE_UNREACHABLE;
 }
 
-__used void arch_irq_unlock_outlined(unsigned int key)
-{
-#if defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
-	__enable_fault_irq(); /* alters FAULTMASK */
-	__enable_irq(); /* alters PRIMASK */
-#endif
-	arch_irq_unlock(key);
-}
-
-__used unsigned int arch_irq_lock_outlined(void)
-{
-	return arch_irq_lock();
-}
-
 #if !defined(CONFIG_MULTITHREADING)
 
 FUNC_NORETURN void z_arm_switch_to_main_no_multithreading(
@@ -615,11 +593,11 @@ FUNC_NORETURN void z_arm_switch_to_main_no_multithreading(
 	z_arm_prepare_switch_to_main();
 
 	/* Set PSP to the highest address of the main stack. */
-	char *psp =	K_THREAD_STACK_BUFFER(z_main_stack) +
+	char *psp =	Z_THREAD_STACK_BUFFER(z_main_stack) +
 		K_THREAD_STACK_SIZEOF(z_main_stack);
 
 #if defined(CONFIG_BUILTIN_STACK_GUARD)
-	char *psplim = (K_THREAD_STACK_BUFFER(z_main_stack));
+	char *psplim = (Z_THREAD_STACK_BUFFER(z_main_stack));
 	/* Clear PSPLIM before setting it to guard the main stack area. */
 	__set_PSPLIM(0);
 #endif
@@ -628,38 +606,42 @@ FUNC_NORETURN void z_arm_switch_to_main_no_multithreading(
 	 * after stack pointer change. The function is not going
 	 * to return, so callee-saved registers do not need to be
 	 * stacked.
-	 *
-	 * The compiler may store _main on the stack, but this
-	 * location is relative to `PSP`.
-	 * This assembly block ensures that _main is stored in
-	 * a callee saved register before switching stack and continuing
-	 * with the thread entry process.
 	 */
+	register void *p1_inreg __asm__("r0") = p1;
+	register void *p2_inreg __asm__("r1") = p2;
+	register void *p3_inreg __asm__("r2") = p3;
 
 	__asm__ volatile (
 #ifdef CONFIG_BUILTIN_STACK_GUARD
-	"msr  PSPLIM, %[_psplim]\n" /* __set_PSPLIM(_psplim) */
+	"msr  PSPLIM, %[_psplim]\n\t"
+#endif
+	"msr  PSP, %[_psp]\n\t"       /* __set_PSP(psp) */
+#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
+	"cpsie i\n\t"         /* enable_irq() */
+#elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
+	"cpsie if\n\t"		/* __enable_irq(); __enable_fault_irq() */
+	"mov r3, #0\n\t"
+	"msr   BASEPRI, r3\n\t"	/* __set_BASEPRI(0) */
+#endif
+	"isb\n\t"
+	"blx  %[_main_entry]\n\t"     /* main_entry(p1, p2, p3) */
+#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
+	"cpsid i\n\t"         /* disable_irq() */
+#elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
+	"msr BASEPRI, %[basepri]\n\t"/* __set_BASEPRI(_EXC_IRQ_DEFAULT_PRIO) */
+	"isb\n\t"
 #endif
-	"msr  PSP, %[_psp]\n"       /* __set_PSP(psp) */
-	"mov r0, #0\n"
-	"ldr r1, =arch_irq_unlock_outlined\n"
-	"blx r1\n"
-
-	"mov r0, %[_p1]\n"
-	"mov r1, %[_p2]\n"
-	"mov r2, %[_p3]\n"
-	"blx  %[_main_entry]\n"     /* main_entry(p1, p2, p3) */
-
-	"ldr r0, =arch_irq_lock_outlined\n"
-	"blx r0\n"
 	"loop: b loop\n\t"    /* while (true); */
 	:
-	: [_p1]"r" (p1), [_p2]"r" (p2), [_p3]"r" (p3),
+	: "r" (p1_inreg), "r" (p2_inreg), "r" (p3_inreg),
 	  [_psp]"r" (psp), [_main_entry]"r" (main_entry)
+#if defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
+	, [basepri] "r" (_EXC_IRQ_DEFAULT_PRIO)
+#endif
 #ifdef CONFIG_BUILTIN_STACK_GUARD
 	, [_psplim]"r" (psplim)
 #endif
-	: "r0", "r1", "r2", "ip", "lr"
+	:
 	);
 
 	CODE_UNREACHABLE; /* LCOV_EXCL_LINE */

arch/arm/core/cortex_m/thread_abort.c

@@ -25,8 +25,6 @@
 
 void z_impl_k_thread_abort(k_tid_t thread)
 {
-	SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_thread, abort, thread);
-
 	if (_current == thread) {
 		if (arch_is_in_isr()) {
 			/* ARM is unlike most arches in that this is true
@@ -51,6 +49,4 @@ void z_impl_k_thread_abort(k_tid_t thread)
 	}
 
 	z_thread_abort(thread);
-
-	SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_thread, abort, thread);
 }

arch/arm/core/elf.c

@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2023 Intel Corporation
- * Copyright (c) 2024 Schneider Electric
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,272 +7,9 @@
 #include <zephyr/llext/elf.h>
 #include <zephyr/llext/llext.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/sys/util.h>
 
 LOG_MODULE_REGISTER(elf, CONFIG_LLEXT_LOG_LEVEL);
 
-#define OPCODE2ARMMEM(x) ((uint32_t)(x))
-#define OPCODE2THM16MEM(x) ((uint16_t)(x))
-#define MEM2ARMOPCODE(x) OPCODE2ARMMEM(x)
-#define MEM2THM16OPCODE(x) OPCODE2THM16MEM(x)
-#define JUMP_UPPER_BOUNDARY ((int32_t)0xfe000000)
-#define JUMP_LOWER_BOUNDARY ((int32_t)0x2000000)
-#define PREL31_UPPER_BOUNDARY ((int32_t)0x40000000)
-#define PREL31_LOWER_BOUNDARY ((int32_t)-0x40000000)
-#define THM_JUMP_UPPER_BOUNDARY ((int32_t)0xff000000)
-#define THM_JUMP_LOWER_BOUNDARY ((int32_t)0x01000000)
-#define MASK_V4BX_RM_COND 0xf000000f
-#define MASK_V4BX_NOT_RM_COND 0x01a0f000
-#define MASK_BRANCH_COND GENMASK(31, 28)
-#define MASK_BRANCH_101 GENMASK(27, 25)
-#define MASK_BRANCH_L BIT(24)
-#define MASK_BRANCH_OFFSET GENMASK(23, 0)
-#define MASK_MOV_COND GENMASK(31, 28)
-#define MASK_MOV_00 GENMASK(27, 26)
-#define MASK_MOV_I BIT(25)
-#define MASK_MOV_OPCODE GENMASK(24, 21)
-#define MASK_MOV_S BIT(20)
-#define MASK_MOV_RN GENMASK(19, 16)
-#define MASK_MOV_RD GENMASK(15, 12)
-#define MASK_MOV_OPERAND2 GENMASK(11, 0)
-#define BIT_THM_BW_S 10
-#define MASK_THM_BW_11110 GENMASK(15, 11)
-#define MASK_THM_BW_S BIT(10)
-#define MASK_THM_BW_IMM10 GENMASK(9, 0)
-#define BIT_THM_BL_J1 13
-#define BIT_THM_BL_J2 11
-#define MASK_THM_BL_10 GENMASK(15, 14)
-#define MASK_THM_BL_J1 BIT(13)
-#define MASK_THM_BL_1 BIT(12)
-#define MASK_THM_BL_J2 BIT(11)
-#define MASK_THM_BL_IMM11 GENMASK(10, 0)
-#define MASK_THM_MOV_11110 GENMASK(15, 11)
-#define MASK_THM_MOV_I BIT(10)
-#define MASK_THM_MOV_100100 GENMASK(9, 4)
-#define MASK_THM_MOV_IMM4 GENMASK(3, 0)
-#define MASK_THM_MOV_0 BIT(15)
-#define MASK_THM_MOV_IMM3 GENMASK(14, 12)
-#define MASK_THM_MOV_RD GENMASK(11, 8)
-#define MASK_THM_MOV_IMM8 GENMASK(7, 0)
-#define SHIFT_PREL31_SIGN 30
-#define SHIFT_BRANCH_OFFSET 2
-#define SHIFT_JUMPS_SIGN 25
-#define SHIFT_MOV_RD 4
-#define SHIFT_MOV_RN 4
-#define SHIFT_MOVS_SIGN 15
-#define SHIFT_THM_JUMPS_SIGN 24
-#define SHIFT_THM_BW_IMM10 12
-#define SHIFT_THM_BL_J2 22
-#define SHIFT_THM_BL_J1 23
-#define SHIFT_THM_MOVS_SIGN 15
-#define SHIFT_THM_MOV_I 1
-#define SHIFT_THM_MOV_IMM3 4
-#define SHIFT_THM_MOV_IMM4 12
-
-static inline int prel31_decode(elf_word reloc_type, uint32_t loc,
-				uint32_t sym_base_addr, const char *sym_name, int32_t *offset)
-{
-	int ret;
-
-	*offset = sign_extend(*(int32_t *)loc, SHIFT_PREL31_SIGN);
-	*offset += sym_base_addr - loc;
-	if (*offset >= PREL31_UPPER_BOUNDARY || *offset < PREL31_LOWER_BOUNDARY) {
-		LOG_ERR("sym '%s': relocation out of range (%#x -> %#x)\n",
-			sym_name, loc, sym_base_addr);
-		ret = -ENOEXEC;
-	} else {
-		ret = 0;
-	}
-
-	return ret;
-}
-
-static inline void prel31_reloc(uint32_t loc, int32_t *offset)
-{
-	*(uint32_t *)loc &= BIT(31);
-	*(uint32_t *)loc |= *offset & GENMASK(30, 0);
-}
-
-static int prel31_handler(elf_word reloc_type, uint32_t loc,
-				uint32_t sym_base_addr, const char *sym_name)
-{
-	int ret;
-	int32_t offset;
-
-	ret = prel31_decode(reloc_type, loc, sym_base_addr, sym_name, &offset);
-	if (!ret) {
-		prel31_reloc(loc, &offset);
-	}
-
-	return ret;
-}
-
-static inline int jumps_decode(elf_word reloc_type, uint32_t loc,
-				uint32_t sym_base_addr, const char *sym_name, int32_t *offset)
-{
-	int ret;
-
-	*offset = MEM2ARMOPCODE(*(uint32_t *)loc);
-	*offset = (*offset & MASK_BRANCH_OFFSET) << SHIFT_BRANCH_OFFSET;
-	*offset = sign_extend(*offset, SHIFT_JUMPS_SIGN);
-	*offset += sym_base_addr - loc;
-	if (*offset >= JUMP_LOWER_BOUNDARY || *offset <= JUMP_UPPER_BOUNDARY) {
-		LOG_ERR("sym '%s': relocation out of range (%#x -> %#x)\n",
-			sym_name, loc, sym_base_addr);
-		ret = -ENOEXEC;
-	} else {
-		ret = 0;
-	}
-
-	return ret;
-}
-
-static inline void jumps_reloc(uint32_t loc, int32_t *offset)
-{
-	*offset >>= SHIFT_BRANCH_OFFSET;
-	*offset &= MASK_BRANCH_OFFSET;
-
-	*(uint32_t *)loc &= OPCODE2ARMMEM(MASK_BRANCH_COND|MASK_BRANCH_101|MASK_BRANCH_L);
-	*(uint32_t *)loc |= OPCODE2ARMMEM(*offset);
-}
-
-static int jumps_handler(elf_word reloc_type, uint32_t loc,
-				uint32_t sym_base_addr, const char *sym_name)
-{
-	int ret;
-	int32_t offset;
-
-	ret = jumps_decode(reloc_type, loc, sym_base_addr, sym_name, &offset);
-	if (!ret) {
-		jumps_reloc(loc, &offset);
-	}
-
-	return ret;
-}
-
-static void movs_handler(elf_word reloc_type, uint32_t loc,
-			uint32_t sym_base_addr, const char *sym_name)
-{
-	int32_t offset;
-	uint32_t tmp;
-
-	offset = tmp = MEM2ARMOPCODE(*(uint32_t *)loc);
-	offset = ((offset & MASK_MOV_RN) >> SHIFT_MOV_RN) | (offset & MASK_MOV_OPERAND2);
-	offset = sign_extend(offset, SHIFT_MOVS_SIGN);
-
-	offset += sym_base_addr;
-	if (reloc_type == R_ARM_MOVT_PREL || reloc_type == R_ARM_MOVW_PREL_NC) {
-		offset -= loc;
-	}
-	if (reloc_type == R_ARM_MOVT_ABS || reloc_type == R_ARM_MOVT_PREL) {
-		offset >>= 16;
-	}
-
-	tmp &= (MASK_MOV_COND | MASK_MOV_00 | MASK_MOV_I | MASK_MOV_OPCODE | MASK_MOV_RD);
-	tmp |= ((offset & MASK_MOV_RD) << SHIFT_MOV_RD) | (offset & MASK_MOV_OPERAND2);
-
-	*(uint32_t *)loc = OPCODE2ARMMEM(tmp);
-}
-
-static inline int thm_jumps_decode(elf_word reloc_type, uint32_t loc,
-			uint32_t sym_base_addr, const char *sym_name, int32_t *offset,
-			uint32_t *upper, uint32_t *lower)
-{
-	int ret;
-	uint32_t j_one, j_two, sign;
-
-	*upper = MEM2THM16OPCODE(*(uint16_t *)loc);
-	*lower = MEM2THM16OPCODE(*(uint16_t *)(loc + 2));
-
-	/* sign is bit10 */
-	sign = (*upper >> BIT_THM_BW_S) & 1;
-	j_one = (*lower >> BIT_THM_BL_J1) & 1;
-	j_two = (*lower >> BIT_THM_BL_J2) & 1;
-	*offset = (sign << SHIFT_THM_JUMPS_SIGN) |
-				((~(j_one ^ sign) & 1) << SHIFT_THM_BL_J1) |
-				((~(j_two ^ sign) & 1) << SHIFT_THM_BL_J2) |
-				((*upper & MASK_THM_BW_IMM10) << SHIFT_THM_BW_IMM10) |
-				((*lower & MASK_THM_BL_IMM11) << 1);
-	*offset = sign_extend(*offset, SHIFT_THM_JUMPS_SIGN);
-	*offset += sym_base_addr - loc;
-
-	if (*offset >= THM_JUMP_LOWER_BOUNDARY || *offset <= THM_JUMP_UPPER_BOUNDARY) {
-		LOG_ERR("sym '%s': relocation out of range (%#x -> %#x)\n",
-			sym_name, loc, sym_base_addr);
-		ret = -ENOEXEC;
-	} else {
-		ret = 0;
-	}
-
-	return ret;
-}
-
-static inline void thm_jumps_reloc(uint32_t loc, int32_t *offset,
-			uint32_t *upper, uint32_t *lower)
-{
-	uint32_t j_one, j_two, sign;
-
-	sign = (*offset >> SHIFT_THM_JUMPS_SIGN) & 1;
-	j_one = sign ^ (~(*offset >> SHIFT_THM_BL_J1) & 1);
-	j_two = sign ^ (~(*offset >> SHIFT_THM_BL_J2) & 1);
-	*upper = (uint16_t)((*upper & MASK_THM_BW_11110) | (sign << BIT_THM_BW_S) |
-				((*offset >> SHIFT_THM_BW_IMM10) & MASK_THM_BW_IMM10));
-	*lower = (uint16_t)((*lower & (MASK_THM_BL_10|MASK_THM_BL_1)) |
-				(j_one << BIT_THM_BL_J1) | (j_two << BIT_THM_BL_J2) |
-				((*offset >> 1) & MASK_THM_BL_IMM11));
-
-	*(uint16_t *)loc = OPCODE2THM16MEM(*upper);
-	*(uint16_t *)(loc + 2) = OPCODE2THM16MEM(*lower);
-}
-
-static int thm_jumps_handler(elf_word reloc_type, uint32_t loc,
-			uint32_t sym_base_addr, const char *sym_name)
-{
-	int ret;
-	int32_t offset;
-	uint32_t upper, lower;
-
-	ret = thm_jumps_decode(reloc_type, loc, sym_base_addr, sym_name, &offset, &upper, &lower);
-	if (!ret) {
-		thm_jumps_reloc(loc, &offset, &upper, &lower);
-	}
-
-	return ret;
-}
-
-static void thm_movs_handler(elf_word reloc_type, uint32_t loc,
-			uint32_t sym_base_addr, const char *sym_name)
-{
-	int32_t offset;
-	uint32_t upper, lower;
-
-	upper = MEM2THM16OPCODE(*(uint16_t *)loc);
-	lower = MEM2THM16OPCODE(*(uint16_t *)(loc + 2));
-
-	/* MOVT/MOVW instructions encoding in Thumb-2 */
-	offset = ((upper & MASK_THM_MOV_IMM4) << SHIFT_THM_MOV_IMM4) |
-		((upper & MASK_THM_MOV_I) << SHIFT_THM_MOV_I) |
-		((lower & MASK_THM_MOV_IMM3) >> SHIFT_THM_MOV_IMM3) | (lower & MASK_THM_MOV_IMM8);
-	offset = sign_extend(offset, SHIFT_THM_MOVS_SIGN);
-	offset += sym_base_addr;
-
-	if (reloc_type == R_ARM_THM_MOVT_PREL || reloc_type == R_ARM_THM_MOVW_PREL_NC) {
-		offset -= loc;
-	}
-	if (reloc_type == R_ARM_THM_MOVT_ABS || reloc_type == R_ARM_THM_MOVT_PREL) {
-		offset >>= 16;
-	}
-
-	upper = (uint16_t)((upper & (MASK_THM_MOV_11110|MASK_THM_MOV_100100)) |
-		((offset & (MASK_THM_MOV_IMM4<<SHIFT_THM_MOV_IMM4)) >> SHIFT_THM_MOV_IMM4) |
-		((offset & (MASK_THM_MOV_I<<SHIFT_THM_MOV_I)) >> SHIFT_THM_MOV_I));
-	lower = (uint16_t)((lower & (MASK_THM_MOV_0|MASK_THM_MOV_RD)) |
-		((offset & (MASK_THM_MOV_IMM3>>SHIFT_THM_MOV_IMM3)) << SHIFT_THM_MOV_IMM3) |
-		(offset & MASK_THM_MOV_IMM8));
-	*(uint16_t *)loc = OPCODE2THM16MEM(upper);
-	*(uint16_t *)(loc + 2) = OPCODE2THM16MEM(lower);
-}
-
 /**
  * @brief Architecture specific function for relocating partially linked (static) elf
  *
@@ -283,81 +19,19 @@ static void thm_movs_handler(elf_word reloc_type, uint32_t loc,
  *
  * The relocation codes for arm are well documented
  * https://github.com/ARM-software/abi-aa/blob/main/aaelf32/aaelf32.rst#relocation
- *
- * Handler functions prefixed by '_thm_' means that they are Thumb instructions specific.
- * Do NOT mix them with not 'Thumb instructions' in the below switch/case: they are not
- * intended to work together.
  */
-int arch_elf_relocate(elf_rela_t *rel, uintptr_t loc, uintptr_t sym_base_addr,
-			const char *sym_name, uintptr_t load_bias)
+void arch_elf_relocate(elf_rela_t *rel, uintptr_t opaddr, uintptr_t opval)
 {
-	int ret = 0;
 	elf_word reloc_type = ELF32_R_TYPE(rel->r_info);
 
-	LOG_DBG("%d %lx %lx %s", reloc_type, loc, sym_base_addr, sym_name);
-
 	switch (reloc_type) {
-	case R_ARM_NONE:
-		break;
-
 	case R_ARM_ABS32:
-	case R_ARM_TARGET1:
-		*(uint32_t *)loc += sym_base_addr;
+		/* Update the absolute address of a load/store instruction */
+		*((uint32_t *)opaddr) = (uint32_t)opval;
 		break;
-
-	case R_ARM_PC24:
-	case R_ARM_CALL:
-	case R_ARM_JUMP24:
-		ret = jumps_handler(reloc_type, loc, sym_base_addr, sym_name);
-		break;
-
-	case R_ARM_V4BX:
-		/* keep Rm and condition bits */
-		*(uint32_t *)loc &= OPCODE2ARMMEM(MASK_V4BX_RM_COND);
-		/* remove the rest */
-		*(uint32_t *)loc |= OPCODE2ARMMEM(MASK_V4BX_NOT_RM_COND);
-		break;
-
-	case R_ARM_PREL31:
-		ret = prel31_handler(reloc_type, loc, sym_base_addr, sym_name);
-		break;
-
-	case R_ARM_REL32:
-		*(uint32_t *)loc += sym_base_addr - loc;
-		break;
-
-	case R_ARM_MOVW_ABS_NC:
-	case R_ARM_MOVT_ABS:
-	case R_ARM_MOVW_PREL_NC:
-	case R_ARM_MOVT_PREL:
-		movs_handler(reloc_type, loc, sym_base_addr, sym_name);
-		break;
-
-	case R_ARM_THM_CALL:
-	case R_ARM_THM_JUMP24:
-		ret = thm_jumps_handler(reloc_type, loc, sym_base_addr, sym_name);
-		break;
-
-	case R_ARM_THM_MOVW_ABS_NC:
-	case R_ARM_THM_MOVT_ABS:
-	case R_ARM_THM_MOVW_PREL_NC:
-	case R_ARM_THM_MOVT_PREL:
-		thm_movs_handler(reloc_type, loc, sym_base_addr, sym_name);
-		break;
-
-	case R_ARM_RELATIVE:
-		*(uint32_t *)loc += load_bias;
-		break;
-
-	case R_ARM_GLOB_DAT:
-	case R_ARM_JUMP_SLOT:
-		*(uint32_t *)loc = sym_base_addr;
-		break;
-
 	default:
-		LOG_ERR("unknown relocation: %u\n", reloc_type);
-		ret = -ENOEXEC;
+		LOG_DBG("Unsupported ARM elf relocation type %d at address %lx",
+			reloc_type, opaddr);
+		break;
 	}
-
-	return ret;
 }

arch/arm/core/fatal.c

@@ -18,7 +18,7 @@
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 #ifdef CONFIG_EXCEPTION_DEBUG
-static void esf_dump(const struct arch_esf *esf)
+static void esf_dump(const z_arch_esf_t *esf)
 {
 	LOG_ERR("r0/a1:  0x%08x  r1/a2:  0x%08x  r2/a3:  0x%08x",
 		esf->basic.a1, esf->basic.a2, esf->basic.a3);
@@ -66,23 +66,13 @@ static void esf_dump(const struct arch_esf *esf)
 }
 #endif /* CONFIG_EXCEPTION_DEBUG */
 
-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)
 {
 #ifdef CONFIG_EXCEPTION_DEBUG
 	if (esf != NULL) {
 		esf_dump(esf);
 	}
 #endif /* CONFIG_EXCEPTION_DEBUG */
-
-	/* LOG the IRQn that was unhandled */
-#if defined(CONFIG_CPU_CORTEX_M)
-	if (reason == K_ERR_SPURIOUS_IRQ) {
-		uint32_t irqn = __get_IPSR() - 16;
-
-		LOG_ERR("Unhandled IRQn: %d", irqn);
-	}
-#endif
-
 	z_fatal_error(reason, esf);
 }
 
@@ -102,7 +92,7 @@ void z_arm_fatal_error(unsigned int reason, const struct arch_esf *esf)
  * @param esf exception frame
  * @param callee_regs Callee-saved registers (R4-R11)
  */
-void z_do_kernel_oops(const struct arch_esf *esf, _callee_saved_t *callee_regs)
+void z_do_kernel_oops(const z_arch_esf_t *esf, _callee_saved_t *callee_regs)
 {
 #if !(defined(CONFIG_EXTRA_EXCEPTION_INFO) && defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE))
 	ARG_UNUSED(callee_regs);
@@ -130,9 +120,9 @@ void z_do_kernel_oops(const struct arch_esf *esf, _callee_saved_t *callee_regs)
 #if !defined(CONFIG_EXTRA_EXCEPTION_INFO)
 	z_arm_fatal_error(reason, esf);
 #else
-	struct arch_esf esf_copy;
+	z_arch_esf_t esf_copy;
 
-	memcpy(&esf_copy, esf, offsetof(struct arch_esf, extra_info));
+	memcpy(&esf_copy, esf, offsetof(z_arch_esf_t, extra_info));
 #if defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE)
 	/* extra exception info is collected in callee_reg param
 	 * on CONFIG_ARMV7_M_ARMV8_M_MAINLINE
@@ -156,7 +146,7 @@ void z_do_kernel_oops(const struct arch_esf *esf, _callee_saved_t *callee_regs)
 FUNC_NORETURN void arch_syscall_oops(void *ssf_ptr)
 {
 	uint32_t *ssf_contents = ssf_ptr;
-	struct arch_esf oops_esf = { 0 };
+	z_arch_esf_t oops_esf = { 0 };
 
 	/* TODO: Copy the rest of the register set out of ssf_ptr */
 	oops_esf.basic.pc = ssf_contents[3];

arch/arm/core/gdbstub.c

@@ -42,7 +42,7 @@ static int is_bkpt(unsigned int exc_cause)
 }
 
 /* Wrapper function to save and restore execution c */
-void z_gdb_entry(struct arch_esf *esf, unsigned int exc_cause)
+void z_gdb_entry(z_arch_esf_t *esf, unsigned int exc_cause)
 {
 	/* Disable the hardware breakpoint in case it was set */
 	__asm__ volatile("mcr p14, 0, %0, c0, c0, 5" ::"r"(0x0) :);

arch/arm/core/irq_offload.c

@@ -10,7 +10,6 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/irq_offload.h>
-#include <cmsis_core.h>
 
 volatile irq_offload_routine_t offload_routine;
 static const void *offload_param;
@@ -23,11 +22,14 @@ void z_irq_do_offload(void)
 
 void arch_irq_offload(irq_offload_routine_t routine, const void *parameter)
 {
-#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE) && !defined(CONFIG_ARMV8_M_BASELINE) \
-	&& defined(CONFIG_ASSERT)
-	/* ARMv6-M HardFault if you make a SVC call with interrupts locked.
+#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE) && defined(CONFIG_ASSERT)
+	/* ARMv6-M/ARMv8-M Baseline HardFault if you make a SVC call with
+	 * interrupts locked.
 	 */
-	__ASSERT(__get_PRIMASK() == 0U, "irq_offload called with interrupts locked\n");
+	unsigned int key;
+
+	__asm__ volatile("mrs %0, PRIMASK;" : "=r" (key) : : "memory");
+	__ASSERT(key == 0U, "irq_offload called with interrupts locked\n");
 #endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE && CONFIG_ASSERT */
 
 	k_sched_lock();

arch/arm/core/mpu/Kconfig

@@ -14,8 +14,6 @@ config ARM_MPU
 	select MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT if !(CPU_HAS_NXP_MPU || ARMV8_M_BASELINE || ARMV8_M_MAINLINE || AARCH32_ARMV8_R)
 	select MPU_REQUIRES_NON_OVERLAPPING_REGIONS if CPU_HAS_ARM_MPU && (ARMV8_M_BASELINE || ARMV8_M_MAINLINE || AARCH32_ARMV8_R)
 	select MPU_GAP_FILLING if AARCH32_ARMV8_R
-	select ARCH_MEM_DOMAIN_SUPPORTS_ISOLATED_STACKS
-	select MEM_DOMAIN_ISOLATED_STACKS
 	help
 	  MCU implements Memory Protection Unit.
 

arch/arm/core/mpu/arm_core_mpu.c

@@ -338,7 +338,7 @@ int arch_mem_domain_max_partitions_get(void)
 	return ARM_CORE_MPU_MAX_DOMAIN_PARTITIONS_GET(available_regions);
 }
 
-int arch_buffer_validate(const void *addr, size_t size, int write)
+int arch_buffer_validate(void *addr, size_t size, int write)
 {
 	return arm_core_mpu_buffer_validate(addr, size, write);
 }

arch/arm/core/mpu/arm_core_mpu_dev.h

@@ -261,7 +261,7 @@ int arm_core_mpu_get_max_available_dyn_regions(void);
  *       spans multiple enabled MPU regions (even if these regions all
  *       permit user access).
  */
-int arm_core_mpu_buffer_validate(const void *addr, size_t size, int write);
+int arm_core_mpu_buffer_validate(void *addr, size_t size, int write);
 
 #endif /* CONFIG_ARM_MPU */