ci: Use organisation-level AWS secrets

This commit updates the CI workflows to use the `zephyrproject-rtos`
organisation-level AWS secrets instead of the repository-level secrets.

Using organisation-level secrets allows more centralised management of
the access keys used throughout the GitHub Actions CI infrastructure.

Note that the `AWS_*_ACCESS_KEY_ID` is now stored in plaintext as a
variable instead of a secret because it is equivalent to username and
needs to be identifiable for management and audit purposes.

Signed-off-by: Stephanos Ioannidis <root@stephanos.io>
(cherry picked from commit 8233f8ef91)

.checkpatch.conf

@@ -29,4 +29,4 @@
 --ignore MULTISTATEMENT_MACRO_USE_DO_WHILE
 --ignore ENOSYS
 --ignore IS_ENABLED_CONFIG
---ignore EXPORT_SYMBOL
+--exclude ext

.clang-format

@@ -12,7 +12,7 @@
 ---
 BasedOnStyle: LLVM
 AlignConsecutiveMacros: AcrossComments
-AllowShortBlocksOnASingleLine: Never
+AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortEnumsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
@@ -24,16 +24,12 @@ AttributeMacros:
   - __packed
   - __printf_like
   - __syscall
-  - __syscall_always_inline
   - __subsystem
-BitFieldColonSpacing: After
 BreakBeforeBraces: Linux
 ColumnLimit: 100
 ConstructorInitializerIndentWidth: 8
 ContinuationIndentWidth: 8
 ForEachMacros:
-  - 'ARRAY_FOR_EACH'
-  - 'ARRAY_FOR_EACH_PTR'
   - 'FOR_EACH'
   - 'FOR_EACH_FIXED_ARG'
   - 'FOR_EACH_IDX'
@@ -67,13 +63,7 @@ ForEachMacros:
   - 'Z_GENLIST_FOR_EACH_CONTAINER_SAFE'
   - 'Z_GENLIST_FOR_EACH_NODE'
   - 'Z_GENLIST_FOR_EACH_NODE_SAFE'
-  - 'STRUCT_SECTION_FOREACH'
-  - 'TYPE_SECTION_FOREACH'
-  - 'K_SPINLOCK'
-IfMacros:
-  - 'CHECKIF'
-# Disabled for now, see bug https://github.com/zephyrproject-rtos/zephyr/issues/48520
-#IncludeBlocks: Regroup
+IncludeBlocks: Regroup
 IncludeCategories:
   - Regex: '^".*\.h"$'
     Priority: 0
@@ -85,10 +75,8 @@ IncludeCategories:
     Priority: 3
 IndentCaseLabels: false
 IndentWidth: 8
-InsertBraces: true
-SpaceBeforeParens: ControlStatementsExceptControlMacros
-SortIncludes: Never
-UseTab: ForContinuationAndIndentation
+# SpaceBeforeParens: ControlStatementsExceptControlMacros # clang-format >= 13.0
+UseTab: Always
 WhitespaceSensitiveMacros:
   - STRINGIFY
   - Z_STRINGIFY

.codecov.yml

@@ -12,10 +12,10 @@ coverage:
     patch: yes
     changes: no
 
-# ignore:
-#   - "tests/**/*"
-#   - "samples/**/*"
-#   - "ext/hal/**/*"
+#ignore:
+#  - "tests/**/*"
+#  - "samples/**/*"
+#  - "ext/hal/**/*"
 
 parsers:
   gcov:

.github/ISSUE_TEMPLATE/001_bug_report.md

@@ -1,71 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve Zephyr
-title: ''
-labels: bug
-assignees: ''
-
----
-<!--
-**Notes**
-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.
-
-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
-the problem you're facing:
- - What target platform are you using?
- - What have you tried to diagnose or workaround this issue?
- - 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

@@ -1,28 +0,0 @@
----
-name: Enhancement
-about: Suggest enhancements to existing features
-title: ''
-labels: Enhancement
-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

@@ -1,60 +0,0 @@
----
-name: RFC / Proposal
-about: Submit an RFC / Proposal
-title: ''
-labels: RFC
-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

@@ -1,28 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: Feature Request
-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/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,47 @@
+---
+name: Bug report
+about: Create a report to help us improve Zephyr
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+Please also mention any information which could help others to understand
+the problem you're facing:
+ - What target platform are you using?
+ - What have you tried to diagnose or workaround this issue?
+ - 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/enhancement.md

@@ -0,0 +1,20 @@
+---
+name: Enhancement
+about: Suggest enhancements to existing features
+title: ''
+labels: Enhancement
+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/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: Feature Request
+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/ISSUE_TEMPLATE/hardware_support.md

@@ -0,0 +1,19 @@
+---
+name: Hardware Support
+about: Suggest adding hardware support
+title: ''
+labels: Hardware Support
+assignees: ''
+
+---
+
+**Is this request related to a missing driver support for a particular hardware platform, SoC or board? Please describe.**
+Describe in details the hardware support being requested and why this support benefits Zephyr.
+
+**Describe why you are asking for this support?**
+Describe why you are asking for this support instead of contributing it directly to the tree
+
+If this is a new board or SoC, please state whether you are willing to maintain the Zephyr support for it if it is included in the main tree
+
+**Additional context**
+Add any other context or graphics (drag-and-drop an image) about the hardware here.

.github/ISSUE_TEMPLATE/rfc-proposal.md

@@ -0,0 +1,51 @@
+---
+name: RFC / Proposal
+about: Submit an RFC / Proposal
+title: ''
+labels: RFC
+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/SECURITY.md

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

.github/workflows/assigner.yml

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

.github/workflows/backport.yml

@@ -9,23 +9,11 @@ on:
 
 jobs:
   backport:
+    runs-on: ubuntu-20.04
     name: Backport
-    runs-on: ubuntu-22.04
-    # Only react to merged PRs for security reasons.
-    # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
-    if: >
-      github.event.pull_request.merged &&
-      (
-        github.event.action == 'closed' ||
-        (
-          github.event.action == 'labeled' &&
-          contains(github.event.label.name, 'backport')
-        )
-      )
     steps:
       - name: Backport
-        uses: zephyrproject-rtos/action-backport@v2.0.3-3
+        uses: zephyrproject-rtos/action-backport@v1.1.1-3
         with:
           github_token: ${{ secrets.ZB_GITHUB_TOKEN }}
-          issue_labels: Backport
-          labels_template: '["Backport"]'
+          issue_labels: backport

.github/workflows/backport_issue_check.yml

@@ -2,26 +2,17 @@ name: Backport Issue Check
 
 on:
   pull_request_target:
-    types:
-      - edited
-      - opened
-      - reopened
-      - synchronize
     branches:
       - v*-branch
 
 jobs:
   backport:
     name: Backport Issue Check
-    concurrency:
-      group: backport-issue-check-${{ github.ref }}
-      cancel-in-progress: true
     runs-on: ubuntu-22.04
-    if: github.repository == 'zephyrproject-rtos/zephyr'
 
     steps:
       - name: Check out source code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Install Python dependencies
         run: |

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

@@ -0,0 +1,29 @@
+name: Publish Bluetooth Tests Results
+
+on:
+  workflow_run:
+    workflows: ["Bluetooth Tests"]
+    types:
+      - completed
+jobs:
+  bluetooth-test-results:
+    name: "Publish Bluetooth Test Results"
+    runs-on: ubuntu-20.04
+    if: github.event.workflow_run.conclusion != 'skipped'
+
+    steps:
+      - name: Download artifacts
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: bluetooth-tests.yaml
+          run_id: ${{ github.event.workflow_run.id }}
+
+      - name: Publish Bluetooth Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v1
+        with:
+          check_name: Bluetooth Test Results
+          comment_mode: off
+          commit: ${{ github.event.workflow_run.head_sha }}
+          event_file: event/event.json
+          event_name: ${{ github.event.workflow_run.event }}
+          files: "bluetooth-test-results/**/bsim_results.xml"

.github/workflows/bluetooth-tests.yaml

@@ -0,0 +1,83 @@
+name: Bluetooth Tests
+
+on:
+  pull_request:
+    paths:
+      - ".github/workflows/bluetooth-test*.yaml"
+      - "west.yml"
+      - "subsys/bluetooth/**"
+      - "tests/bluetooth/bsim_bt/**"
+      - "boards/posix/**"
+      - "soc/posix/**"
+      - "arch/posix/**"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  bluetooth-test:
+    runs-on: ubuntu-20.04
+    container:
+      image: ghcr.io/zephyrproject-rtos/ci:v0.24.3
+      options: '--entrypoint /bin/bash'
+    env:
+      ZEPHYR_TOOLCHAIN_VARIANT: zephyr
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0
+      BSIM_OUT_PATH: /opt/bsim/
+      BSIM_COMPONENTS_PATH: /opt/bsim/components
+      EDTT_PATH: ../tools/edtt
+      bsim_bt_test_results_file: ./bsim_bt_out/bsim_results.xml
+    steps:
+      - name: Apply container owner mismatch workaround
+        run: |
+          # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
+          #        match the container user UID because of the way GitHub
+          #        Actions runner is implemented. Remove this workaround when
+          #        GitHub comes up with a fundamental fix for this problem.
+          git config --global --add safe.directory ${GITHUB_WORKSPACE}
+
+      - name: Update PATH for west
+        run: |
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: west setup
+        env:
+          BASE_REF: ${{ github.base_ref }}
+        run: |
+          git config --global user.email "you@example.com"
+          git config --global user.name "Your Name"
+          git remote -v
+          git rebase origin/${BASE_REF}
+          west init -l . || true
+          west config --global update.narrow true
+          west update 2>&1 1> west.update.log || west update 2>&1 1> west.update2.log
+
+      - name: Run Bluetooth Tests with BSIM
+        run: |
+          export ZEPHYR_BASE=${PWD}
+          WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bluetooth/bsim_bt/compile.sh
+          RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_test_results_file} \
+          SEARCH_PATH=tests/bluetooth/bsim_bt/ tests/bluetooth/bsim_bt/run_parallel.sh
+
+      - name: Upload Test Results
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: bluetooth-test-results
+          path: |
+            ./bsim_bt_out/bsim_results.xml
+            ${{ github.event_path }}
+
+      - name: Upload Event Details
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: event
+          path: |
+            ${{ github.event_path }}

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

@@ -1,28 +0,0 @@
-name: Publish BabbleSim Tests Results
-
-on:
-  workflow_run:
-    workflows: ["BabbleSim Tests"]
-    types:
-      - completed
-jobs:
-  bsim-test-results:
-    name: "Publish BabbleSim Test Results"
-    runs-on: ubuntu-22.04
-    if: github.event.workflow_run.conclusion != 'skipped'
-
-    steps:
-      - name: Download artifacts
-        uses: dawidd6/action-download-artifact@v3
-        with:
-          run_id: ${{ github.event.workflow_run.id }}
-
-      - name: Publish BabbleSim Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        with:
-          check_name: BabbleSim Test Results
-          comment_mode: off
-          commit: ${{ github.event.workflow_run.head_sha }}
-          event_file: event/event.json
-          event_name: ${{ github.event.workflow_run.event }}
-          files: "bsim-test-results/**/bsim_results.xml"

.github/workflows/bsim-tests.yaml

@@ -1,191 +0,0 @@
-name: BabbleSim Tests
-
-on:
-  pull_request:
-    paths:
-      - ".github/workflows/bsim-tests.yaml"
-      - ".github/workflows/bsim-tests-publish.yaml"
-      - "west.yml"
-      - "subsys/bluetooth/**"
-      - "tests/bsim/**"
-      - "tests/bluetooth/common/testlib/**"
-      - "samples/bluetooth/**"
-      - "boards/posix/**"
-      - "soc/posix/**"
-      - "arch/posix/**"
-      - "include/zephyr/arch/posix/**"
-      - "scripts/native_simulator/**"
-      - "samples/net/sockets/echo_*/**"
-      - "modules/openthread/**"
-      - "subsys/net/l2/openthread/**"
-      - "include/zephyr/net/openthread.h"
-      - "drivers/ieee802154/**"
-      - "include/zephyr/net/ieee802154*"
-      - "drivers/serial/*nrfx*"
-      - "tests/drivers/uart/**"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  bsim-test:
-    if: github.repository_owner == 'zephyrproject-rtos'
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.13.20240601
-      options: '--entrypoint /bin/bash'
-    env:
-      ZEPHYR_TOOLCHAIN_VARIANT: zephyr
-      BSIM_OUT_PATH: /opt/bsim/
-      BSIM_COMPONENTS_PATH: /opt/bsim/components
-      EDTT_PATH: ../tools/edtt
-    steps:
-      - name: Apply container owner mismatch workaround
-        run: |
-          # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
-          #        match the container user UID because of the way GitHub
-          #        Actions runner is implemented. Remove this workaround when
-          #        GitHub comes up with a fundamental fix for this problem.
-          git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-      - name: Print cloud service information
-        run: |
-          echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-          echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-          echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
-      - name: Clone cached Zephyr repository
-        continue-on-error: true
-        run: |
-          git clone --shared /repo-cache/zephyrproject/zephyr .
-          git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Environment Setup
-        env:
-          BASE_REF: ${{ github.base_ref }}
-        run: |
-          git config --global user.email "bot@zephyrproject.org"
-          git config --global user.name "Zephyr Bot"
-          rm -fr ".git/rebase-apply"
-          git rebase origin/${BASE_REF}
-          git log  --pretty=oneline | head -n 10
-          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 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
-        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/
-            tests/bsim/*
-
-      - name: Check if Bluethooth files changed
-        uses: tj-actions/changed-files@v44
-        id: check-bluetooth-files
-        with:
-          files: |
-            tests/bsim/bluetooth/
-            samples/bluetooth/
-            subsys/bluetooth/
-
-      - name: Check if Networking files changed
-        uses: tj-actions/changed-files@v44
-        id: check-networking-files
-        with:
-          files: |
-            tests/bsim/net/
-            samples/net/sockets/echo_*/
-            modules/openthread/
-            subsys/net/l2/openthread/
-            include/zephyr/net/openthread.h
-            drivers/ieee802154/
-            include/zephyr/net/ieee802154*
-
-      - name: Check if UART files changed
-        uses: tj-actions/changed-files@v44
-        id: check-uart-files
-        with:
-          files: |
-            tests/bsim/drivers/uart/
-            drivers/serial/*nrfx*
-            tests/drivers/uart/
-
-      - name: Update BabbleSim to manifest revision
-        if: >
-          steps.check-bluetooth-files.outputs.any_changed == 'true'
-          || steps.check-networking-files.outputs.any_changed == 'true'
-          || steps.check-uart-files.outputs.any_changed == 'true'
-          || steps.check-common-files.outputs.any_changed == 'true'
-        run: |
-          export BSIM_VERSION=$( west list bsim -f {revision} )
-          echo "Manifest points to bsim sha $BSIM_VERSION"
-          cd /opt/bsim_west/bsim
-          git fetch -n origin ${BSIM_VERSION}
-          git -c advice.detachedHead=false checkout ${BSIM_VERSION}
-          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
-
-      - 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
-
-      - name: Run UART Tests with BSIM
-        if: steps.check-uart-files.outputs.any_changed == 'true' || steps.check-common-files.outputs.any_changed == 'true'
-        run: |
-          tests/bsim/ci.uart.sh
-
-      - name: Merge Test Results
-        run: |
-          pip3 install junitparser junit2html
-          junitparser merge --glob "./bsim_*/*bsim_results.*.xml" "./twister-out/twister.xml" junit.xml
-          junit2html junit.xml junit.html
-
-      - name: Upload Unit Test Results in HTML
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: HTML Unit Test Results
-          if-no-files-found: ignore
-          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
-
-      - name: Upload Event Details
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: event
-          path: |
-            ${{ github.event_path }}

.github/workflows/bug_snapshot.yaml

@@ -8,20 +8,20 @@ name: Bug Snapshot
 
 on:
   workflow_dispatch:
-    branches: [main]
+    branches: [ main ]
   schedule:
-  # Run daily at 14:05
-  - cron: '5 14 * * *'
+    # Run daily at 14:05
+    - cron: '5 14 * * *'
 
 jobs:
   make_bugs_pickle:
     name: Make bugs pickle
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     if: github.repository_owner == 'zephyrproject-rtos'
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
 
     - name: Install Python dependencies
       run: |
@@ -42,7 +42,7 @@ jobs:
         echo "BUGS_PICKLE_PATH=${BUGS_PICKLE_PATH}" >> ${GITHUB_ENV}
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@v2
       with:
         aws-access-key-id: ${{ vars.AWS_BUILDS_ZEPHYR_BUG_SNAPSHOT_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_BUILDS_ZEPHYR_BUG_SNAPSHOT_SECRET_ACCESS_KEY }}

.github/workflows/clang.yaml

@@ -8,21 +8,19 @@ 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.24.3
       options: '--entrypoint /bin/bash'
+      volumes:
+        - /repo-cache/zephyrproject:/github/cache/zephyrproject
     strategy:
       fail-fast: false
       matrix:
-        platform: ["native_sim"]
+        platform: ["native_posix"]
     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
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0
+      LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-15
       COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
       BASE_REF: ${{ github.base_ref }}
     outputs:
@@ -36,20 +34,14 @@ 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
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
@@ -65,15 +57,12 @@ jobs:
           git log  --pretty=oneline | head -n 10
           west init -l . || true
           west config --global update.narrow true
-          west config manifest.group-filter -- +ci,+optional
           # In some cases modules are left in a state where they can't be
           # updated (i.e. when we cancel a job and the builder is killed),
           # 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)
-
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
+          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)
 
       - name: Check Environment
         run: |
@@ -82,22 +71,30 @@ 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/.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
+          test -d github/home/.ccache && rm -rf /github/home/.ccache && mv github/home/.ccache /github/home/.ccache
+          ccache -M 10G -s
 
       - name: Run Tests with Twister
         id: twister
@@ -118,14 +115,13 @@ jobs:
             echo "report_needed=0" >> $GITHUB_OUTPUT
           fi
 
-      - name: Print ccache stats
-        if: always()
+      - name: ccache stats post
         run: |
-          ccache -s -vv
+          ccache -s
 
       - name: Upload Unit Test Results
         if: always() && steps.twister.outputs.report_needed != 0
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: Unit Test Results (Subset ${{ matrix.platform }})
           path: twister-out/twister.xml
@@ -133,11 +129,11 @@ jobs:
   clang-build-results:
     name: "Publish Unit Tests Results"
     needs: clang-build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     if: (success() || failure() ) && needs.clang-build.outputs.report_needed != 0
     steps:
       - name: Download Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           path: artifacts
       - name: Merge Test Results
@@ -148,7 +144,7 @@ jobs:
 
       - name: Upload Unit Test Results in HTML
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: HTML Unit Test Results
           if-no-files-found: ignore
@@ -156,9 +152,10 @@ jobs:
             junit-clang.html
 
       - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
+        uses: EnricoMi/publish-unit-test-result-action@v1
         if: always()
         with:
           check_name: Unit Test Results
+          github_token: ${{ secrets.GITHUB_TOKEN }}
           files: "**/twister.xml"
           comment_mode: off

.github/workflows/codecov.yaml

@@ -2,7 +2,7 @@ name: Code Coverage with codecov
 
 on:
   schedule:
-    - cron: '25 06,18 * * *'
+    - cron: '25 */3 * * 1-5'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
@@ -10,31 +10,18 @@ concurrency:
 
 jobs:
   codecov:
-    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.24.3
       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'
+        platform: ["native_posix", "qemu_x86", "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=*'
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0
     steps:
       - name: Apply container owner mismatch workaround
         run: |
@@ -44,12 +31,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,11 +38,11 @@ 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
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -70,30 +51,34 @@ jobs:
           west init -l . || true
           west update 1> west.update.log || west update 1> west.update-2.log
 
-      - name: Environment Setup
+      - name: Check Environment
         run: |
           cmake --version
           gcc --version
           ls -la
-
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
-      - name: Set up ccache
+      - 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/.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
+          test -d github/home/.ccache && mv github/home/.ccache /github/home/.ccache
+          ccache -M 10G -s
 
       - name: Run Tests with Twister (Push)
         continue-on-error: true
@@ -101,63 +86,54 @@ jobs:
           export ZEPHYR_BASE=${PWD}
           export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
           mkdir -p coverage/reports
-          pip3 install gcovr==6.0
-          ./scripts/twister -E ${{matrix.normalized}}-testplan.json
-          ls -la
-          ./scripts/twister \
-            -i --force-color -N -v --filter runnable -p ${{ matrix.platform }} --coverage \
-            -T tests --coverage-tool gcovr -xCONFIG_TEST_EXTRA_STACK_SIZE=4096 -e nano \
-            --timeout-multiplier 2
+          ./scripts/twister --force-color -N -v --filter runnable -p ${{ matrix.platform }} --coverage -T tests
 
-      - name: Print ccache stats
-        if: always()
+      - name: Generate Coverage Report
         run: |
-          ccache -s -vv
+          mv twister-out/coverage.info lcov.pre.info
+          lcov -q --remove lcov.pre.info mylib.c --remove lcov.pre.info tests/\* \
+            --remove lcov.pre.info samples/\* --remove lcov.pre.info ext/\* \
+            --remove lcov.pre.info *generated*  \
+            -o coverage/reports/${{ matrix.platform }}.info --rc lcov_branch_coverage=1
 
-      - name: Rename coverage files
-        if: always()
+      - name: ccache stats post
         run: |
-          mv twister-out/coverage.json coverage/reports/${{matrix.normalized}}.json
+          ccache -s
 
       - name: Upload Coverage Results
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: Coverage Data (Subset ${{ matrix.normalized }})
-          path: |
-            coverage/reports/${{ matrix.normalized }}.json
-            ${{ matrix.normalized }}-testplan.json
+          name: Coverage Data (Subset ${{ matrix.platform }})
+          path: coverage/reports/${{ matrix.platform }}.info
 
   codecov-results:
     name: "Publish Coverage Results"
     needs: codecov
-    runs-on: ubuntu-22.04
-    # the codecov job might be skipped, we don't need to run this job then
+    runs-on: ubuntu-20.04
+      # the codecov job might be skipped, we don't need to run this job then
     if: success() || failure()
 
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
-
       - name: Download Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           path: coverage/reports
 
       - name: Move coverage files
         run: |
-          ls -lRt  ./coverage/reports
-          mv ./coverage/reports/*/*testplan.json .
-          mv ./coverage/reports/*/coverage/reports/*.json ./coverage/reports
+          mv ./coverage/reports/*/*.info ./coverage/reports
           ls -la ./coverage/reports
 
       - name: Generate list of coverage files
         id: get-coverage-files
         shell: cmake -P {0}
         run: |
-          file(GLOB INPUT_FILES_LIST  "coverage/reports/*.json")
+          file(GLOB INPUT_FILES_LIST  "coverage/reports/*.info")
           set(MERGELIST "")
           set(FILELIST "")
           foreach(ITEM ${INPUT_FILES_LIST})
@@ -171,7 +147,7 @@ jobs:
           foreach(ITEM ${INPUT_FILES_LIST})
             get_filename_component(f ${ITEM} NAME)
             if(MERGELIST STREQUAL "")
-              set(MERGELIST "--add-tracefile ${f}")
+              set(MERGELIST "-a ${f}")
             else()
               set(MERGELIST "${MERGELIST} -a ${f}")
             endif()
@@ -181,49 +157,17 @@ jobs:
 
       - name: Merge coverage files
         run: |
-          pushd ./coverage/reports
-          pip3 install gcovr==6.0
-          gcovr ${{ steps.get-coverage-files.outputs.mergefiles }}  --merge-mode-functions=separate --json merged.json
-          gcovr ${{ steps.get-coverage-files.outputs.mergefiles }} --merge-mode-functions=separate --cobertura merged.xml
-          popd
-
-      - name: Get current date
-        id: run_date
-        run: |
-            echo "run_date=$(date --iso-8601=minutes)" >> "$GITHUB_OUTPUT"
-            echo "run_date_short=$(date +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
-            echo "run_date_year=$(date +'%Y')" >> "$GITHUB_OUTPUT"
-            echo "run_date_month=$(date +'%m')" >> "$GITHUB_OUTPUT"
-
-      - name: Generate Coverage Report
-        if: always()
-        run: |
-          pip install xlsxwriter ijson
-          python3 ./scripts/ci/coverage/coverage_analysis.py \
-            -t native_sim-testplan.json \
-            -m MAINTAINERS.yml \
-            -c coverage/reports/merged.json \
-            -o coverage-report-${{ steps.run_date.outputs.run_date_short }} \
-            -f all
-          cp coverage-report-* coverage/reports/
-
-      - name: Upload Merged Coverage Results and Report
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Coverage Data and report
-          path: |
-            coverage/reports/merged.json
-            coverage/reports/merged.xml
-            coverage/reports/coverage-report-${{ steps.run_date.outputs.run_date_short }}.json
-            coverage/reports/coverage-report-${{ steps.run_date.outputs.run_date_short }}.xlsx
+          sudo apt-get update
+          sudo apt-get install -y lcov
+          cd ./coverage/reports
+          lcov ${{ steps.get-coverage-files.outputs.mergefiles }} -o merged.info --rc lcov_branch_coverage=1
 
       - name: Upload coverage to Codecov
         if: always()
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v3
         with:
+          directory: ./coverage/reports
           env_vars: OS,PYTHON
           fail_ci_if_error: false
           verbose: true
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: coverage/reports/merged.xml
+          files: merged.info

.github/workflows/coding_guidelines.yml

@@ -4,20 +4,20 @@ on: pull_request
 
 jobs:
   compliance_job:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     name: Run coding guidelines checks on patch series (PR)
     steps:
     - name: Checkout the code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
 
     - name: cache-pip
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('.github/workflows/coding_guidelines.yml') }}
+        key: ${{ runner.os }}-doc-pip
 
     - name: Install python dependencies
       run: |
@@ -28,7 +28,9 @@ jobs:
     - name: Install Packages
       run: |
         sudo apt-get update
-        sudo apt-get install coccinelle
+        sudo apt-get install ocaml-base-nox
+        wget https://launchpad.net/~npalix/+archive/ubuntu/coccinelle/+files/coccinelle_1.0.8~20.04npalix1_amd64.deb
+        sudo dpkg -i coccinelle_1.0.8~20.04npalix1_amd64.deb
 
     - name: Run Coding Guildeines Checks
       continue-on-error: true

.github/workflows/compliance.yml

@@ -1,16 +1,26 @@
 name: Compliance Checks
 
-on:
-  pull_request:
-    types:
-    - edited
-    - opened
-    - reopened
-    - synchronize
+on: pull_request
 
 jobs:
+  maintainer_check:
+    runs-on: ubuntu-20.04
+    name: Check MAINTAINERS file
+    steps:
+    - name: Checkout the code
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+        fetch-depth: 0
+    - name: Run Maintainers Script
+      id: maintainer
+      env:
+        BASE_REF: ${{ github.base_ref }}
+      run: |
+        python3 ./scripts/get_maintainer.py path CMakeLists.txt
+
   check_compliance:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     name: Run compliance checks on patch series (PR)
     steps:
     - name: Update PATH for west
@@ -18,27 +28,22 @@ jobs:
         echo "$HOME/.local/bin" >> $GITHUB_PATH
 
     - name: Checkout the code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 0
 
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.11
-
     - name: cache-pip
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('.github/workflows/compliance.yml') }}
+        key: ${{ runner.os }}-doc-pip
 
     - name: Install python dependencies
       run: |
         pip3 install setuptools
         pip3 install wheel
-        pip3 install python-magic lxml junitparser gitlint pylint pykwalify yamllint
+        pip3 install python-magic junitparser gitlint pylint pykwalify
         pip3 install west
 
     - name: west setup
@@ -48,23 +53,11 @@ jobs:
         git config --global user.email "you@example.com"
         git config --global user.name "Your Name"
         git remote -v
-        # Ensure there's no merge commits in the PR
-        [[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
-        (echo "::error ::Merge commits not allowed, rebase instead";false)
         git rebase origin/${BASE_REF}
         # debug
         git log  --pretty=oneline | head -n 10
         west init -l . || true
-        west config manifest.group-filter -- +ci,-optional
-        west update -o=--depth=1 -n 2>&1 1> west.update.log || west update -o=--depth=1 -n 2>&1 1> west.update2.log
-
-    - name: Check for PR description
-      if: ${{ github.event.pull_request.body == '' }}
-      continue-on-error: true
-      id: pr_description
-      run: |
-        echo "Pull request description cannot be empty."
-        exit 1
+        west update 2>&1 1> west.update.log || west update 2>&1 1> west.update2.log
 
     - name: Run Compliance Tests
       continue-on-error: true
@@ -76,14 +69,11 @@ jobs:
         # debug
         ls -la
         git log  --pretty=oneline | head -n 10
-        # Increase rename limit to allow for large PRs
-        git config diff.renameLimit 10000
-        ./scripts/ci/check_compliance.py --annotate -e KconfigBasic \
-        -c origin/${BASE_REF}..
+        ./scripts/ci/check_compliance.py -m Devicetree -m Gitlint -m Identity -m Nits -m pylint -m checkpatch -m Kconfig -c origin/${BASE_REF}..
 
     - name: upload-results
-      uses: actions/upload-artifact@v4
-      continue-on-error: true
+      uses: actions/upload-artifact@v3
+      continue-on-error: True
       with:
         name: compliance.xml
         path: compliance.xml
@@ -94,26 +84,17 @@ jobs:
           exit 1;
         fi
 
-        files=($(./scripts/ci/check_compliance.py -l))
-        for file in "${files[@]}"; do
-          f="${file}.txt"
-          if [[ -s $f ]]; then
-            errors=$(cat $f)
+        for file in Nits.txt checkpatch.txt Identity.txt Gitlint.txt pylint.txt Devicetree.txt Kconfig.txt; do
+          if [[ -s $file ]]; then
+            errors=$(cat $file)
             errors="${errors//'%'/'%25'}"
             errors="${errors//$'\n'/'%0A'}"
             errors="${errors//$'\r'/'%0D'}"
-            echo "::error file=${f}::$errors"
+            echo "::error file=${file}::$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

@@ -5,19 +5,19 @@ name: Publish commit for daily testing
 
 on:
   schedule:
-  - cron: '50 22 * * *'
+    - cron:  '50 22 * * *'
   push:
     branches:
-    - refs/tags/*
+      - refs/tags/*
 
 jobs:
   get_version:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
 
     steps:
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@v2
       with:
         aws-access-key-id: ${{ vars.AWS_TESTING_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_TESTING_SECRET_ACCESS_KEY }}
@@ -28,7 +28,7 @@ jobs:
         pip3 install gitpython
 
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
 

.github/workflows/devicetree_checks.yml

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

.github/workflows/do_not_merge.yml

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

.github/workflows/doc-build.yml

@@ -10,119 +10,67 @@ on:
     tags:
     - v*
   pull_request:
+    paths:
+    - 'doc/**'
+    - '**.rst'
+    - 'include/**'
+    - 'kernel/include/kernel_arch_interface.h'
+    - 'lib/libc/**'
+    - 'subsys/testsuite/ztest/include/**'
+    - 'tests/**'
+    - '**/Kconfig*'
+    - 'west.yml'
+    - '.github/workflows/doc-build.yml'
+    - 'scripts/dts/**'
+    - 'scripts/requirements-doc.txt'
 
 env:
   # NOTE: west docstrings will be extracted from the version listed here
-  WEST_VERSION: 1.2.0
+  WEST_VERSION: 0.14.0
   # The latest CMake available directly with apt is 3.18, but we need >=3.20
   # so we fetch that through pip.
   CMAKE_VERSION: 3.20.5
-  DOXYGEN_VERSION: 1.9.6
-  # 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.4
 
 jobs:
-  doc-file-check:
-    name: Check for doc changes
-    runs-on: ubuntu-22.04
-    if: >
-      github.repository_owner == 'zephyrproject-rtos'
-    outputs:
-      file_check: ${{ steps.check-doc-files.outputs.any_changed }}
-    steps:
-    - name: checkout
-      uses: actions/checkout@v4
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-        fetch-depth: 0
-    - name: Check if Documentation related files changed
-      uses: tj-actions/changed-files@v44
-      id: check-doc-files
-      with:
-        files: |
-          doc/
-          **.rst
-          include/
-          kernel/include/kernel_arch_interface.h
-          lib/libc/**
-          subsys/testsuite/ztest/include/**
-          tests/
-          **/Kconfig*
-          west.yml
-          scripts/dts/
-          doc/requirements.txt
-          .github/workflows/doc-build.yml
-          scripts/pylib/pytest-twister-harness/src/twister_harness/device/device_adapter.py
-          scripts/pylib/pytest-twister-harness/src/twister_harness/helpers/shell.py
-
   doc-build-html:
     name: "Documentation Build (HTML)"
-    needs: [doc-file-check]
-    if: >
-      github.repository_owner == 'zephyrproject-rtos' &&
-        ( needs.doc-file-check.outputs.file_check == 'true' || github.event_name != 'pull_request' )
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
-    timeout-minutes: 90
+    runs-on: ubuntu-20.04
+    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: checkout
+      uses: actions/checkout@v3
 
     - 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:
-        ref: ${{ github.event.pull_request.head.sha }}
-        fetch-depth: 0
-
-    - name: Rebase
-      if: github.event_name == 'pull_request'
-      continue-on-error: true
-      env:
-        BASE_REF: ${{ github.base_ref }}
-        PR_HEAD: ${{ github.event.pull_request.head.sha }}
-      run: |
-        git config --global user.email "actions@zephyrproject.org"
-        git config --global user.name "Github Actions"
-        git rebase origin/${BASE_REF}
-        git log --graph --oneline HEAD...${PR_HEAD}
+        sudo apt-get install -y ninja-build graphviz libclang1-9 libclang-cpp9
+        wget --no-verbose https://downloads.sourceforge.net/project/doxygen/rel-${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
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
-        key: pip-${{ hashFiles('doc/requirements.txt') }}
+        key: pip-${{ hashFiles('scripts/requirements-doc.txt') }}
 
     - name: install-pip
       run: |
         sudo pip3 install -U setuptools wheel pip
-        pip3 install -r doc/requirements.txt
+        pip3 install -r scripts/requirements-doc.txt
         pip3 install west==${WEST_VERSION}
         pip3 install cmake==${CMAKE_VERSION}
-        pip3 install coverxygen
 
     - name: west setup
       run: |
         west init -l .
 
     - name: build-docs
-      shell: bash
       run: |
         if [[ "$GITHUB_REF" =~ "refs/tags/v" ]]; then
           DOC_TAG="release"
@@ -136,51 +84,30 @@ jobs:
           DOC_TARGET="html"
         fi
 
-        DOC_TAG=${DOC_TAG} \
-        SPHINXOPTS="-j ${JOB_COUNT} -W --keep-going -T" \
-        SPHINXOPTS_EXTRA="-q -t publish" \
-        make -C doc ${DOC_TARGET}
-
-        # API documentation coverage
-        python3 -m coverxygen --xml-dir  doc/_build/html/doxygen/xml/ --src-dir include/ --output doc-coverage.info
-        # deprecated page causing issues
-        lcov --remove doc-coverage.info \*/deprecated > new.info
-        genhtml --no-function-coverage --no-branch-coverage new.info -o coverage-report
+        DOC_TAG=${DOC_TAG} SPHINXOPTS="-q -W -t publish" make -C doc ${DOC_TARGET}
 
     - name: compress-docs
       run: |
         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
+      uses: actions/upload-artifact@v3
       with:
         name: html-output
         path: html-output.tar.xz
 
-    - name: upload-api-coverage
-      uses: actions/upload-artifact@v4
-      with:
-        name: api-coverage
-        path: api-coverage.tar.xz
-
     - name: process-pr
       if: github.event_name == 'pull_request'
       run: |
         REPO_NAME="${{ github.event.repository.name }}"
         PR_NUM="${{ github.event.pull_request.number }}"
         DOC_URL="https://builds.zephyrproject.io/${REPO_NAME}/pr/${PR_NUM}/docs/"
-        API_DOC_URL="https://builds.zephyrproject.io/${REPO_NAME}/pr/${PR_NUM}/docs/doxygen/html/"
-        API_COVERAGE_URL="https://builds.zephyrproject.io/${REPO_NAME}/pr/${PR_NUM}/api-coverage/"
 
         echo "${PR_NUM}" > pr_num
         echo "Documentation will be available shortly at: ${DOC_URL}" >> $GITHUB_STEP_SUMMARY
-        echo "API Documentation will be available shortly at: ${API_DOC_URL}" >> $GITHUB_STEP_SUMMARY
-        echo "API Coverage Report will be available shortly at: ${API_COVERAGE_URL}" >> $GITHUB_STEP_SUMMARY
 
     - name: upload-pr-number
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       if: github.event_name == 'pull_request'
       with:
         name: pr_num
@@ -188,42 +115,27 @@ 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: ubuntu-20.04
     container: texlive/texlive:latest
-    timeout-minutes: 120
+    timeout-minutes: 45
     concurrency:
       group: doc-build-pdf-${{ github.ref }}
       cancel-in-progress: true
 
     steps:
-    - name: Apply container owner mismatch workaround
-      run: |
-        git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-    - name: Print cloud service information
-      run: |
-        echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
-        echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
-        echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
-
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
 
     - name: install-pkgs
       run: |
         apt-get update
-        apt-get install -y python3-pip python3-venv ninja-build doxygen graphviz librsvg2-bin imagemagick
+        apt-get install -y python3-pip python3-venv ninja-build doxygen graphviz librsvg2-bin
 
     - name: cache-pip
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
-        key: pip-${{ hashFiles('doc/requirements.txt') }}
+        key: pip-${{ hashFiles('scripts/requirements-doc.txt') }}
 
     - name: setup-venv
       run: |
@@ -234,7 +146,7 @@ jobs:
     - name: install-pip
       run: |
         pip3 install -U setuptools wheel pip
-        pip3 install -r doc/requirements.txt
+        pip3 install -r scripts/requirements-doc.txt
         pip3 install west==${WEST_VERSION}
         pip3 install cmake==${CMAKE_VERSION}
 
@@ -243,8 +155,6 @@ jobs:
         west init -l .
 
     - name: build-docs
-      shell: bash
-      continue-on-error: true
       run: |
         if [[ "$GITHUB_REF" =~ "refs/tags/v" ]]; then
           DOC_TAG="release"
@@ -252,28 +162,10 @@ jobs:
           DOC_TAG="development"
         fi
 
-        DOC_TAG=${DOC_TAG} \
-        SPHINXOPTS="-q -j ${JOB_COUNT}" \
-        LATEXMKOPTS="-quiet -halt-on-error" \
-        make -C doc pdf
+        DOC_TAG=${DOC_TAG} SPHINXOPTS="-q -j auto" LATEXMKOPTS="-quiet -halt-on-error" make -C doc pdf
 
     - name: upload-build
-      if: always()
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: pdf-output
-        if-no-files-found: ignore
-        path: |
-          doc/_build/latex/zephyr.pdf
-          doc/_build/latex/zephyr.log
-
-  doc-build-status-check:
-    if: always()
-    name: "Documentation Build Status"
-    needs:
-    - doc-build-pdf
-    - doc-file-check
-    - doc-build-html
-    uses: ./.github/workflows/ready-to-merge.yml
-    with:
-      needs_context: ${{ toJson(needs) }}
+        path: doc/_build/latex/zephyr.pdf

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

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

.github/workflows/doc-publish.yml

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

.github/workflows/errno.yml

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

.github/workflows/footprint-tracking.yml

@@ -8,9 +8,6 @@ on:
     paths:
       - 'VERSION'
       - '.github/workflows/footprint-tracking.yml'
-    branches:
-      - main
-      - v*-branch
     tags:
       # only publish v* tags, do not care about zephyr-v* which point to the
       # same commit
@@ -22,15 +19,15 @@ concurrency:
 
 jobs:
   footprint-tracking:
-    runs-on:
-      group: zephyr-runner-v2-linux-x64-4xlarge
-    if: github.repository_owner == 'zephyrproject-rtos'
+    runs-on: ubuntu-20.04
+    if: github.repository == 'zephyrproject-rtos/zephyr'
     container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.26.13.20240601
+      image: ghcr.io/zephyrproject-rtos/ci:v0.24.3
       options: '--entrypoint /bin/bash'
     strategy:
       fail-fast: false
     env:
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0
       ZEPHYR_TOOLCHAIN_VARIANT: zephyr
     steps:
       - name: Apply container owner mismatch workaround
@@ -41,32 +38,19 @@ 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
-
-      - name: Install packages
+      - name: Install pip packages
         run: |
-          sudo apt-get update
-          sudo apt-get install -y python3-venv
           sudo pip3 install -U setuptools wheel pip gitpython
 
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
 
-      - name: Environment Setup
-        run: |
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
       - name: west setup
         run: |
           west init -l . || true
@@ -74,7 +58,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 }}
@@ -86,10 +70,4 @@ jobs:
         run: |
           export ZEPHYR_BASE=${PWD}
           ./scripts/footprint/track.py  -p scripts/footprint/plan.txt
-
-      - name: Upload footprint data
-        run: |
-          python3 -m venv .venv
-          . .venv/bin/activate
-          pip3 install awscli
           aws s3 sync  --quiet footprint_data/ s3://testing.zephyrproject.org/footprint_data/

.github/workflows/footprint.yml

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

.github/workflows/greet_first_time_contributor.yml

@@ -1,58 +0,0 @@
-name: Greet first time contributor
-
-on:
-  issues:
-    types: [opened]
-  pull_request_target:
-    types: [opened, closed]
-
-jobs:
-  check_for_first_interaction:
-    runs-on: ubuntu-22.04
-    if: github.repository == 'zephyrproject-rtos/zephyr'
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: zephyrproject-rtos/action-first-interaction@v1.1.1-zephyr-5
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-          issue-message: >
-            Hi @${{github.event.issue.user.login}}! We appreciate you submitting your first issue
-            for our open-source project. 🌟
-
-
-            Even though I'm a bot, I can assure you that the whole community is genuinely grateful
-            for your time and effort. 🤖💙
-
-          pr-opened-message: >
-            Hello @${{ github.event.pull_request.user.login }}, and thank you very much for your
-            first pull request to the Zephyr project!
-
-            Our Continuous Integration pipeline will execute a series of checks on your Pull Request
-            commit messages and code, and you are expected to address any failures by updating the PR.
-            Please take a look at [our commit message guidelines](https://docs.zephyrproject.org/latest/contribute/guidelines.html#commit-message-guidelines)
-            to find out how to format your commit messages, and at [our contribution workflow](https://docs.zephyrproject.org/latest/contribute/guidelines.html#contribution-workflow)
-            to understand how to update your Pull Request.
-            If you haven't already, please make sure to review the project's [Contributor
-            Expectations](https://docs.zephyrproject.org/latest/contribute/contributor_expectations.html)
-            and update (by amending and force-pushing the commits) your pull request if necessary.
-
-            If you are stuck or need help please join us on [Discord](https://chat.zephyrproject.org/)
-            and ask your question there. Additionally, you can [escalate the review](https://docs.zephyrproject.org/latest/contribute/contributor_expectations.html#pr-review-escalation)
-            when applicable. 😊
-
-          pr-merged-message: >
-            Hi @${{ github.event.pull_request.user.login }}!
-
-            Congratulations on getting your very first Zephyr pull request merged 🎉🥳. This is a
-            fantastic achievement, and we're thrilled to have you as part of our community!
-
-
-            To celebrate this milestone and showcase your contribution, we'd love to award you the
-            Zephyr Technical Contributor badge. If you're interested, please claim your badge by
-            filling out this form: [Claim Your Zephyr Badge](https://forms.gle/oCw9iAPLhUsHTapc8).
-
-
-            Thank you for your valuable input, and we look forward to seeing more of your
-            contributions in the future! 🪁

.github/workflows/hello_world_multiplatform.yaml

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

.github/workflows/issue_count.yml

@@ -2,7 +2,7 @@ name: Issue Tracker
 
 on:
   schedule:
-  - cron: '*/10 * * * *'
+    - cron:  '*/10 * * * *'
 
 env:
   OUTPUT_FILE_NAME: IssuesReport.md
@@ -14,7 +14,7 @@ env:
 jobs:
   track-issues:
     name: "Collect Issue Stats"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
 
     steps:
@@ -27,7 +27,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install discount
 
-    - uses: brcrista/summarize-issues@v4
+    - uses: brcrista/summarize-issues@v3
       with:
         title: 'Issues Report for ${{ github.repository }}'
         configPath: 'issues-report-config.json'
@@ -35,14 +35,14 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: upload-stats
-      uses: actions/upload-artifact@v4
-      continue-on-error: true
+      uses: actions/upload-artifact@v3
+      continue-on-error: True
       with:
         name: ${{ env.OUTPUT_FILE_NAME }}
         path: ${{ env.OUTPUT_FILE_NAME }}
 
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@v2
       with:
         aws-access-key-id: ${{ vars.AWS_TESTING_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_TESTING_SECRET_ACCESS_KEY }}

.github/workflows/license_check.yml

@@ -4,20 +4,18 @@ on: [pull_request]
 
 jobs:
   scancode_job:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     name: Scan code for licenses
     steps:
     - name: Checkout the code
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
+      uses: actions/checkout@v1
     - name: Scan the code
       id: scancode
       uses: zephyrproject-rtos/action_scancode@v4
       with:
         directory-to-scan: 'scan/'
     - name: Artifact Upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: scancode
         path: ./artifacts

.github/workflows/manifest.yml

@@ -8,31 +8,20 @@ jobs:
     name: Manifest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           path: zephyrproject/zephyr
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
           persist-credentials: false
 
-      - name: west setup
-        env:
-          BASE_REF: ${{ github.base_ref }}
-        working-directory: zephyrproject/zephyr
-        run: |
-          pip3 install west
-          git config --global user.email "you@example.com"
-          git config --global user.name "Your Name"
-          west init -l . || true
-
       - name: Manifest
-        uses: zephyrproject-rtos/action-manifest@v1.2.2
+        uses: zephyrproject-rtos/action-manifest@f54422ea250adb7cc1b9f62bfe125978bb2c58ee
         with:
           github-token: ${{ secrets.ZB_GITHUB_TOKEN }}
           manifest-path: 'west.yml'
           checkout-path: 'zephyrproject/zephyr'
-          use-tree-checkout: 'true'
           label-prefix: 'manifest-'
           verbosity-level: '1'
-          labels: 'manifest'
+          labels: 'manifest, west'
           dnm-labels: 'DNM'

.github/workflows/pylib_tests.yml

@@ -1,54 +0,0 @@
-# Copyright (c) 2023 Intel Corporation.
-# SPDX-License-Identifier: Apache-2.0
-
-name: Misc. Pylib Scripts TestSuite
-
-on:
-  push:
-    branches:
-    - main
-    - v*-branch
-    paths:
-    - 'scripts/pylib/build_helpers/**'
-    - '.github/workflows/pylib_tests.yml'
-  pull_request:
-    branches:
-    - main
-    - v*-branch
-    paths:
-    - 'scripts/pylib/build_helpers/**'
-    - '.github/workflows/pylib_tests.yml'
-
-jobs:
-  pylib-tests:
-    name: Misc. Pylib Unit Tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        python-version: ['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
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: cache-pip-linux
-      if: startsWith(runner.os, 'Linux')
-      uses: actions/cache@v4
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ matrix.python-version }}
-        restore-keys: |
-          ${{ runner.os }}-pip-${{ matrix.python-version }}
-    - name: install-packages
-      run: |
-        pip3 install -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt
-    - name: Run pytest for build_helpers
-      env:
-        ZEPHYR_BASE: ./
-        ZEPHYR_TOOLCHAIN_VARIANT: zephyr
-      run: |
-        echo "Run build_helpers tests"
-        PYTHONPATH=./scripts/tests pytest ./scripts/tests/build_helpers

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

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

.github/workflows/release.yml

@@ -4,13 +4,12 @@ on:
   push:
     tags:
       - 'v*'
-      - '!v*rc*'
 
 jobs:
   release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -18,7 +17,6 @@ jobs:
         id: get_version
         run: |
           echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-          echo "TRIMMED_VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
 
       - name: REUSE Compliance Check
         uses: fsfe/reuse-action@v1
@@ -26,15 +24,19 @@ jobs:
           args: spdx -o zephyr-${{ steps.get_version.outputs.VERSION }}.spdx
 
       - name: upload-results
-        uses: actions/upload-artifact@v4
-        continue-on-error: true
+        uses: actions/upload-artifact@v3
+        continue-on-error: True
         with:
           name: zephyr-${{ steps.get_version.outputs.VERSION }}.spdx
           path: zephyr-${{ steps.get_version.outputs.VERSION }}.spdx
 
-      - name: Create empty release notes body
+      - name: Get Diff since last tag
         run: |
-          echo "TODO: add release overview and notes link" > release-notes.txt
+          oldtag=$(git describe --abbrev=0 ${{ github.ref }}^)
+          echo "Changes since ${oldtag}:" > release-notes.txt
+          echo "" >> release-notes.txt
+          echo "" >> release-notes.txt
+          git shortlog ${oldtag}..${{ github.ref }} >> release-notes.txt
 
       - name: Create Release
         id: create_release
@@ -43,7 +45,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
-          release_name: Zephyr ${{ steps.get_version.outputs.TRIMMED_VERSION }}
+          release_name: Zephyr ${{ github.ref }}
           body_path: release-notes.txt
           draft: true
           prerelease: true

.github/workflows/scripts_tests.yml

@@ -1,71 +0,0 @@
-# Copyright 2023 Google LLC
-# SPDX-License-Identifier: Apache-2.0
-
-name: Scripts tests
-
-on:
-  push:
-    branches:
-      - main
-      - v*-branch
-    paths:
-      - 'scripts/build/**'
-      - '.github/workflows/scripts_tests.yml'
-  pull_request:
-    branches:
-      - main
-      - v*-branch
-    paths:
-      - 'scripts/build/**'
-      - '.github/workflows/scripts_tests.yml'
-
-jobs:
-  scripts-tests:
-    name: Scripts tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        python-version: ['3.10', '3.11', '3.12']
-        os: [ubuntu-20.04]
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0
-
-      - name: Rebase
-        continue-on-error: true
-        env:
-          BASE_REF: ${{ github.base_ref }}
-          PR_HEAD: ${{ github.event.pull_request.head.sha }}
-        run: |
-          git config --global user.email "actions@zephyrproject.org"
-          git config --global user.name "Github Actions"
-          git rebase origin/${BASE_REF}
-          git log --graph --oneline HEAD...${PR_HEAD}
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: cache-pip-linux
-        if: startsWith(runner.os, 'Linux')
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ matrix.python-version }}
-          restore-keys: |
-            ${{ runner.os }}-pip-${{ matrix.python-version }}
-
-      - name: install-packages
-        run: |
-          pip3 install -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt
-
-      - name: Run pytest
-        env:
-          ZEPHYR_BASE: ./
-        run: |
-          echo "Run script tests"
-          pytest ./scripts/build

.github/workflows/stale-workflow-queue-cleanup.yml

@@ -1,28 +0,0 @@
-name: Stale Workflow Queue Cleanup
-
-on:
-  workflow_dispatch:
-    branches: [main]
-  schedule:
-  # everyday at 15:00
-  - cron: '0 15 * * *'
-
-concurrency:
-  group: stale-workflow-queue-cleanup
-  cancel-in-progress: true
-
-jobs:
-  cleanup:
-    name: Cleanup
-    runs-on: ubuntu-22.04
-
-    steps:
-    - name: Delete stale queued workflow runs
-      uses: MajorScruffy/delete-old-workflow-runs@v0.3.0
-      with:
-        repository: ${{ github.repository }}
-        # Remove any workflow runs in "queued" state for more than 1 day
-        older-than-seconds: 86400
-        status: queued
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/stale_issue.yml

@@ -6,23 +6,18 @@ on:
 jobs:
   stale:
     name: Find Stale issues and PRs
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     if: github.repository == 'zephyrproject-rtos/zephyr'
     steps:
-    - uses: actions/stale@v8
+    - uses: actions/stale@v3
       with:
-        stale-pr-message: 'This pull request has been marked as stale because it has been open (more
-          than) 60 days with no activity. Remove the stale label or add a comment saying that you
-          would like to have the label removed otherwise this pull request will automatically be
-          closed in 14 days. Note, that you can always re-open a closed pull request at any time.'
-        stale-issue-message: 'This issue has been marked as stale because it has been open (more
-          than) 60 days with no activity. Remove the stale label or add a comment saying that you
-          would like to have the label removed otherwise this issue will automatically be closed in
-          14 days. Note, that you can always re-open a closed issue at any time.'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-pr-message: 'This pull request has been marked as stale because it has been open (more than) 60 days with no activity. Remove the stale label or add a comment saying that you would like to have the label removed otherwise this pull request will automatically be closed in 14 days. Note, that you can always re-open a closed pull request at any time.'
+        stale-issue-message: 'This issue has been marked as stale because it has been open (more than) 60 days with no activity. Remove the stale label or add a comment saying that you would like to have the label removed otherwise this issue will automatically be closed in 14 days. Note, that you can always re-open a closed issue at any time.'
         days-before-stale: 60
         days-before-close: 14
         stale-issue-label: 'Stale'
         stale-pr-label: 'Stale'
         exempt-pr-labels: 'Blocked,In progress'
-        exempt-issue-labels: 'In progress,Enhancement,Feature,Feature Request,RFC,Meta,Process,Coverity'
+        exempt-issue-labels: 'In progress,Enhancement,Feature,Feature Request,RFC,Meta,Process'
         operations-per-run: 400

.github/workflows/stats_merged_prs.yml

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

.github/workflows/twister.yaml

@@ -5,15 +5,13 @@ on:
     branches:
       - main
       - v*-branch
-      - collab-*
   pull_request_target:
     branches:
       - main
       - v*-branch
-      - collab-*
   schedule:
-    # Run at 03:00 UTC on every Sunday
-    - cron: '0 3 * * 0'
+    # Run at 00:00 on Wednesday and Saturday
+    - cron: '0 0 * * 3,6'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
@@ -21,22 +19,21 @@ 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.13.20240601
+      image: ghcr.io/zephyrproject-rtos/ci:v0.24.3
       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
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0
       TESTS_PER_BUILDER: 700
       COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
       BASE_REF: ${{ github.base_ref }}
@@ -49,22 +46,16 @@ 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
         if: github.event_name == 'pull_request_target'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
@@ -79,13 +70,11 @@ jobs:
           git rebase origin/${BASE_REF}
           git log  --pretty=oneline | head -n 10
           west init -l . || true
-          west config manifest.group-filter -- +ci,+optional
+          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: Generate Test Plan with Twister
         if: github.event_name == 'pull_request_target'
         id: test-plan
@@ -124,39 +113,27 @@ 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.13.20240601
+      image: ghcr.io/zephyrproject-rtos/ci:v0.24.3
       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 '
-      DAILY_OPTIONS: ' -M --build-only --all --show-footprint'
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0
+      TWISTER_COMMON: ' --force-color --inline-logs -v -N -M --retry-failed 3 '
+      DAILY_OPTIONS: ' -M --build-only --all'
       PR_OPTIONS: ' --clobber-output --integration'
-      PUSH_OPTIONS: ' --clobber-output -M --show-footprint'
+      PUSH_OPTIONS: ' --clobber-output -M'
       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,11 +145,11 @@ 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
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
@@ -190,13 +167,10 @@ jobs:
           echo "$HOME/.local/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'
 
-          echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
       - name: Check Environment
         run: |
           cmake --version
@@ -206,22 +180,31 @@ jobs:
           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/.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
+          test -d github/home/.ccache && rm -rf /github/home/.ccache && mv github/home/.ccache /github/home/.ccache
+          ccache -M 10G -s
 
       - if: github.event_name == 'push'
         name: Run Tests with Twister (Push)
@@ -264,79 +247,34 @@ jobs:
             fi
           fi
 
-      - name: Print ccache stats
-        if: always()
+      - name: ccache stats post
         run: |
-          ccache -s -vv
+          ccache -s
 
       - name: Upload Unit Test Results
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: Unit Test Results (Subset ${{ matrix.subset }})
           if-no-files-found: ignore
           path: |
             twister-out/twister.xml
-            twister-out/twister.json
             module_tests/twister.xml
             testplan.json
 
-      - if: matrix.subset == 1 && github.event_name == 'push'
-        name: Save the list of Python packages
-        shell: bash
-        run: |
-          FREEZE_FILE="frozen-requirements.txt"
-          timestamp="$(date)"
-          version="$(git describe --abbrev=12 --always)"
-          echo -e "# Generated at $timestamp ($version)\n" > $FREEZE_FILE
-          pip3 freeze | tee -a $FREEZE_FILE
-
-      - if: matrix.subset == 1 && github.event_name == 'push'
-        name: Upload the list of Python packages
-        uses: actions/upload-artifact@v4
-        with:
-          name: Frozen PIP package set
-          path: |
-            frozen-requirements.txt
-
   twister-test-results:
     name: "Publish Unit Tests Results"
-    env:
-      ELASTICSEARCH_KEY: ${{ secrets.ELASTICSEARCH_KEY }}
-      ELASTICSEARCH_SERVER: "https://elasticsearch.zephyrproject.io:443"
     needs: twister-build
-    runs-on: ubuntu-22.04
-    # the build-and-test job might be skipped, we don't need to run this job then
+    runs-on: ubuntu-20.04
+      # the build-and-test job might be skipped, we don't need to run this job then
     if: success() || failure()
 
     steps:
-      # Needed for opensearch and upload script
-      - if: github.event_name == 'push' || github.event_name == 'schedule'
-        name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-
       - name: Download Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           path: artifacts
 
-      - if: github.event_name == 'push' || github.event_name == 'schedule'
-        name: Upload to opensearch
-        run: |
-          pip3 install elasticsearch
-          # set run date on upload to get consistent and unified data across the matrix.
-          run_date=`date --iso-8601=minutes`
-          if [ "${{github.event_name}}" = "push" ]; then
-            python3 ./scripts/ci/upload_test_results_es.py -r ${run_date} \
-              --index zephyr-main-ci-push-1 artifacts/*/*/twister.json
-          elif [ "${{github.event_name}}" = "schedule" ]; then
-            python3 ./scripts/ci/upload_test_results_es.py -r ${run_date} \
-              --index zephyr-main-ci-weekly-1 artifacts/*/*/twister.json
-          fi
-
       - name: Merge Test Results
         run: |
           pip3 install junitparser junit2html
@@ -345,7 +283,7 @@ jobs:
 
       - name: Upload Unit Test Results in HTML
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: HTML Unit Test Results
           if-no-files-found: ignore
@@ -353,17 +291,9 @@ jobs:
             junit.html
 
       - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
+        uses: EnricoMi/publish-unit-test-result-action@v1
         with:
           check_name: Unit Test Results
+          github_token: ${{ secrets.GITHUB_TOKEN }}
           files: "**/twister.xml"
           comment_mode: off
-  twister-status-check:
-    if: always()
-    name: "Check Twister Status"
-    needs:
-      - twister-build-prep
-      - twister-build
-    uses: ./.github/workflows/ready-to-merge.yml
-    with:
-      needs_context: ${{ toJson(needs) }}

.github/workflows/twister_tests.yml

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

.github/workflows/twister_tests_blackbox.yml

@@ -1,77 +0,0 @@
-# Copyright (c) 2023 Intel Corporation.
-# SPDX-License-Identifier: Apache-2.0
-
-name: Twister BlackBox TestSuite
-
-on:
-  pull_request:
-    branches:
-    - main
-    - collab-*
-    - v*-branch
-    paths:
-    - 'scripts/pylib/twister/**'
-    - 'scripts/twister'
-    - 'scripts/tests/twister_blackbox/**'
-    - '.github/workflows/twister_tests_blackbox.yml'
-
-jobs:
-  twister-tests:
-    name: Twister Black Box Tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        python-version: ['3.10', '3.11', '3.12']
-        os: [ubuntu-22.04]
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci:v0.26.13
-
-    steps:
-    - name: Apply Container Owner Mismatch Workaround
-      run: |
-        # FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
-        #        match the container user UID because of the way GitHub
-        #        Actions runner is implemented. Remove this workaround when
-        #        GitHub comes up with a fundamental fix for this problem.
-        git config --global --add safe.directory ${GITHUB_WORKSPACE}
-
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Environment Setup
-      run: |
-        echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-        west init -l . || true
-        west config --global update.narrow true
-        west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
-        west forall -c 'git reset --hard HEAD'
-
-        echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
-
-    - name: Set Up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Go Into Venv
-      shell: bash
-      run: |
-        python3 -m pip install --user virtualenv
-        python3 -m venv env
-        source env/bin/activate
-        echo "$(which python)"
-
-    - name: Install Packages
-      run: |
-        python3 -m pip install -U -r scripts/requirements-base.txt -r scripts/requirements-build-test.txt -r scripts/requirements-run-test.txt
-
-    - name: Run Pytest For Twister Black Box Tests
-      shell: bash
-      env:
-        ZEPHYR_BASE: ./
-        ZEPHYR_TOOLCHAIN_VARIANT: zephyr
-      run: |
-        echo "Run twister tests"
-        source zephyr-env.sh
-        PYTHONPATH="./scripts/tests" pytest ./scripts/tests/twister_blackbox

.github/workflows/west_cmds.yml

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

.gitignore

@@ -7,15 +7,12 @@
 *.swp
 *.swo
 *~
-
-# Emacs
+.\#*
 \#*\#
-
 build*/
 !doc/build/
 !scripts/build
 !tests/drivers/build_all
-!scripts/pylib/build_helpers
 cscope.*
 .dir
 
@@ -29,8 +26,6 @@ outdir
 outdir-*
 scripts/basic/fixdep
 scripts/gen_idt/gen_idt
-coverage-report
-doc-coverage.info
 doc/_build
 doc/doxygen
 doc/xml
@@ -41,10 +36,7 @@ doc/latex
 doc/themes/zephyr-docs-theme
 sanity-out*
 twister-out*
-bsim_out
 bsim_bt_out
-myresults.xml
-tests/RunResults.xml
 scripts/grub
 doc/reference/kconfig/*.rst
 doc/doc.warnings
@@ -57,7 +49,6 @@ venv
 .venv
 .DS_Store
 .clangd
-new.info
 
 # CI output
 compliance.xml
@@ -71,23 +62,3 @@ TAGS
 tags
 
 .idea
-
-# from check_compliance.py
-BinaryFiles.txt
-BoardYml.txt
-Checkpatch.txt
-DevicetreeBindings.txt
-GitDiffCheck.txt
-Gitlint.txt
-Identity.txt
-ImageSize.txt
-Kconfig.txt
-KconfigBasic.txt
-KconfigBasicNoModules.txt
-KconfigHWMv2.txt
-KeepSorted.txt
-MaintainersFormat.txt
-ModulesMaintainers.txt
-Nits.txt
-Pylint.txt
-YAMLLint.txt

.gitlint

@@ -1,5 +1,4 @@
 # All these sections are optional, edit this file as you like.
-# Zephyr-specific defaults are located in scripts/gitlint/zephyr_commit_rules.py
 [general]
 ignore=title-trailing-punctuation, T3, title-max-length, T1, body-hard-tab, B3, B1
 # verbosity should be a value between 1 and 3, the commandline -v flags take precedence over this
@@ -17,16 +16,16 @@ debug = false
 extra-path=scripts/gitlint
 
 [title-max-length-no-revert]
-# line-length=75
+line-length=75
 
 [body-min-line-count]
-# min-line-count=1
+min-line-count=1
 
 [body-max-line-count]
-# max-line-count=200
+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
@@ -43,7 +42,7 @@ words=wip
 
 [max-line-length-with-exceptions]
 # B1 = body-max-line-length
-# line-length=75
+line-length=75
 
 [body-min-length]
 min-length=3

.mailmap

@@ -1,121 +1,35 @@
-Alexandr Kolosov <rikorsev@gmail.com>
-Alexandre d'Alton <alexandre.dalton@intel.com>
+Dirk Brandewie <dirk.j.brandewie@intel.com> <dirk.j.brandewie@intel.com>
+Mike Hirst <michael.hirst@windriver.com> <michael.hirst@windriver.com>
+Johan Kruger <johan.kruger@windriver.com> <johan.kruger@windriver.com>
+Leona Cook <leonax.cook@intel.com> <lsc@hackeress.com>
+Leona Cook <leonax.cook@intel.com> <leonax.cook@intel.com>
+Thomas Heeley <thomas.heeley@intel.com> <thomas.heeley@intel.com>
+Shuang He <shuang.he@intel.com> <shuang.he@intel.com>
+Chuck Jordan <cjordan@synopsys.com> <cjordan@synopsys.com>
+Jeremie Garcia <jeremie.garcia@intel.com> <jeremie.garcia@intel.com>
+Bit Pathe <bitpathe@gmail.com> <bitpathe@gmail.com>
+Carles Cufi <carles.cufi@nordicsemi.no> <carles.cufi@nordicsemi.no>
+Kuo-Lang Tseng <kuo-lang.tseng@intel.com> <kuo-lang.tseng@intel.com>
+Gerardo Aceves <gerardo.aceves@intel.com> <gerardo.aceves@intel.com>
+Evan Couzens <evanx.couzens@intel.com> <evanx.couzens@intel.com>
+Lei Liu <lei.a.liu@intel.com> <lei.a.liu@intel.com>
+Douglas Su <d0u9.su@outlook.com> <d0u9.su@outlook.com>
+Keren Siman-Tov <keren.siman-tov@intel.com> <keren.siman-tov@intel.com>
+Naga Raja Rao Tulasi <tulasi.r@tcs.com> <tulasi.r@tcs.com>
+Felipe Neves <ryukokki.felipe@gmail.com> <ryukokki.felipe@gmail.com>
 Amir Kaplan <amir.kaplan@intel.com> <amir.kaplan@intel.com>
 Anas Nashif <anas.nashif@intel.com> <anas.nashif@intel.com>
-Andrzej Kuroś <andrzej.kuros@nordicsemi.no>
-Anthony Smigielski <thebasti0ncode@gmail.com>
-Armand Ciejak <armand@riedonetworks.com>  <armandciejak@users.noreply.github.com>
-Aska Wu <aska.wu@linaro.org>
-Bit Pathe <bitpathe@gmail.com> <bitpathe@gmail.com>
-Bjarki Arge Andreasen <baa@trackunit.com>
-Carles Cufi <carles.cufi@nordicsemi.no> <carles.cufi@nordicsemi.no>
-chao an <anchao@xiaomi.com>
-Charles E. Youse <charles.youse@intel.com>
-Chen Xingyu <hi@xingrz.me>
-Christoph Schnetzler <christoph.schnetzler@husqvarnagroup.com>
-Christoph Schramm <schramm@makaio.com>
-Christopher Friedt <cfriedt@meta.com>
-Christopher Friedt <cfriedt@meta.com> <cfriedt@fb.com>
-Chuck Jordan <cjordan@synopsys.com> <cjordan@synopsys.com>
-Chunlin Han <chunlin.han@linaro.org> <chunlin.han@acer.com>
-David B. Kinder <david.b.kinder@intel.com>
-David Komel <a8961713@gmail.com>
-David Leach <david.leach@nxp.com>
-Dirk Brandewie <dirk.j.brandewie@intel.com> <dirk.j.brandewie@intel.com>
-Douglas Su <d0u9.su@outlook.com> <d0u9.su@outlook.com>
-Enjia Mai <enjia.mai@intel.com>
-Enjia Mai <enjia.mai@intel.com> <enjiax.mai@intel.com>
-Evan Couzens <evanx.couzens@intel.com> <evanx.couzens@intel.com>
-Evgeniy Paltsev <PaltsevEvgeniy@gmail.com>
-Evgeniy Paltsev <PaltsevEvgeniy@gmail.com> <Eugeniy.Paltsev@synopsys.com>
-Felipe Neves <ryukokki.felipe@gmail.com> <ryukokki.felipe@gmail.com>
-Findlay Feng <i@fengch.me>
-Flavio Arieta Netto <flavio@exati.com.br>
-Francois Ramu <francois.ramu@st.com>
-Gerardo Aceves <gerardo.aceves@intel.com> <gerardo.aceves@intel.com>
-Gregory Shue <gregory.shue@legrand.com>
-Gregory Shue <gregory.shue@legrand.com> <gregory.shue@legrand.us>
-HaiLong Yang <cameledyang@pm.me>
-James Johnson <james.johnson672@t-mobile.com>
-Jarno Lämsä <jarno.lamsa@nordicsemi.no>
-Jędrzej Ciupis <jedrzej.ciupis@nordicsemi.no>
-Jeremie Garcia <jeremie.garcia@intel.com> <jeremie.garcia@intel.com>
-Jim Benjamin Luther <jilu@oticon.com>
-Johan Kruger <johan.kruger@windriver.com> <johan.kruger@windriver.com>
-Johann Fischer <j.fischer@phytec.de>
-Jørgen Kvalvaag <jorgen.kvalvaag@nordicsemi.no>
-Juan Manuel Cruz Alcaraz <juan.m.cruz.alcaraz@intel.com>
-Juan Solano <juanx.solano.menacho@intel.com>
-Julien D'Ascenzio <julien.dascenzio@paratronic.fr>
-Jun Li <jun.r.li@intel.com>
-Justin Watson <jwatson5@gmail.com>
-Kamil Sroka <kamil.sroka@nordicsemi.no>
-Katarzyna Giądła <katarzyna.giadla@nordicsemi.no>
-Keren Siman-Tov <keren.siman-tov@intel.com> <keren.siman-tov@intel.com>
-Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
-Kuo-Lang Tseng <kuo-lang.tseng@intel.com> <kuo-lang.tseng@intel.com>
-Lei Liu <lei.a.liu@intel.com> <lei.a.liu@intel.com>
-Leona Cook <leonax.cook@intel.com> <leonax.cook@intel.com>
-Leona Cook <leonax.cook@intel.com> <lsc@hackeress.com>
-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>
-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>
-Mariusz Skamra <mariusz.skamra@codecoup.pl>
-Mariusz Skamra <mariusz.skamra@codecoup.pl> <mariusz.skamra@tieto.com>
-Martí Bolívar <marti.bolivar@nordicsemi.no>
-Martí Bolívar <marti.bolivar@nordicsemi.no> <marti.bolivar@linaro.org>
-Martí Bolívar <marti.bolivar@nordicsemi.no> <marti.f.bolivar@gmail.com>
-Martí Bolívar <marti.bolivar@nordicsemi.no> <marti@foundries.io>
-Martí Bolívar <marti.bolivar@nordicsemi.no> <marti@opensourcefoundries.com>
-Martin Jäger <martin@libre.solar>  <17674105+martinjaeger@users.noreply.github.com>
-Mateusz Hołenko <mholenko@antmicro.com>
-Michael Rosen <michael.r.rosen@intel.com>
-Michal Narajowski <michal.narajowski@codecoup.pl>
-Mike Hirst <michael.hirst@windriver.com> <michael.hirst@windriver.com>
-Ming Shao <ming.shao@intel.com>
-Mohan Kumar Kumar <mohankm@fb.com>
-Naga Raja Rao Tulasi <tulasi.r@tcs.com> <tulasi.r@tcs.com>
-Navin Sankar Velliangiri <navin@linumiz.com>
-NingX Zhao <ningx.zhao@intel.com>
-Nishikant Nayak <nishikantax.nayak@intel.com>
-Ole Sæther <ole.saether@nordicsemi.no>
-Pavel Král <pavel.kral@omsquare.com>
-Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
-Paweł Czarnecki <pczarnecki@antmicro.com>
-Paweł Czarnecki <pczarnecki@antmicro.com>
-Paweł Czarnecki <pczarnecki@antmicro.com> <pczarnecki@internships.antmicro.com>
-Paweł Kwiek <pawel.kwiek@nordicsemi.no>
-Peng Chen <peng1.chen@intel.com>
-Peter Bigot <peter.bigot@nordicsemi.no>
-Peter Bigot <peter.bigot@nordicsemi.no> <pab@pabigot.com>
-Peter Johanson <peter@peterjohanson.com>
-Piyush Itankar <piyush.t.itankar@intel.com>
-Radosław Koppel <radoslaw.koppel@nordicsemi.no>
-Radosław Koppel <radoslaw.koppel@nordicsemi.no> <r.koppel@k-el.com>
-Raja D. Singh <rdsingh@iotwizards.com>
-Ricardo Salveti <ricardo@opensourcefoundries.com>
-Ricardo Salveti <ricardo@opensourcefoundries.com> <ricardo.salveti@linaro.org>
 Ruud Derwig <Ruud.Derwig@synopsys.com> <Ruud.Derwig@synopsys.com>
-Saku Rautio <saku.rautio@nordicsemi.no>
-Scott Worley <scott.worley@microchip.com>
-Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
-Sean Nyekjaer <sean@geanix.com> <sean@nyekjaer.dk>
-Sharron Liu <sharron.liu@intel.com>
-Shilpashree L C <shilpashree.lc@intel.com>
-Shuang He <shuang.he@intel.com> <shuang.he@intel.com>
-Sigvart Hovland <sigvart.hovland@nordicsemi.no>
-Stéphane D'Alu <sdalu@sdalu.com>
-Stine Åkredalen <stine.akredalen@nordicsemi.no>
-Thomas Heeley <thomas.heeley@intel.com> <thomas.heeley@intel.com>
-Tim Sørensen <tims@demant.com>
-Tim Sørensen <tims@demant.com> <tims@oticon.com>
-Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no> <vinayak.kariappa.chettimada@nordicsemi.no> <vich@nordicsemi.no> <vinayak.kariappa@gmail.com>
+Flavio Arieta Netto <flavio@exati.com.br>
+Nishikant Nayak <nishikantax.nayak@intel.com>
+Justin Watson <jwatson5@gmail.com>
+Johann Fischer <j.fischer@phytec.de>
+Jun Li <jun.r.li@intel.com>
 Xiaorui Hu <xiaorui.hu@linaro.org>
 Yannis Damigos <giannis.damigos@gmail.com> <ydamigos@iccs.gr>
-Yonattan Louise <yonattan.a.louise.mendoza@intel.com>
-Yonattan Louise <yonattan.a.louise.mendoza@intel.com> <yonattan.a.louise.mendoza@linux.intel.com>
-YouhuaX Zhu <youhuax.zhu@intel.com>
+Vinayak Kariappa Chettimada <vinayak.kariappa.chettimada@nordicsemi.no> <vinayak.kariappa.chettimada@nordicsemi.no> <vich@nordicsemi.no> <vinayak.kariappa@gmail.com>
+Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
+Sean Nyekjaer <sean@geanix.com> <sean@nyekjaer.dk>
+Marc Herbert <marc.herbert@intel.com> <46978960+marc-hb@users.noreply.github.com>
+Martin Jäger <martin@libre.solar>  <17674105+martinjaeger@users.noreply.github.com>
+Armand Ciejak <armand@riedonetworks.com>  <armandciejak@users.noreply.github.com>

.yamllint

@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-extends: default
-
-rules:
-  line-length:
-    max: 100
-  comments:
-    min-spaces-from-content: 1
-  indentation:
-    spaces: 2
-    indent-sequences: consistent
-  document-start:
-    present: false
-  truthy:
-    check-keys: false

CODEOWNERS

@@ -11,37 +11,82 @@
 # add others as needed.
 
 # Do not use wildcard on all source yet
-#
-# +++++++++++ NOTE ++++++++++++++++
-#
-# Please use the MAINTAINERS file to add yourself in an area or to add a new
-# component or code. This file is going to be deprecated and currently only had
-# entries that are not covered by the MAINTAINERS file.
+# *                                        @galak @nashif
 
+/.github/				  @nashif @stephanosio
+/.github/workflows/                       @galak @nashif
+/MAINTAINERS.yml                          @MaureenHelm
+/arch/arc/                                @abrodkin @ruuddw @evgeniy-paltsev
+/arch/arm/                                @MaureenHelm @galak @ioannisg
+/arch/arm/core/aarch32/cortex_m/cmse/     @ioannisg
+/arch/arm/include/aarch32/cortex_m/cmse.h @ioannisg
+/arch/arm/core/aarch32/cortex_a_r/        @MaureenHelm @galak @ioannisg @bbolen @stephanosio
+/arch/arm64/                              @carlocaione
+/arch/arm64/core/cortex_r/                @povergoing
+/arch/arm64/core/xen/                     @lorc @firscity
+/arch/common/                             @ioannisg @andyross
+/arch/mips/                               @frantony
+/soc/arc/snps_*/                          @abrodkin @ruuddw @evgeniy-paltsev
+/soc/nios2/                               @nashif
+/soc/arm/                                 @MaureenHelm @galak @ioannisg
+/soc/arm/arm/mps2/                        @fvincenzo
 /soc/arm/aspeed/                          @aspeeddylan
-/soc/atmel/                               @nandojve
+/soc/arm/atmel_sam/common/*_sam4l_*.c     @nandojve
+/soc/arm/atmel_sam/sam3x/                 @ioannisg
+/soc/arm/atmel_sam/sam4e/                 @nandojve
+/soc/arm/atmel_sam/sam4l/                 @nandojve
+/soc/arm/atmel_sam/sam4s/                 @fallrisk
+/soc/arm/atmel_sam/same70/                @nandojve
+/soc/arm/atmel_sam/samv71/                @nandojve
+/soc/arm/cypress/                         @nandojve
 /soc/arm/bcm*/                            @sbranden
-/soc/arm/ene/                             @ene-steven
-/soc/arm/infineon_cat1/                   @ifyall @npal-cy
+/soc/arm/gigadevice/                      @nandojve
 /soc/arm/infineon_xmc/                    @parthitce
+/soc/arm/nxp*/                            @mmahadevan108 @dleach02
+/soc/arm/nordic_nrf/                      @anangl
+/soc/arm/nuvoton_npcx/                    @MulinChao @ChiHuaL
+/soc/arm/nuvoton_numicro/                 @ssekar15
+/soc/arm/quicklogic_eos_s3/               @fkokosinski @kgugala
+/soc/arm/rpi_pico/                        @yonsch
 /soc/arm/silabs_exx32/efm32pg1b/          @rdmeneze
 /soc/arm/silabs_exx32/efr32mg21/          @l-alfred
+/soc/arm/st_stm32/                        @erwango
+/soc/arm/st_stm32/*/power.c               @FRASTM
 /soc/arm/st_stm32/stm32mp1/               @arnopo
-/soc/arm/st_stm32/stm32h7/*stm32h735*     @benediktibk
-/soc/arm/st_stm32/stm32l4/*stm32l451*     @benediktibk
 /soc/arm/ti_simplelink/cc13x2_cc26x2/     @bwitherspoon
 /soc/arm/ti_simplelink/cc32xx/            @vanti
 /soc/arm/ti_simplelink/msp432p4xx/        @Mani-Sadhasivam
 /soc/arm/xilinx_zynq7000/                 @ibirnbaum
 /soc/arm/xilinx_zynqmp/                   @stephanosio
-/soc/arm/renesas_rcar/                    @aaillet
+/soc/arm/renesas_rcar/                    @aaillet @pmarzin
+/soc/arm64/                               @carlocaione
+/soc/arm64/qemu_cortex_a53/               @carlocaione
+/soc/arm64/bcm_vk/                        @abhishek-brcm
+/soc/arm64/nxp_layerscape/                @JiafeiPan
+/soc/arm64/xenvm/                         @lorc @firscity
+/soc/arm64/nxp_imx/                       @MrVan @JiafeiPan
+/soc/arm64/arm/                           @povergoing
+/soc/arm64/arm/fvp_aemv8a/                @carlocaione
+/soc/arm64/intel_socfpga/*                @siclim
+/submanifests/*                           @mbolivar-nordic
+/arch/x86/                                @jhedberg @nashif @jenmwms @aasthagr
+/arch/nios2/                              @nashif
+/arch/posix/                              @aescolar @daor-oti
+/arch/riscv/                              @kgugala @pgielda
+/soc/mips/                                @frantony
+/soc/posix/                               @aescolar @daor-oti
+/soc/riscv/                               @kgugala @pgielda
 /soc/riscv/openisa*/                      @dleach02
-/soc/riscv/riscv-privileged/andes_v5/      @cwshu @kevinwang821020 @jimmyzhe
-/soc/riscv/riscv-privileged/neorv32/       @henrikbrixandersen
-/soc/riscv/riscv-privileged/gd32vf103/     @soburi
-/soc/starfive/jh71xx/ 			  @pfarwsi
-/soc/riscv/riscv-privileged/niosv/         @sweeaun
-/boards/ene/                              @ene-steven
+/soc/riscv/riscv-privilege/andes_v5/      @cwshu @kevinwang821020 @jimmyzhe
+/soc/riscv/riscv-privilege/neorv32/       @henrikbrixandersen
+/soc/riscv/riscv-privilege/gd32vf103/     @soburi
+/soc/x86/                                 @dcpleung @nashif @jenmwms @aasthagr
+/arch/xtensa/                             @dcpleung @andyross @nashif
+/soc/xtensa/                              @dcpleung @andyross @nashif
+/arch/sparc/                              @julius-barendt
+/soc/sparc/                               @julius-barendt
+/boards/arc/                              @abrodkin @ruuddw @evgeniy-paltsev
+/boards/arm/                              @MaureenHelm @galak
 /boards/arm/96b_argonkey/                 @avisconti
 /boards/arm/96b_avenger96/                @Mani-Sadhasivam
 /boards/arm/96b_carbon/                   @idlethread
@@ -50,37 +95,41 @@
 /boards/arm/96b_neonkey/                  @Mani-Sadhasivam
 /boards/arm/96b_stm32_sensor_mez/         @Mani-Sadhasivam
 /boards/arm/96b_wistrio/                  @Mani-Sadhasivam
-/boards/arm/acn52832/                     @sven-hm
-/boards/arm/arduino_mkrzero/              @soburi
+/boards/arm/arduino_due/                  @ioannisg
 /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
 /boards/arm/cc1352r1_launchxl/            @bwitherspoon
 /boards/arm/cc26x2r1_launchxl/            @bwitherspoon
 /boards/arm/cc3220sf_launchxl/            @vanti
-/boards/arm/cy8ckit_062_ble/              @ifyall @npal-cy
-/boards/arm/cy8ckit_062s4/                @DaWei8823
-/boards/arm/cy8ckit_062_wifi_bt/          @ifyall @npal-cy
-/boards/arm/cy8cproto_062_4343w/          @ifyall @npal-cy
+/boards/arm/cy8*                          @nandojve
+/boards/arm/disco_l475_iot1/              @erwango
 /boards/arm/efm32pg_stk3401a/             @rdmeneze
 /boards/arm/faze/                         @mbittan @simonguinot
 /boards/arm/frdm*/                        @mmahadevan108 @dleach02
+/boards/arm/frdm*/doc/                    @dleach02 @MeganHansen
 /boards/arm/gd32*/                        @nandojve
 /boards/arm/google_*/                     @jackrosenthal
 /boards/arm/hexiwear*/                    @mmahadevan108 @dleach02
+/boards/arm/hexiwear*/doc/                @dleach02 @MeganHansen
 /boards/arm/ip_k66f/                      @parthitce @lmajewski
 /boards/arm/legend/                       @mbittan @simonguinot
 /boards/arm/lpcxpresso*/                  @mmahadevan108 @dleach02
+/boards/arm/lpcxpresso*/doc/              @dleach02 @MeganHansen
 /boards/arm/mimx8mm_evk/                  @Mani-Sadhasivam
-/boards/arm/mimx8mm_phyboard_polis        @pefech
 /boards/arm/mimxrt*/                      @mmahadevan108 @dleach02
+/boards/arm/mimxrt*/doc/                  @dleach02 @MeganHansen
 /boards/arm/mps2_an385/                   @fvincenzo
 /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
@@ -90,101 +139,113 @@
 /boards/arm/rpi_pico/                     @yonsch
 /boards/arm/ronoth_lodev/                 @NorthernDean
 /boards/arm/xmc45_relax_kit/              @parthitce
-/boards/atmel/                            @nandojve
+/boards/arm/sam4e_xpro/                   @nandojve
+/boards/arm/sam4l_ek/                     @nandojve
+/boards/arm/sam4s_xplained/               @fallrisk
+/boards/arm/sam_e70_xplained/             @nandojve
+/boards/arm/sam_v71_xult/                 @nandojve
 /boards/arm/scobc_module1/                @yashi
 /boards/arm/v2m_beetle/                   @fvincenzo
 /boards/arm/olimexino_stm32/              @ydamigos
-/boards/arm/s32*/                         @manuargue
 /boards/arm/sensortile_box/               @avisconti
 /boards/arm/steval_fcu001v1/              @Navin-Sankar
 /boards/arm/stm32l1_disco/                @karlp
-/boards/arm/stm32h735g_disco/             @benediktibk
+/boards/arm/stm32*_disco/                 @erwango @ABOSTM @FRASTM
 /boards/arm/stm32f3_disco/                @ydamigos
-/boards/arm/rcar_*/                       @aaillet
+/boards/arm/stm32*_eval/                  @erwango @ABOSTM @FRASTM
+/boards/arm/rcar_h3ulcb/                  @aaillet @pmarzin
 /boards/arm/ubx_bmd345eval_nrf52840/      @Navin-Sankar @brec-u-blox
-/boards/arm/nrf5340_audio_dk_nrf5340      @koffes @alexsven @erikrobstad @rick1082 @gWacey
+/boards/common/                           @mbolivar-nordic
+/boards/deprecated.cmake                  @tejlmand
+/boards/mips/                             @frantony
+/boards/nios2/                            @nashif
+/boards/nios2/altera_max10/               @nashif
 /boards/arm/stm32_min_dev/                @sidcha
-/boards/ezurio/*                          @rerickson1
+/boards/posix/                            @aescolar @daor-oti
+/boards/posix/nrf52_bsim/                 @aescolar @wopu-ot
+/boards/riscv/                            @kgugala @pgielda
 /boards/riscv/rv32m1_vega/                @dleach02
+/boards/riscv/beaglev_starlight_jh7100/   @rajnesh-kanwal
 /boards/riscv/adp_xc7k_ae350/             @cwshu @kevinwang821020 @jimmyzhe
+/boards/riscv/gd32*/                      @gmarull
 /boards/riscv/longan_nano/                @soburi
 /boards/riscv/neorv32/                    @henrikbrixandersen
-/boards/riscv/niosv*/                     @sweeaun
-/boards/riscv/sparkfun_red_v_things_plus/ @soburi
-/boards/riscv/stamp_c3/                   @soburi
-/boards/starfive/visionfive2/	 	  @kanakshilledar @pfarwsi
+/boards/shields/                          @erwango
 /boards/shields/atmel_rf2xx/              @nandojve
 /boards/shields/esp_8266/                 @nandojve
 /boards/shields/inventek_eswifi/          @nandojve
+/boards/x86/                              @dcpleung @nashif @jenmwms @aasthagr
+/boards/x86/acrn/                         @enjiamai
+/boards/xtensa/                           @nashif @dcpleung
 /boards/xtensa/odroid_go/                 @ydamigos
 /boards/xtensa/nxp_adsp_imx8/             @iuliana-prodan @dbaluta
-/boards/xtensa/kincony_kc868_a32/         @bbilas
+/boards/sparc/                            @julius-barendt
 /boards/arm64/qemu_cortex_a53/            @carlocaione
 /boards/arm64/bcm958402m2_a72/            @abhishek-brcm
 /boards/arm64/mimx8mm_evk/                @MrVan @JiafeiPan
 /boards/arm64/mimx8mp_evk/                @MrVan @JiafeiPan
 /boards/arm64/mimx8mn_evk/                @JiafeiPan
-/boards/arm64/mimx93_evk/                 @JiafeiPan
 /boards/arm64/nxp_ls1046ardb/             @JiafeiPan
 /boards/arm64/xenvm/                      @lorc @firscity
 /boards/arm64/fvp_baser_aemv8r/           @povergoing
 /boards/arm64/fvp_base_revc_2xaemv8a/     @carlocaione
 /boards/arm64/intel_socfpga_agilex_socdk/ @siclim @ngboonkhai
-/boards/arm64/intel_socfpga_agilex5_socdk/ @teikheng @gdengi
-/boards/arm64/rcar_*/                     @lorc @xakep-amatop
 # All cmake related files
+/cmake/                                   @tejlmand @nashif
+/cmake/*/arcmwdt/                         @abrodkin @evgeniy-paltsev @tejlmand
+/CMakeLists.txt                           @tejlmand @nashif
+/doc/                                     @carlescufi
 /doc/develop/tools/coccinelle.rst                @himanshujha199640 @JuliaLawall
-/doc/services/device_mgmt/smp_protocol.rst  @de-nordic @nordicjm
-/doc/services/device_mgmt/smp_groups/       @de-nordic @nordicjm
-/doc/services/sensing/                      @lixuzha @ghu0510 @qianruh
+/doc/services/device_mgmt/smp_protocol.rst  @de-nordic
+/doc/services/device_mgmt/smp_groups/       @de-nordic
 /doc/CMakeLists.txt                       @carlescufi
 /doc/_scripts/                            @carlescufi
+/doc/connectivity/bluetooth/                    @alwa-nordic @jhedberg @Vudentz
+/doc/build/dts/                          @galak @mbolivar-nordic
+/doc/hardware/peripherals/canbus/                    @alexanderwachter @henrikbrixandersen
+/doc/security/                            @ceolin @d3zd3z
+/drivers/debug/                           @nashif
 /drivers/*/*sam4l*                        @nandojve
 /drivers/*/*cc13xx_cc26xx*                @bwitherspoon
 /drivers/*/*gd32*                         @nandojve
+/drivers/*/*litex*                        @mateusz-holenko @kgugala @pgielda
 /drivers/*/*mcux*                         @mmahadevan108 @dleach02
+/drivers/*/*stm32*                        @erwango @ABOSTM @FRASTM
 /drivers/*/*native_posix*                 @aescolar @daor-oti
 /drivers/*/*lpc11u6x*                     @mbittan @simonguinot
 /drivers/*/*npcx*                         @MulinChao @ChiHuaL
 /drivers/*/*andes*                        @cwshu @kevinwang821020 @jimmyzhe
-/drivers/*/*ifx_cat1*                     @ifyall @npal-cy
 /drivers/*/*neorv32*                      @henrikbrixandersen
-/drivers/*/*_s32*                         @manuargue
+/drivers/adc/                             @anangl
 /drivers/adc/adc_ads1x1x.c                @XenuIsWatching
 /drivers/adc/adc_stm32.c                  @cybertale
-/drivers/adc/adc_rpi_pico.c               @soburi
-/drivers/adc/*ads114s0x*                  @benediktibk
-/drivers/adc/*max11102_17*                @benediktibk
-/drivers/adc/*kb1200*                     @ene-steven
-/drivers/adc/adc_ad559x.c                 @bbilas
 /drivers/audio/*nrfx*                     @anangl
-/drivers/auxdisplay/*pt6314*              @xingrz
-/drivers/auxdisplay/*                      @thedjnK
 /drivers/bbram/*                          @yperess @sjg20 @jackrosenthal
 /drivers/bluetooth/                       @alwa-nordic @jhedberg @Vudentz
 /drivers/bluetooth/hci/hci_esp32.c        @sylvioalves
+/drivers/cache/                           @carlocaione
+/drivers/syscon/                          @carlocaione @yperess
+/drivers/can/                             @alexanderwachter @henrikbrixandersen
 /drivers/can/*mcp2515*                    @karstenkoenig
-/drivers/can/*rcar*                       @aaillet
-/drivers/clock_control/*agilex*           @siclim @gdengi
+/drivers/can/*rcar*                       @aaillet @pmarzin
+/drivers/clock_control/*agilex*           @siclim
 /drivers/clock_control/*nrf*              @nordic-krch
-/drivers/clock_control/*esp32*            @extremegtx @sylvioalves
+/drivers/clock_control/*esp32*            @extremegtx @glaubermaroto
 /drivers/clock_control/*cpg_mssr*         @aaillet
+/drivers/counter/                         @nordic-krch
 /drivers/console/ipm_console.c            @finikorg
 /drivers/console/semihost_console.c       @luozhongyao
 /drivers/console/jailhouse_debug_console.c @MrVan
 /drivers/counter/counter_cmos.c           @dcpleung
 /drivers/counter/counter_ll_stm32_timer.c @kentjhall
-/drivers/counter/*esp32*                  @sylvioalves
-/drivers/counter/dw_timer.c               @pbalsundar
-/drivers/counter/counter_timer_shell.c    @pbalsundar
+/drivers/counter/*esp32*                  @glaubermaroto
 /drivers/crypto/*nrf_ecb*                 @maciekfabia @anangl
+/drivers/display/display_framebuf.c       @dcpleung
 /drivers/display/*rm68200*                @mmahadevan108
-/drivers/display/display_ili9342c.*       @extremegtx
-/drivers/dac/*ad56xx*                     @benediktibk
-/drivers/dac/dac_ad559x.c                 @bbilas
-/drivers/dai/                             @kv2019i @marcinszkudlinski @abonislawski
-/drivers/dai/intel/                       @kv2019i @marcinszkudlinski @abonislawski
-/drivers/dai/intel/ssp/                   @kv2019i @marcinszkudlinski @abonislawski
+/drivers/dac/                             @martinjaeger
+/drivers/dai/                             @juimonen @marcinszkudlinski @abonislawski
+/drivers/dai/intel/                       @juimonen @marcinszkudlinski @abonislawski
+/drivers/dai/intel/ssp/                   @juimonen @marcinszkudlinski @abonislawski
 /drivers/dai/intel/dmic/                  @marcinszkudlinski @abonislawski
 /drivers/dai/intel/alh/                   @abonislawski
 /drivers/dma/*dw*                         @tbursztyka
@@ -194,44 +255,42 @@
 /drivers/dma/*pl330*                      @raveenp
 /drivers/dma/*iproc_pax*                  @raveenp
 /drivers/dma/*intel_adsp*                 @teburd @abonislawski
-/drivers/dma/*rpi_pico*                   @soburi
-/drivers/dma/*xmc4xxx*                    @talih0
+/drivers/ec_host_cmd_periph/              @jettr
+/drivers/edac/                            @finikorg
+/drivers/eeprom/                          @henrikbrixandersen
 /drivers/eeprom/eeprom_stm32.c            @KwonTae-young
 /drivers/entropy/*b91*                    @andy-liu-telink
 /drivers/entropy/*bt_hci*                 @JordanYates
 /drivers/entropy/*rv32m1*                 @dleach02
+/drivers/entropy/*gecko*                  @chrta
+/drivers/entropy/*litex*                  @mateusz-holenko @kgugala @pgielda
+/drivers/espi/                            @albertofloyd @franciscomunoz @sjvasanth1
+/drivers/ethernet/                        @tbursztyka @pfalcon
 /drivers/ethernet/*dwmac*                 @npitre
 /drivers/ethernet/*stm32*                 @Nukersson @lochej
 /drivers/ethernet/*w5500*                 @parthitce
 /drivers/ethernet/*xlnx_gem*              @ibirnbaum
-/drivers/ethernet/*smsc91x*               @sgrrzhf
-/drivers/ethernet/*adin2111*              @GeorgeCGV
-/drivers/ethernet/*oa_tc6*                @lmajewski
-/drivers/ethernet/*lan865x*               @lmajewski
-/drivers/ethernet/phy/                    @rlubos @tbursztyka @arvinf @jukkar
-/drivers/ethernet/phy/*adin2111*          @GeorgeCGV
-/drivers/mdio/*adin2111*                  @GeorgeCGV
+/drivers/ethernet/phy/                    @rlubos @tbursztyka @arvinf
+/drivers/mdio/                            @rlubos @tbursztyka @arvinf
+/drivers/flash/                           @nashif @nvlsianpu
 /drivers/flash/*stm32_qspi*               @lmajewski
 /drivers/flash/*b91*                      @andy-liu-telink
 /drivers/flash/*cadence*                  @ngboonkhai
 /drivers/flash/*cc13xx_cc26xx*            @pepe2k
-/drivers/flash/*nrf*                      @de-nordic
-/drivers/flash/*esp32*                    @sylvioalves
-/drivers/flash/flash_cadence_nand*        @nbalabak
+/drivers/flash/*nrf*                      @nvlsianpu
+/drivers/flash/*esp32*                    @glaubermaroto
+/drivers/fpga/                            @tgorochowik @kgugala
+/drivers/gpio/                            @mnkp
 /drivers/gpio/*b91*                       @andy-liu-telink
 /drivers/gpio/*lmp90xxx*                  @henrikbrixandersen
 /drivers/gpio/*nct38xx*                   @MulinChao @ChiHuaL
+/drivers/gpio/*stm32*                     @erwango
 /drivers/gpio/*eos_s3*                    @fkokosinski @kgugala
 /drivers/gpio/*rcar*                      @aaillet
-/drivers/gpio/*esp32*                     @sylvioalves
+/drivers/gpio/*esp32*                     @glaubermaroto
 /drivers/gpio/*rpi_pico*                  @yonsch
 /drivers/gpio/*xlnx_ps*                   @ibirnbaum
-/drivers/gpio/*ads114s0x*                 @benediktibk
-/drivers/gpio/*bd8lb600fs*                @benediktibk
-/drivers/gpio/*pcal64xxa*                 @benediktibk
-/drivers/gpio/*kb1200*                    @ene-steven
-/drivers/gpio/gpio_altera_pio.c           @shilinte
-/drivers/gpio/gpio_ad559x.c               @bbilas
+/drivers/hwinfo/                          @alexanderwachter
 /drivers/i2c/i2c_common.c                 @sjg20
 /drivers/i2c/i2c_emul.c                   @sjg20
 /drivers/i2c/i2c_ite_enhance.c            @GTLin08
@@ -240,21 +299,21 @@
 /drivers/i2c/Kconfig.i2c_emul             @sjg20
 /drivers/i2c/Kconfig.it8xxx2              @GTLin08
 /drivers/i2c/target/*eeprom*              @henrikbrixandersen
-/drivers/i2c/Kconfig.test                 @mbolivar-ampere
-/drivers/i2c/i2c_test.c                   @mbolivar-ampere
+/drivers/i2c/Kconfig.test                 @mbolivar-nordic
+/drivers/i2c/i2c_test.c                   @mbolivar-nordic
 /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/i3c/                             @dcpleung
+/drivers/ieee802154/                      @rlubos @tbursztyka
 /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/ieee802154/ieee802154_cc13xx*    @bwitherspoon @cfriedt
 /drivers/interrupt_controller/            @dcpleung @nashif
 /drivers/interrupt_controller/intc_gic.c  @stephanosio
-/drivers/interrupt_controller/*esp32*     @sylvioalves
+/drivers/interrupt_controller/*esp32*     @glaubermaroto
 /drivers/interrupt_controller/intc_nuclei_eclic.c  @soburi
 /drivers/ipm/ipm_mhu*                     @karl-zh
 /drivers/ipm/Kconfig.nrfx                 @masz-nordic
@@ -265,31 +324,38 @@
 /drivers/ipm/ipm_stm32_ipcc.c             @arnopo
 /drivers/ipm/ipm_stm32_hsem.c             @cameled
 /drivers/ipm/ipm_esp32.c                  @uLipe
-/drivers/ipm/ipm_ivshmem.c                @uLipe
+/drivers/kscan/                           @VenkatKotakonda @franciscomunoz @sjvasanth1
 /drivers/kscan/*xec*                      @franciscomunoz @sjvasanth1
 /drivers/kscan/*ft5336*                   @MaureenHelm
 /drivers/kscan/*ht16k33*                  @henrikbrixandersen
-/drivers/led_strip/                       @mbolivar-ampere
-/drivers/mfd/mfd_ad559x.c                 @bbilas
-/drivers/mfd/mfd_max20335.c               @bbilas
+/drivers/led/                             @Mani-Sadhasivam
+/drivers/led_strip/                       @mbolivar-nordic
+/drivers/lora/                            @Mani-Sadhasivam
+/drivers/mbox/                            @carlocaione
+/drivers/memc/                            @gmarull
+/drivers/misc/                            @tejlmand
 /drivers/misc/ft8xx/                      @hubertmis
+/drivers/mm/                              @dcpleung
 /drivers/modem/hl7800.c                   @rerickson1
 /drivers/modem/simcom-sim7080.c           @lgehreke
 /drivers/modem/simcom-sim7080.h           @lgehreke
 /drivers/modem/Kconfig.hl7800             @rerickson1
 /drivers/modem/Kconfig.simcom-sim7080     @lgehreke
-/drivers/pinctrl/*esp32*                  @sylvioalves
+/drivers/pcie/                            @dcpleung @nashif @jhedberg
+/drivers/peci/                            @albertofloyd @franciscomunoz @sjvasanth1
+/drivers/pinctrl/                         @gmarull
+/drivers/pinctrl/*esp32*                  @glaubermaroto
 /drivers/pinctrl/*it8xxx2*                @ite
-/drivers/pinctrl/*kb1200*                 @ene-steven
-/drivers/pm_cpu_ops/psci_shell.c          @nbalabak @gdengi
+/drivers/pm_cpu_ops/                      @carlocaione
 /drivers/power_domain/                    @ceolin
+/drivers/ps2/                             @franciscomunoz @sjvasanth1
 /drivers/ps2/*xec*                        @franciscomunoz @sjvasanth1
 /drivers/ps2/*npcx*                       @MulinChao @ChiHuaL
 /drivers/pwm/*b91*                        @andy-liu-telink
-/drivers/pwm/*pca9685*                    @nixward
 /drivers/pwm/*rpi_pico*                   @burumaj
 /drivers/pwm/*rv32m1*                     @henrikbrixandersen
 /drivers/pwm/*sam0*                       @nzmichaelh
+/drivers/pwm/*stm32*                      @gmarull
 /drivers/pwm/*test*                       @JordanYates
 /drivers/pwm/*xlnx*                       @henrikbrixandersen
 /drivers/pwm/pwm_capture.c                @henrikbrixandersen
@@ -297,35 +363,23 @@
 /drivers/pwm/*gecko*                      @sun681
 /drivers/pwm/*it8xxx2*                    @RuibinChang
 /drivers/pwm/*esp32*                      @LucasTambor
-/drivers/pwm/*rcar*                       @aaillet
-/drivers/pwm/*max31790*                   @benediktibk
-/drivers/pwm/*kb1200*                     @ene-steven
-/drivers/regulator/*                      @gmarull
-/drivers/regulator/regulator_max20335.c   @bbilas
-/drivers/regulator/regulator_pca9420.c    @danieldegrasse
-/drivers/regulator/regulator_rpi_pico.c   @soburi
-/drivers/regulator/regulator_shell.c      @danieldegrasse
-/drivers/reset/reset_intel_socfpga.c      @nbalabak
-/drivers/reset/Kconfig.intel_socfpga      @nbalabak
+/drivers/pwm/*rcar*                       @pmarzin
+/drivers/regulator/*pmic*                 @danieldegrasse
+/drivers/reset/                           @andrei-edward-popa
+/drivers/sensor/                          @MaureenHelm
 /drivers/sensor/ams_iAQcore/              @alexanderwachter
 /drivers/sensor/ens210/                   @alexanderwachter
-/drivers/sensor/grow_r502a/               @DineshDK03
 /drivers/sensor/hts*/                     @avisconti
 /drivers/sensor/ina23*/                   @bbilas
 /drivers/sensor/lis*/                     @avisconti
 /drivers/sensor/lps*/                     @avisconti
 /drivers/sensor/lsm*/                     @avisconti
 /drivers/sensor/mpr/                      @sven-hm
-/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_altera_jtag.c        @nashif
+/drivers/serial/*ns16550*                 @dcpleung @nashif @jenmwms @aasthagr
+/drivers/serial/*nrfx*                    @Mierunski @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
@@ -339,40 +393,48 @@
 /drivers/serial/*numicro*                 @ssekar15
 /drivers/serial/*apbuart*                 @julius-barendt
 /drivers/serial/*rcar*                    @aaillet
+/drivers/serial/Kconfig.test              @str4t0m
+/drivers/serial/serial_test.c             @str4t0m
 /drivers/serial/Kconfig.xen               @lorc @firscity
 /drivers/serial/uart_hvc_xen.c            @lorc @firscity
 /drivers/serial/uart_hvc_xen_consoleio.c  @lorc @firscity
 /drivers/serial/Kconfig.it8xxx2           @GTLin08
 /drivers/serial/uart_ite_it8xxx2.c        @GTLin08
-/drivers/serial/*intel_lw*                @shilinte
-/drivers/serial/*kb1200*                  @ene-steven
+/drivers/disk/                            @jfischer-no
+/drivers/disk/sdmmc_sdhc.h                @JunYangNXP
 /drivers/disk/sdmmc_stm32.c               @anthonybrandon
-/drivers/ptp_clock/                       @tbursztyka @jukkar
+/drivers/net/                             @rlubos @tbursztyka
+/drivers/ptp_clock/                       @tbursztyka
+/drivers/spi/                             @tbursztyka
 /drivers/spi/*b91*                        @andy-liu-telink
 /drivers/spi/spi_rv32m1_lpspi*            @karstenkoenig
-/drivers/spi/*esp32*                      @sylvioalves
-/drivers/spi/*pl022*                      @soburi
+/drivers/spi/*esp32*                      @glaubermaroto
 /drivers/sdhc/                            @danieldegrasse
-/drivers/sdhc/sdhc_cdns*                  @roymurlidhar @tanmaykathpalia
+/drivers/timer/*apic*                     @dcpleung @nashif
+/drivers/timer/apic_tsc.c                 @andyross
 /drivers/timer/*arm_arch*                 @carlocaione
 /drivers/timer/*cortex_m_systick*         @anangl
 /drivers/timer/*altera_avalon*            @nashif
 /drivers/timer/*riscv_machine*            @kgugala @pgielda
 /drivers/timer/*ite_it8xxx2*              @ite
 /drivers/timer/*xlnx_psttc*               @wjliang @stephanosio
-/drivers/timer/*cc13xx_cc26xx_rtc*        @vanti
+/drivers/timer/*cc13x2_cc26x2_rtc*        @vanti
 /drivers/timer/*cavs*                     @dcpleung
+/drivers/timer/*stm32_lptim*              @FRASTM
 /drivers/timer/*leon_gptimer*             @julius-barendt
 /drivers/timer/*mips_cp0*                 @frantony
 /drivers/timer/*rcar_cmt*                 @aaillet
-/drivers/timer/*esp32_sys*                @uLipe
+/drivers/timer/*esp32c3_sys*              @uLipe
 /drivers/timer/*sam0_rtc*                 @bendiscz
 /drivers/timer/*arcv2*                    @ruuddw
 /drivers/timer/*xtensa*                   @dcpleung
 /drivers/timer/*rv32m1_lptmr*             @mbolivar
 /drivers/timer/*nrf_rtc*                  @anangl
 /drivers/timer/*hpet*                     @dcpleung
+/drivers/usb/                             @jfischer-no
 /drivers/usb/device/usb_dc_stm32.c        @ydamigos @loicpoulain
+/drivers/usbc/                            @sambhurst
+/drivers/video/                           @loicpoulain
 /drivers/i2c/*b91*                        @andy-liu-telink
 /drivers/i2c/i2c_ll_stm32*                @ydamigos
 /drivers/i2c/i2c_rv32m1_lpi2c*            @henrikbrixandersen
@@ -380,6 +442,9 @@
 /drivers/i2c/i2c_dw*                      @dcpleung
 /drivers/i2c/*tca954x*                    @kurddt
 /drivers/*/*xec*                          @franciscomunoz @albertofloyd @sjvasanth1
+/drivers/mipi_dsi/                        @gmarull
+/drivers/mipi_dsi/mipi_dsi.c              @gmarull
+/drivers/w1/                              @str4t0m
 /drivers/watchdog/*gecko*                 @oanerer
 /drivers/watchdog/*sifive*                @katsuster
 /drivers/watchdog/wdt_handlers.c          @dcpleung @nashif
@@ -388,103 +453,394 @@
 /drivers/watchdog/Kconfig.it8xxx2         @RuibinChang
 /drivers/watchdog/wdt_counter.c           @nordic-krch
 /drivers/watchdog/*rpi_pico*              @thedjnK
-/drivers/watchdog/*dw*                    @softwarecki @pbalsundar
-/drivers/watchdog/*ifx*                   @sreeramIfx
-/drivers/watchdog/*kb1200*                @ene-steven
+/drivers/wifi/                            @rlubos @tbursztyka @pfalcon
 /drivers/wifi/esp_at/                     @mniestroj
 /drivers/wifi/eswifi/                     @loicpoulain @nandojve
 /drivers/wifi/winc1500/                   @kludentwo
 /drivers/virtualization/		  @tbursztyka
+/drivers/xen/                             @lorc @firscity
 /dts/arc/                                 @abrodkin @ruuddw @iriszzw @evgeniy-paltsev
 /dts/arm/acsip/                           @NorthernDean
 /dts/arm/aspeed/                          @aspeeddylan
-/dts/arm/atmel/                           @galak @nandojve
+/dts/arm/atmel/sam4e*                     @nandojve
+/dts/arm/atmel/sam4l*                     @nandojve
+/dts/arm/atmel/samr21.dtsi                @benpicco
+/dts/arm/atmel/sam*5*.dtsi                @benpicco
+/dts/arm/atmel/same70*                    @nandojve
+/dts/arm/atmel/samv71*                    @nandojve
+/dts/arm/atmel/                           @galak
 /dts/arm/broadcom/                        @sbranden
-/dts/arm/cypress/                         @ifyall @npal-cy
-/dts/arm/ene/kb1200                       @ene-steven
-/dts/arm/gd/                              @nandojve
-/dts/arm/infineon/xmc4*                   @parthitce @ifyall @npal-cy
-/dts/arm/infineon/psoc6/                  @ifyall @npal-cy
+/dts/arm/cypress/                         @nandojve
+/dts/arm/gigadevice/                      @nandojve
+/dts/arm/infineon/                        @parthitce
+/dts/arm64/                               @carlocaione
 /dts/arm64/armv8-r.dtsi                   @povergoing
 /dts/arm64/intel/*intel_socfpga*          @siclim
 /dts/arm64/nxp/                           @JiafeiPan
-/dts/arm64/renesas/                       @lorc @xakep-amatop
 /dts/arm/quicklogic/                      @fkokosinski @kgugala
-/dts/arm/seeed_studio/                    @str4t0m
-/dts/arm/st/h7/*stm32h735*                @benediktibk
-/dts/arm/st/l4/*stm32l451*                @benediktibk
+/dts/arm/seeed/                           @str4t0m
+/dts/arm/st/                              @erwango
 /dts/arm/ti/cc13?2*                       @bwitherspoon
 /dts/arm/ti/cc26?2*                       @bwitherspoon
 /dts/arm/ti/cc3235*                       @vanti
 /dts/arm/nordic/                          @anangl @carlescufi
 /dts/arm/nuvoton/                         @ssekar15 @MulinChao @ChiHuaL
 /dts/arm/nxp/                             @mmahadevan108 @dleach02
-/dts/arm/nxp/nxp_s32*                     @manuargue
 /dts/arm/microchip/                       @franciscomunoz @albertofloyd @sjvasanth1
 /dts/arm/rpi_pico/                        @yonsch
 /dts/arm/silabs/efm32_pg_1b.dtsi          @rdmeneze
 /dts/arm/silabs/efm32gg11b*               @oanerer
+/dts/arm/silabs/efm32_jg_pg*              @chrta
 /dts/arm/silabs/efr32bg13p*               @mnkp
-/dts/arm/silabs/efr32bg22*                @kgugala @fkokosinski @pczarnecki
 /dts/arm/silabs/efr32xg13p*               @mnkp
+/dts/arm/silabs/efm32jg12b*               @chrta
+/dts/arm/silabs/efm32pg12b*               @chrta
 /dts/arm/silabs/efm32pg1b*                @rdmeneze
 /dts/arm/silabs/efr32mg21*                @l-alfred
 /dts/arm/silabs/efr32fg13*                @yonsch
+/dts/riscv/                               @kgugala @pgielda
 /dts/riscv/ite/                           @ite
-/dts/riscv/microchip/microchip-miv.dtsi   @galak
+/dts/riscv/microsemi/microsemi-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
 /dts/arm/armv7-a.dtsi                     @ibirnbaum
 /dts/arm/armv7-r.dtsi                     @bbolen @stephanosio
 /dts/arm/xilinx/                          @bbolen @stephanosio
-/dts/arm/renesas/rcar/                    @aaillet
+/dts/arm/renesas/                         @aaillet @pmarzin
+/dts/x86/                                 @jhedberg
 /dts/xtensa/xtensa.dtsi                   @ydamigos
 /dts/xtensa/intel/                        @dcpleung
-/dts/xtensa/espressif/                    @sylvioalves
+/dts/xtensa/espressif/                    @glaubermaroto
 /dts/xtensa/nxp/                          @iuliana-prodan @dbaluta
+/dts/sparc/                               @julius-barendt
+/dts/bindings/                            @galak
 /dts/bindings/can/                        @alexanderwachter @henrikbrixandersen
 /dts/bindings/i2c/zephyr*i2c-emul*.yaml   @sjg20
 /dts/bindings/adc/st*stm32-adc.yaml       @cybertale
-/dts/bindings/adc/*ads114s08.yaml         @benediktibk
-/dts/bindings/adc/*max111*                @benediktibk
 /dts/bindings/modem/*hl7800.yaml          @rerickson1
 /dts/bindings/serial/ns16550.yaml         @dcpleung @nashif
-/dts/bindings/counter/snps,dw-timers.yaml @pbalsundar
 /dts/bindings/wifi/*esp-at.yaml           @mniestroj
 /dts/bindings/*/*gd32*                    @nandojve
-/dts/bindings/*/*sam*                     @nandojve
 /dts/bindings/*/*npcx*                    @MulinChao @ChiHuaL
-/dts/bindings/*/*psoc6*                   @ifyall @npal-cy
-/dts/bindings/*/*infineon*cat1*           @ifyall @npal-cy
+/dts/bindings/*/*psoc6*                   @nandojve
 /dts/bindings/*/nordic*                   @anangl
 /dts/bindings/*/nxp*                      @mmahadevan108 @dleach02
-/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
 /dts/bindings/i3c/                        @dcpleung
 /dts/bindings/pm_cpu_ops/*                @carlocaione
 /dts/bindings/ethernet/*gem.yaml          @ibirnbaum
-/dts/bindings/auxdisplay/*pt6314.yaml     @xingrz
-/dts/bindings/auxdisplay/*                 @thedjnK
+/dts/posix/                               @aescolar @daor-oti
 /dts/bindings/sensor/*bme680*             @BoschSensortec
 /dts/bindings/sensor/*ina23*              @bbilas
 /dts/bindings/sensor/st*                  @avisconti
-/dts/bindings/sensor/zephyr,sensing.yaml    @lixuzha @ghu0510 @qianruh
-/dts/bindings/sensor/zephyr,sensing*.yaml   @lixuzha @ghu0510 @qianruh
-/dts/bindings/smbus/                      @finikorg
-/dts/bindings/sip_svc/                    @maheshraotm
-/dts/bindings/cpu/intel,niosv.yaml        @sweeaun
-/dts/bindings/reset/intel,socfpga-reset.yaml    @nbalabak
-/dts/bindings/gpio/*pcal64*               @benediktibk
-/dts/bindings/gpio/*bd8lb600fs*           @benediktibk
-/dts/bindings/gpio/*ads114s0x*            @benediktibk
-/dts/bindings/pwm/*max31790*              @benediktibk
-/dts/bindings/dac/*ad56*                  @benediktibk
+/dts/common/                              @galak
+/include/                                 @nashif @carlescufi @galak @MaureenHelm
+/include/zephyr/drivers/*/*litex*                @mateusz-holenko @kgugala @pgielda
+/include/zephyr/drivers/adc.h                    @anangl
+/include/zephyr/drivers/can.h                    @alexanderwachter @henrikbrixandersen
+/include/zephyr/drivers/can/                     @alexanderwachter @henrikbrixandersen
+/include/zephyr/drivers/counter.h                @nordic-krch
+/include/zephyr/drivers/dac.h                    @martinjaeger
+/include/zephyr/drivers/espi.h                   @albertofloyd @franciscomunoz @sjvasanth1
+/include/zephyr/drivers/bluetooth/               @alwa-nordic @jhedberg @Vudentz
+/include/zephyr/drivers/flash.h                  @nashif @carlescufi @galak @MaureenHelm @nvlsianpu
+/include/zephyr/drivers/i2c_emul.h               @sjg20
+/include/zephyr/drivers/i3c.h                    @dcpleung
+/include/zephyr/drivers/i3c/                     @dcpleung
+/include/zephyr/drivers/led/ht16k33.h            @henrikbrixandersen
+/include/zephyr/drivers/interrupt_controller/    @dcpleung @nashif
+/include/zephyr/drivers/interrupt_controller/gic.h @stephanosio
+/include/zephyr/drivers/modem/hl7800.h           @rerickson1
+/include/zephyr/drivers/pcie/                    @dcpleung
+/include/zephyr/drivers/hwinfo.h                 @alexanderwachter
+/include/zephyr/drivers/led.h                    @Mani-Sadhasivam
+/include/zephyr/drivers/led_strip.h              @mbolivar-nordic
+/include/zephyr/drivers/sensor.h                 @MaureenHelm
+/include/zephyr/drivers/spi.h                    @tbursztyka
+/include/zephyr/drivers/lora.h                   @Mani-Sadhasivam
+/include/zephyr/drivers/peci.h                   @albertofloyd @franciscomunoz @sjvasanth1
+/include/zephyr/drivers/pm_cpu_ops.h             @carlocaione
+/include/zephyr/drivers/pm_cpu_ops/              @carlocaione
+/include/zephyr/drivers/w1.h                     @str4t0m
+/include/zephyr/app_memory/                      @dcpleung
+/include/zephyr/arch/arc/                        @abrodkin @ruuddw @evgeniy-paltsev
+/include/zephyr/arch/arc/arch.h                  @abrodkin @ruuddw @evgeniy-paltsev
+/include/zephyr/arch/arc/v2/irq.h                @abrodkin @ruuddw @evgeniy-paltsev
+/include/zephyr/arch/arm/aarch32/                @MaureenHelm @galak @ioannisg
+/include/zephyr/arch/arm/aarch32/cortex_a_r/     @stephanosio
+/include/zephyr/arch/arm64/                      @carlocaione
+/include/zephyr/arch/arm64/cortex_r/             @povergoing
+/include/zephyr/arch/arm/aarch32/irq.h           @carlocaione
+/include/zephyr/arch/mips/                       @frantony
+/include/zephyr/arch/nios2/                      @nashif
+/include/zephyr/arch/nios2/arch.h                @nashif
+/include/zephyr/arch/posix/                      @aescolar @daor-oti
+/include/zephyr/arch/riscv/                      @kgugala @pgielda
+/include/zephyr/arch/x86/                        @jhedberg @dcpleung
+/include/zephyr/arch/common/                     @andyross @nashif
+/include/zephyr/arch/xtensa/                     @andyross @dcpleung
+/include/zephyr/arch/sparc/                      @julius-barendt
+/include/zephyr/sys/atomic.h                     @andyross
+/include/zephyr/bluetooth/                       @alwa-nordic @jhedberg @Vudentz @sjanc
+/include/zephyr/bluetooth/audio/                 @jhedberg @Vudentz @Thalley
+/include/zephyr/cache.h                          @carlocaione @andyross
+/include/zephyr/canbus/                          @alexanderwachter @henrikbrixandersen
+/include/zephyr/tracing/                         @nashif
+/include/zephyr/debug/                           @nashif
+/include/zephyr/debug/coredump.h                 @dcpleung
+/include/zephyr/debug/gdbstub.h                  @ceolin
+/include/zephyr/device.h                         @tbursztyka @nashif
+/include/zephyr/devicetree.h                     @galak
+/include/zephyr/devicetree/can.h                 @henrikbrixandersen
+/include/zephyr/dt-bindings/clock/kinetis_mcg.h  @henrikbrixandersen
+/include/zephyr/dt-bindings/clock/kinetis_scg.h  @henrikbrixandersen
+/include/zephyr/dt-bindings/ethernet/xlnx_gem.h  @ibirnbaum
+/include/zephyr/dt-bindings/pcie/                @dcpleung
+/include/zephyr/dt-bindings/pinctrl/esp*         @glaubermaroto
+/include/zephyr/dt-bindings/pwm/*it8xxx2*        @RuibinChang
+/include/zephyr/dt-bindings/usb/usb.h            @galak
+/include/zephyr/drivers/emul.h                   @sjg20
+/include/zephyr/fs/                              @nashif @nvlsianpu @de-nordic
+/include/zephyr/init.h                           @nashif @andyross
+/include/zephyr/irq.h                            @dcpleung @nashif @andyross
+/include/zephyr/irq_offload.h                    @dcpleung @nashif @andyross
+/include/zephyr/kernel.h                         @dcpleung @nashif @andyross
+/include/zephyr/kernel_version.h                 @dcpleung @nashif @andyross
+/include/zephyr/linker/app_smem*.ld              @dcpleung @nashif
+/include/zephyr/linker/                          @dcpleung @nashif @andyross
+/include/zephyr/logging/                         @nordic-krch
+/include/zephyr/lorawan/lorawan.h                @Mani-Sadhasivam
+/include/zephyr/mgmt/osdp.h                      @sidcha
+/include/zephyr/mgmt/mcumgr/                     @de-nordic
+/include/zephyr/net/                             @rlubos @tbursztyka @pfalcon
+/include/zephyr/net/buf.h                        @jhedberg @tbursztyka @pfalcon @rlubos
+/include/zephyr/net/coap*.h                      @rlubos
+/include/zephyr/net/lwm2m*.h                     @rlubos
+/include/zephyr/net/mqtt.h                       @rlubos
+/include/zephyr/net/net_pkt_filter.h             @npitre
+/include/zephyr/posix/                           @pfalcon
+/include/zephyr/pm/pm.h                          @nashif @ceolin
+/include/zephyr/drivers/ptp_clock.h              @tbursztyka
+/include/zephyr/rtio/                            @teburd
+/include/zephyr/shared_irq.h                     @dcpleung @nashif @andyross
+/include/zephyr/shell/                           @jakub-uC @nordic-krch
+/include/zephyr/shell/shell_mqtt.h               @ycsin
+/include/zephyr/sw_isr_table.h                   @dcpleung @nashif @andyross
+/include/zephyr/sd/                              @danieldegrasse
+/include/zephyr/sys_clock.h                      @dcpleung @nashif @andyross
+/include/zephyr/sys/sys_io.h                     @dcpleung @nashif @andyross
+/include/zephyr/sys/kobject.h                    @dcpleung @nashif
+/include/zephyr/toolchain.h                      @dcpleung @andyross @nashif
+/include/zephyr/toolchain/                       @dcpleung @nashif @andyross
+/include/zephyr/zephyr.h                         @dcpleung @nashif @andyross
+/kernel/                                  @dcpleung @nashif @andyross
+/lib/smf/                                 @sambhurst
+/lib/util/                                @carlescufi @jakub-uC
+/lib/util/fnmatch/                        @carlescufi @jakub-uC
+/lib/open-amp/                            @arnopo
+/lib/os/                                  @dcpleung @nashif @andyross
+/lib/os/cbprintf_packaged.c               @npitre
+/lib/posix/                               @pfalcon
+/lib/posix/getopt/                        @jakub-uC
+/subsys/portability/                      @nashif
+/lib/libc/                                @nashif
+/lib/libc/arcmwdt/                        @abrodkin @ruuddw @evgeniy-paltsev
+/misc/                                    @tejlmand
+/modules/                                 @nashif
+/modules/canopennode/                     @henrikbrixandersen
+/modules/mbedtls/                         @ceolin @d3zd3z
+/modules/hal_gigadevice/                  @nandojve
+/modules/hal_nordic/nrf_802154/           @jciupis
+/modules/trusted-firmware-m/              @microbuilder
+/kernel/device.c                          @andyross @nashif
+/kernel/idle.c                            @andyross @nashif
+/samples/                                 @nashif
+/samples/basic/minimal/                   @carlescufi
+/samples/basic/servo_motor/boards/*microbit* @jhe
+/samples/bluetooth/                       @jhedberg @Vudentz @alwa-nordic @sjanc
+/samples/compression/                     @Navin-Sankar
+/samples/drivers/can/                     @alexanderwachter @henrikbrixandersen
+/samples/drivers/clock_control_litex/     @mateusz-holenko @kgugala @pgielda
+/samples/drivers/eeprom/                  @henrikbrixandersen
+/samples/drivers/ht16k33/                 @henrikbrixandersen
+/samples/drivers/lora/                    @Mani-Sadhasivam
+/samples/subsys/lorawan/                  @Mani-Sadhasivam
+/samples/modules/canopennode/             @henrikbrixandersen
+/samples/net/                             @rlubos @tbursztyka @pfalcon
+/samples/net/cloud/tagoio_http_post/      @nandojve
+/samples/net/dns_resolve/                 @rlubos @tbursztyka @pfalcon
+/samples/net/lwm2m_client/                @rlubos
+/samples/net/mqtt_publisher/              @rlubos
+/samples/net/sockets/coap_*/              @rlubos
+/samples/net/sockets/                     @rlubos @tbursztyka @pfalcon
+/samples/sensor/                          @MaureenHelm
+/samples/shields/                         @avisconti
+/samples/subsys/logging/                  @nordic-krch @jakub-uC
+/samples/subsys/logging/syst/             @dcpleung
+/samples/subsys/shell/                    @jakub-uC @nordic-krch
+/samples/subsys/mgmt/mcumgr/smp_svr/      @aunsbjerg @nvlsianpu
+/samples/subsys/mgmt/updatehub/           @nandojve @otavio
+/samples/subsys/mgmt/osdp/                @sidcha
+/samples/subsys/usb/                      @jfischer-no
+/samples/subsys/pm/                       @nashif @ceolin
+/samples/tfm_integration/                 @microbuilder
+/samples/userspace/                       @dcpleung @nashif
+/scripts/release/bug_bash.py              @cfriedt
+/scripts/coccicheck                       @himanshujha199640 @JuliaLawall
+/scripts/coccinelle/                      @himanshujha199640 @JuliaLawall
+/scripts/coredump/                        @dcpleung
+/scripts/footprint/                       @nashif
+/scripts/kconfig/                         @ulfalizer
+/scripts/logging/dictionary/              @dcpleung
+/scripts/pylib/twister/expr_parser.py     @nashif
+/scripts/schemas/twister/                 @nashif
+/scripts/build/gen_app_partitions.py            @dcpleung @nashif
+scripts/build/gen_image_info.py           @tejlmand
+/scripts/get_maintainer.py                @nashif
+/scripts/dts/                             @mbolivar-nordic @galak
+/scripts/release/                         @nashif
+/scripts/ci/                              @nashif
+/arch/x86/gen_gdt.py                      @dcpleung @nashif
+/arch/x86/gen_idt.py                      @dcpleung @nashif
+/scripts/build/gen_kobject_list.py        @dcpleung @nashif
+/scripts/build/gen_kobject_placeholders.py      @dcpleung
+/scripts/build/gen_syscalls.py            @dcpleung @nashif
+/scripts/list_boards.py                   @mbolivar-nordic
+/scripts/build/process_gperf.py           @dcpleung @nashif
+/scripts/build/gen_relocate_app.py        @dcpleung
+/scripts/requirements*.txt                @mbolivar-nordic @galak @nashif
+/scripts/tests/twister/                   @aasthagr
+/scripts/tests/build/test_subfolder_list.py @rmstoi
+/scripts/tracing/                         @nashif
+/scripts/pylib/twister/                   @nashif
+/scripts/twister                          @nashif
+/scripts/series-push-hook.sh              @erwango
+/scripts/utils/pinctrl_nrf_migrate.py     @gmarull
+/scripts/west_commands/                   @mbolivar-nordic
+/scripts/west_commands/blobs.py           @carlescufi
+/scripts/west_commands/fetchers/          @carlescufi
+/scripts/west_commands/runners/gd32isp.py @mbolivar-nordic @nandojve
+/scripts/west_commands/tests/test_gd32isp.py @mbolivar-nordic @nandojve
+/scripts/west-commands.yml                @mbolivar-nordic
+/scripts/zephyr_module.py                 @tejlmand
+/scripts/build/uf2conv.py                 @petejohanson
+/scripts/build/user_wordsize.py           @cfriedt
+/scripts/valgrind.supp                    @aescolar @daor-oti
+/share/sysbuild/                          @tejlmand
+/share/zephyr-package/                    @tejlmand
+/share/zephyrunittest-package/            @tejlmand
+/subsys/bluetooth/                        @alwa-nordic @jhedberg @Vudentz
+/subsys/bluetooth/audio/                  @jhedberg @Vudentz @Thalley @sjanc
+/subsys/bluetooth/controller/             @carlescufi @cvinayak @thoh-ot @kruithofa
+/subsys/bluetooth/host/                   @alwa-nordic @jhedberg @Vudentz @sjanc
+/subsys/bluetooth/mesh/                   @jhedberg @PavelVPV @Vudentz @LingaoM
+/subsys/canbus/                           @alexanderwachter @henrikbrixandersen
+/subsys/debug/                            @nashif
+/subsys/debug/coredump/                   @dcpleung
+/subsys/debug/gdbstub/                    @ceolin
+/subsys/debug/gdbstub.c                   @ceolin
+/subsys/dfu/                              @nvlsianpu
+/subsys/disk/                             @jfischer-no
+/subsys/tracing/                          @nashif
+/subsys/debug/asan_hacks.c                @aescolar @daor-oti
+/subsys/demand_paging/                    @dcpleung @nashif
+/subsys/emul/                             @sjg20
+/subsys/fb/                               @jfischer-no
+/subsys/fs/                               @nashif
+/subsys/fs/fcb/                           @nvlsianpu
+/subsys/fs/nvs/                           @Laczen
+/subsys/ipc/                              @carlocaione
+/subsys/logging/                          @nordic-krch
+/subsys/logging/log_backend_net.c         @nordic-krch @rlubos
+/subsys/lorawan/                          @Mani-Sadhasivam
+/subsys/mgmt/ec_host_cmd/                 @jettr
+/subsys/mgmt/mcumgr/                      @carlescufi @nvlsianpu @de-nordic
+/subsys/mgmt/hawkbit/                     @Navin-Sankar
+/subsys/mgmt/mcumgr/smp_udp.c             @aunsbjerg
+/subsys/mgmt/updatehub/                   @nandojve @otavio
+/subsys/mgmt/osdp/                        @sidcha
+/subsys/modbus/                           @jfischer-no
+/subsys/net/buf.c                         @jhedberg @tbursztyka @pfalcon @rlubos
+/subsys/net/ip/                           @rlubos @tbursztyka @pfalcon
+/subsys/net/lib/                          @rlubos @tbursztyka @pfalcon
+/subsys/net/lib/dns/                      @rlubos @tbursztyka @pfalcon @cfriedt
+/subsys/net/lib/lwm2m/                    @rlubos
+/subsys/net/lib/config/                   @rlubos @tbursztyka @pfalcon
+/subsys/net/lib/mqtt/                     @rlubos
+/subsys/net/lib/coap/                     @rlubos
+/subsys/net/lib/sockets/socketpair.c      @cfriedt
+/subsys/net/lib/sockets/                  @rlubos @tbursztyka @pfalcon
+/subsys/net/lib/tls_credentials/          @rlubos
+/subsys/net/l2/                           @rlubos @tbursztyka
+/subsys/net/l2/canbus/                    @alexanderwachter
+/subsys/net/pkt_filter/                   @npitre
+/subsys/net/*/openthread/                 @rlubos
+/subsys/pm/                               @nashif @ceolin
+/subsys/random/                           @dleach02
+/subsys/settings/                         @nvlsianpu
+/subsys/shell/                            @jakub-uC @nordic-krch
+/subsys/shell/backends/shell_mqtt.c       @ycsin
+/subsys/stats/                            @nvlsianpu
+/subsys/storage/                          @nvlsianpu
+/subsys/sd/                               @danieldegrasse
+/subsys/task_wdt/                         @martinjaeger
+/subsys/testsuite/                        @nashif
+/subsys/testsuite/ztest/*/ztress*         @nordic-krch
+/subsys/timing/                           @nashif @dcpleung
+/subsys/usb/                              @jfischer-no
+/subsys/usb/device/class/dfu/usb_dfu.c    @nvlsianpu
+/tests/                                   @nashif
+/tests/arch/arm/                          @ioannisg @stephanosio
+/tests/benchmarks/cmsis_dsp/              @stephanosio
+/tests/boards/native_posix/               @aescolar @daor-oti
+/tests/bluetooth/                         @alwa-nordic @jhedberg @Vudentz @sjanc
+/tests/bluetooth/controller/              @cvinayak @thoh-ot @kruithofa @erbr-ot @sjanc @ppryga
+/tests/bluetooth/bsim_bt/                 @alwa-nordic @jhedberg @Vudentz @wopu-ot
+/tests/bluetooth/bsim_bt/bsim_test_audio/ @jhedberg @Vudentz @wopu-ot @Thalley
+/tests/bluetooth/tester/                  @alwa-nordic @jhedberg @Vudentz @sjanc
+/tests/posix/                             @pfalcon
+/tests/crypto/                            @ceolin
+/tests/crypto/mbedtls/                    @nashif @ceolin @d3zd3z
+/tests/drivers/can/                       @alexanderwachter @henrikbrixandersen
+/tests/drivers/counter/                   @nordic-krch
+/tests/drivers/eeprom/                    @henrikbrixandersen @sjg20
+/tests/drivers/flash_simulator/           @nvlsianpu
+/tests/drivers/gpio/                      @mnkp
+/tests/drivers/hwinfo/                    @alexanderwachter
+/tests/drivers/spi/                       @tbursztyka
+/tests/drivers/uart/uart_async_api/       @Mierunski
+/tests/drivers/w1/                        @str4t0m
+/tests/kernel/                            @dcpleung @andyross @nashif
+/tests/lib/                               @nashif
+/tests/lib/cmsis_dsp/                     @stephanosio
+/tests/net/                               @rlubos @tbursztyka @pfalcon
+/tests/net/buf/                           @jhedberg @tbursztyka @pfalcon
+/tests/net/lib/                           @rlubos @tbursztyka @pfalcon
+/tests/net/lib/http_header_fields/        @rlubos @tbursztyka
+/tests/net/lib/mqtt_packet/               @rlubos
+/tests/net/lib/coap/                      @rlubos
+/tests/net/npf/                           @npitre
+/tests/net/socket/socketpair/             @cfriedt
+/tests/net/socket/                        @rlubos @tbursztyka @pfalcon
+/tests/subsys/debug/coredump/             @dcpleung
+/tests/subsys/fs/                         @nashif @nvlsianpu @de-nordic
+/tests/subsys/mgmt/mcumgr/                @de-nordic
+/tests/subsys/sd/                         @danieldegrasse
+/tests/subsys/rtio/                       @teburd
+/tests/subsys/settings/                   @nvlsianpu
+/tests/subsys/shell/                      @jakub-uC @nordic-krch
+# Get all docs reviewed
+*.rst                                     @nashif
+/doc/kernel/                              @andyross @nashif
+*posix*.rst                               @aescolar @daor-oti

CODE_OF_CONDUCT.md

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

Kconfig.zephyr

@@ -2,10 +2,8 @@
 
 # Copyright (c) 2014-2015 Wind River Systems, Inc.
 # Copyright (c) 2016 Intel Corporation
-# Copyright (c) 2023 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-osource "${APPLICATION_SOURCE_DIR}/VERSION"
 
 # Include Kconfig.defconfig files first so that they can override defaults and
 # other symbol/choice properties by adding extra symbol/choice definitions.
@@ -21,11 +19,12 @@ osource "$(KCONFIG_BINARY_DIR)/Kconfig.shield.defconfig"
 # This loads Zephyr base shield defconfigs
 source "boards/shields/*/Kconfig.defconfig"
 
-osource "$(BOARD_DIR)/Kconfig.defconfig"
-
-# This loads Zephyr specific SoC root defconfigs
-source "$(KCONFIG_BINARY_DIR)/soc/Kconfig.defconfig"
+source "$(BOARD_DIR)/Kconfig.defconfig"
 
+# This loads custom SoC root defconfigs
+osource "$(KCONFIG_BINARY_DIR)/Kconfig.soc.defconfig"
+# This loads Zephyr base SoC root defconfigs
+osource "soc/$(ARCH)/*/Kconfig.defconfig"
 # This loads the toolchain defconfigs
 osource "$(TOOLCHAIN_KCONFIG_DIR)/Kconfig.defconfig"
 # This loads the testsuite defconfig
@@ -55,7 +54,7 @@ menu "Build and Link Features"
 
 menu "Linker Options"
 
-choice LINKER_ORPHAN_CONFIGURATION
+choice
 	prompt "Linker Orphan Section Handling"
 	default LINKER_ORPHAN_SECTION_WARN
 
@@ -140,17 +139,6 @@ config ROM_START_OFFSET
 	  alignment requirements on most ARM targets, although some targets
 	  may require smaller or larger values.
 
-config ROM_END_OFFSET
-	hex "ROM end offset"
-	default 0
-	help
-	  If non-zero, this option reduces the maximum size that the Zephyr image is allowed to
-	  occupy, this is to allow for additional image storage which can be created and used by
-	  other systems such as bootloaders (for MCUboot, this would include the image swap
-	  fields and TLV storage at the end of the image).
-
-	  If unsure, leave at the default value 0.
-
 config LD_LINKER_SCRIPT_SUPPORTED
 	bool
 	default y
@@ -179,6 +167,13 @@ config CMAKE_LINKER_GENERATOR
 
 endchoice
 
+config LLVM_USE_LD
+	bool "LLVM use ld linker"
+	depends on "${ZEPHYR_TOOLCHAIN_VARIANT}" = "llvm"
+	default y
+	help
+	  Use binutils ld linker instead of LLVM built-in lld linker.
+
 config HAVE_CUSTOM_LINKER_SCRIPT
 	bool "Custom linker script provided"
 	help
@@ -271,214 +266,28 @@ config LINKER_GENERIC_SECTIONS_PRESENT_AT_BOOT
 
 	  If unsure, say Y.
 
-config LINKER_LAST_SECTION_ID
-	bool "Last section identifier"
-	default y
-	depends on ARM || ARM64 || RISCV
-	help
-	  If enabled, the last section will contain an identifier.
-	  This ensures that the '_flash_used' linker symbol will always be
-	  correctly calculated, even in cases where the location counter may
-	  have been incremented for alignment purposes but no data is placed
-	  after alignment.
-
-	  Note: in cases where the flash is fully used, for example application
-	  specific data is written at the end of the flash area, then writing a
-	  last section identifier may cause rom region overflow.
-	  In such cases this setting should be disabled.
-
-config LINKER_LAST_SECTION_ID_PATTERN
-	hex "Last section identifier pattern"
-	default "0xE015E015"
-	depends on LINKER_LAST_SECTION_ID
-	help
-	  Pattern to fill into last section as identifier.
-	  Default pattern is 0xE015 (end of last section), but any pattern can
-	  be used.
-	  The size of the pattern must not exceed 4 bytes.
-
-config LINKER_USE_NO_RELAX
-	bool
-	help
-	  Hidden symbol to allow features to force the use of no relax.
-
-config LINKER_USE_RELAX
-	bool "Linker optimization of call addressing"
-	depends on !LINKER_USE_NO_RELAX
-	default y
-	help
-	  This option performs global optimizations that become possible when the linker resolves
-	  addressing in the program, such as relaxing address modes and synthesizing new
-	  instructions in the output object file. For ld and lld, this enables `--relax`.
-	  On platforms where this is not supported, `--relax' is accepted, but ignored.
-	  Disabling it can reduce performance, as the linker is no longer able to substiture long /
-	  in-effective jump calls to shorter / more effective instructions.
-
 endmenu # "Linker Sections"
 
-config LINKER_ITERABLE_SUBALIGN
-	int
-	default 8 if 64BIT
-	default 4
-	help
-	  Hidden option for the default subalignment of iterable sections.
-
-config LINKER_DEVNULL_SUPPORT
-	bool
-	default y if CPU_CORTEX_M || (RISCV && !64BIT)
-
-config LINKER_DEVNULL_MEMORY
-	bool "Devnull region"
-	depends on LINKER_DEVNULL_SUPPORT
-	help
-	  Devnull region is created. It is stripped from final binary but remains
-	  in byproduct elf file.
-
-config LINKER_DEVNULL_MEMORY_SIZE
-	int "Devnull region size"
-	depends on LINKER_DEVNULL_MEMORY
-	default 262144
-	help
-	  Size can be adjusted so it fits all data placed in that region.
-
 endmenu
 
 menu "Compiler Options"
 
-config REQUIRES_STD_C99
-	bool
-	help
-	  Hidden option to select compiler support C99 standard or higher.
-
-config REQUIRES_STD_C11
-	bool
-	select REQUIRES_STD_C99
-	help
-	  Hidden option to select compiler support C11 standard or higher.
-
-config REQUIRES_STD_C17
-	bool
-	select REQUIRES_STD_C11
-	help
-	  Hidden option to select compiler support C17 standard or higher.
-
-config REQUIRES_STD_C23
-	bool
-	select REQUIRES_STD_C17
-	help
-	  Hidden option to select compiler support C23 standard or higher.
-
-choice STD_C
-	prompt "C Standard"
-	default STD_C23 if REQUIRES_STD_C23
-	default STD_C17 if REQUIRES_STD_C17
-	default STD_C11 if REQUIRES_STD_C11
-	default STD_C99
-	help
-	  C Standards.
-
-config STD_C90
-	bool "C90"
-	depends on !REQUIRES_STD_C99
-	help
-	  1989 C standard as completed in 1989 and ratified by ISO/IEC
-	  as ISO/IEC 9899:1990. This version is known as "ANSI C".
-
-config STD_C99
-	bool "C99"
-	depends on !REQUIRES_STD_C11
-	help
-	  1999 C standard.
-
-config STD_C11
-	bool "C11"
-	depends on !REQUIRES_STD_C17
-	help
-	  2011 C standard.
-
-config STD_C17
-	bool "C17"
-	depends on !REQUIRES_STD_C23
-	help
-	  2017 C standard, addresses defects in C11 without introducing
-	  new language features.
-
-config STD_C23
-	bool "C23"
-	help
-	  2023 C standard.
-
-endchoice
-
-config TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS
-	bool
-	default y if "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr"
-	help
-	  Hidden option to signal that toolchain supports GNU Extensions.
-
-config GNU_C_EXTENSIONS
-	bool "GNU C Extensions"
-	depends on TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS
-	help
-	  Enable GNU C Extensions. GNU C provides several language features
-	  not found in ISO standard C.
-
 config CODING_GUIDELINE_CHECK
 	bool "Enforce coding guideline rules"
 	help
 	  Use available compiler flags to check coding guideline rules during
 	  the build.
 
-config NATIVE_LIBC
-	bool
-	select FULL_LIBC_SUPPORTED
-	help
-	  Zephyr will use the host system C library.
-
-config NATIVE_LIBCPP
-	bool
-	select FULL_LIBCPP_SUPPORTED
-	help
-	  Zephyr will use the host system C++ library
-
-config NATIVE_BUILD
-	bool
-	select NATIVE_LIBC if EXTERNAL_LIBC
-	select NATIVE_LIBCPP if EXTERNAL_LIBCPP
-	help
-	  Zephyr will be built targeting the host system for debug and
-	  development purposes.
-
 config NATIVE_APPLICATION
-	bool
-	default y if ARCH_POSIX
-	depends on !NATIVE_LIBRARY
-	select NATIVE_BUILD
+	bool "Build as a native host application"
 	help
 	  Build as a native application that can run on the host and using
 	  resources and libraries provided by the host.
 
-config NATIVE_LIBRARY
-	bool
-	select NATIVE_BUILD
-	help
-	  Build as a prelinked library for the native host target.
-	  This library can later be built into an executable for the host.
-
-config COMPILER_FREESTANDING
-	bool "Build in a freestanding compiler mode"
-	help
-	  Configure the compiler to operate in freestanding mode according to
-	  the C and C++ language specifications. Freestanding mode reduces the
-	  requirements of the compiler and language environment, which can
-	  negatively impact the ability for the compiler to detect errors and
-	  perform optimizations.
-
 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
@@ -491,12 +300,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
@@ -515,76 +318,14 @@ config NO_OPTIMIZATIONS
 	  Compiler optimizations will be set to -O0 independently of other
 	  options.
 
-	  Selecting this option will likely require manual tuning of the
-	  default stack sizes in order to avoid stack overflows.
 endchoice
 
-config LTO
-	bool "Link Time Optimization [EXPERIMENTAL]"
-	depends on !(GEN_ISR_TABLES || GEN_IRQ_VECTOR_TABLE) || ISR_TABLES_LOCAL_DECLARATION
-	depends on !NATIVE_LIBRARY
-	depends on !CODE_DATA_RELOCATION
-	select EXPERIMENTAL
-	help
-	  This option enables Link Time Optimization.
-
-config COMPILER_WARNINGS_AS_ERRORS
-	bool "Treat warnings as errors"
-	help
-	  Turn on "warning as error" toolchain flags
-
-config COMPILER_SAVE_TEMPS
-	bool "Save temporary object files"
-	help
-	  Instruct the compiler to save the temporary intermediate files
-	  permanently. These can be useful for troubleshooting build issues.
-
-config COMPILER_TRACK_MACRO_EXPANSION
-	bool "Track macro expansion"
-	default y
-	help
-	  When enabled, locations of tokens across macro expansions will be
-	  tracked. Disabling this option may be useful to debug long macro
-	  expansion chains.
-
 config COMPILER_COLOR_DIAGNOSTICS
 	bool "Colored diagnostics"
 	default y
 	help
 	  Compiler diagnostic messages are colorized.
 
-choice COMPILER_SECURITY_FORTIFY
-	prompt "Detect buffer overflows in libc calls"
-	default FORTIFY_SOURCE_NONE if NO_OPTIMIZATIONS || MINIMAL_LIBC || NATIVE_BUILD
-	default FORTIFY_SOURCE_COMPILE_TIME
-	help
-	  Buffer overflow checking in libc calls. Supported by Clang and
-	  GCC when using Picolibc or Newlib. Requires compiler optimization
-	  to be enabled.
-
-config FORTIFY_SOURCE_NONE
-	bool "No detection"
-	help
-	  Disables both compile-time and run-time checking.
-
-config FORTIFY_SOURCE_COMPILE_TIME
-	bool "Compile-time detection"
-	help
-	  Enables only compile-time checking. Compile-time checking
-	  doesn't increase executable size or reduce performance, it
-	  limits checking to what can be done with information available
-	  at compile time.
-
-config FORTIFY_SOURCE_RUN_TIME
-	bool "Compile-time and run-time detection"
-	help
-	  Enables both compile-time and run-time checking. Run-time
-	  checking increases coverage at the expense of additional code,
-	  and means that applications will raise a runtime exception
-	  when buffer overflow is detected.
-
-endchoice
-
 config COMPILER_OPT
 	string "Custom compiler options"
 	help
@@ -612,17 +353,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
@@ -648,6 +389,7 @@ config OUTPUT_SYMBOLS
 
 config OUTPUT_DISASSEMBLY
 	bool "Create a disassembly file"
+	default y
 	help
 	  Create an .lst file with the assembly listing of the firmware.
 
@@ -659,17 +401,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
@@ -688,8 +419,7 @@ config CLEANUP_INTERMEDIATE_FILES
 	bool "Remove all intermediate files"
 	help
 	  Delete intermediate files to save space and cleanup clutter resulting
-	  from the build process. Note this breaks incremental builds, west spdx
-	  (Software Bill of Material generation), and maybe others.
+	  from the build process.
 
 config BUILD_NO_GAP_FILL
 	bool "Don't fill gaps in generated hex/bin/s19 files."
@@ -745,10 +475,10 @@ if BUILD_OUTPUT_UF2
 
 config BUILD_OUTPUT_UF2_FAMILY_ID
 	string "UF2 device family ID"
-	default "0x1c5f21b0" if SOC_SERIES_ESP32
+	default "0x1c5f21b0" if SOC_ESP32
 	default "0x621e937a" if SOC_NRF52833_QIAA
 	default "0xada52840" if SOC_NRF52840_QIAA
-	default "0x4fb2d5bd" if SOC_SERIES_IMXRT10XX || SOC_SERIES_IMXRT11XX
+	default "0x4fb2d5bd" if SOC_SERIES_IMX_RT
 	default "0x2abc77ec" if SOC_SERIES_LPC55XXX
 	default "0xe48bff56" if SOC_SERIES_RP2XXX
 	default "0x68ed2b88" if SOC_SERIES_SAMD21
@@ -766,7 +496,7 @@ config BUILD_OUTPUT_UF2_FAMILY_ID
 	default "0x04240bdf" if SOC_SERIES_STM32L5X
 	default "0x70d16653" if SOC_SERIES_STM32WBX
 	default "0x5ee21072" if SOC_STM32F103XE
-	default "0x57755a57" if SOC_SERIES_STM32F4X && (!SOC_STM32F407XE) && (!SOC_STM32F407XG)
+	default "0x57755a57" if SOC_STM32F401XC || SOC_STM32F401XE
 	default "0x6d0922fa" if SOC_STM32F407XE
 	default "0x8fb060fe" if SOC_STM32F407XG
 	help
@@ -791,11 +521,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
@@ -831,15 +556,6 @@ config BUILD_OUTPUT_INFO_HEADER
 	  - VMA address of each segment
 	  - Size of each segment
 
-config BUILD_ALIGN_LMA
-	bool "Align LMA in output image"
-	default y if BUILD_OUTPUT_ADJUST_LMA!=""
-	help
-	  Ensure that the LMA for each section in the output image respects
-	  the alignment requirements of that section. This is required for
-	  some tooling, such as objcopy, to be able to adjust the LMA of the
-	  ELF file.
-
 config APPLICATION_DEFINED_SYSCALL
 	bool "Scan application folder for any syscall definition"
 	help
@@ -887,42 +603,6 @@ config BUILD_OUTPUT_META_STATE_PROPAGATE
 	           defined when `west update` was run the last time (`manifest-rev`).
 	           The off state is only present if a west workspace is found.
 
-config BUILD_OUTPUT_STRIP_PATHS
-	bool "Strip absolute paths from binaries"
-	default y
-	help
-	  If the compiler supports it, strip the ${ZEPHYR_BASE} prefix from the
-	  __FILE__ macro used in __ASSERT*, in the
-	  .noinit."/home/joe/zephyr/fu/bar.c" section names and in any
-	  application code.
-	  This saves some memory, stops leaking user locations in binaries, makes
-	  failure logs more deterministic and most importantly makes builds more
-	  deterministic.
-	  Debuggers usually have a path mapping feature to ensure the files are
-	  still found.
-
-config CHECK_INIT_PRIORITIES
-	bool "Build time initialization priorities check"
-	default y
-	# If we are building a native_simulator target, we can only check the init priorities
-	# if we are building the final output but we are not assembling several images together
-	depends on !(NATIVE_LIBRARY && (!BUILD_OUTPUT_EXE || NATIVE_SIMULATOR_EXTRA_IMAGE_PATHS != ""))
-	depends on "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "armclang"
-	help
-	  Check the build for initialization priority issues by comparing the
-	  initialization priority in the build with the device dependency
-	  derived from the devicetree definition.
-
-	  Fails the build on priority errors (dependent devices, inverted
-	  priority).
-
-config EMIT_ALL_SYSCALLS
-	bool "Emit all possible syscalls in the tree"
-	help
-	  This tells the build system to emit all possible syscalls found
-	  in the tree, instead of only those syscalls associated with enabled
-	  drivers and subsystems.
-
 endmenu
 
 config DEPRECATED
@@ -988,8 +668,8 @@ config IS_BOOTLOADER
 	  a separate Zephyr image payload.
 
 config BOOTLOADER_SRAM_SIZE
-	int "SRAM reserved for bootloader [DEPRECATED]"
-	default 0
+	int "SRAM reserved for bootloader"
+	default 16
 	depends on !XIP || IS_BOOTLOADER
 	depends on ARM || XTENSA
 	help
@@ -999,19 +679,126 @@ config BOOTLOADER_SRAM_SIZE
 	  - Zephyr is a !XIP image, which implicitly assumes existence of a
 	  bootloader that loads the Zephyr !XIP image onto SRAM.
 
-	  This option is deprecated, users should transition to using DTS to set this, if needed.
-	  To be removed after Zephyr 3.7 release.
-
-config BOOTLOADER_SRAM_SIZE_DEPRECATED
+config MCUBOOT
 	bool
-	default y
-	select DEPRECATED
-	depends on BOOTLOADER_SRAM_SIZE != 0
-	depends on !XIP || IS_BOOTLOADER
-	depends on ARM || XTENSA
 	help
-	  Non-prompt symbol to indicate that the deprecated BOOTLOADER_SRAM_SIZE Kconfig has a
-	  non-0 value. Please transition to using devicetree.
+	  Hidden option used to indicate that the current image is MCUBoot
+
+config BOOTLOADER_MCUBOOT
+	bool "MCUboot bootloader support"
+	select USE_DT_CODE_PARTITION
+	imply INIT_ARCH_HW_AT_BOOT if ARCH_SUPPORTS_ARCH_HW_INIT
+	depends on !MCUBOOT
+	help
+	  This option signifies that the target uses MCUboot as a bootloader,
+	  or in other words that the image is to be chain-loaded by MCUboot.
+	  This sets several required build system and Device Tree options in
+	  order for the image generated to be bootable using the MCUboot open
+	  source bootloader. Currently this includes:
+
+	    * Setting ROM_START_OFFSET to a default value that allows space
+	      for the MCUboot image header
+	    * Activating SW_VECTOR_RELAY_CLIENT on Cortex-M0
+	      (or Armv8-M baseline) targets with no built-in vector relocation
+	      mechanisms
+
+	  By default, this option instructs Zephyr to initialize the core
+	  architecture HW registers during boot, when this is supported by
+	  the application. This removes the need by MCUboot to reset
+	  the core registers' state itself.
+
+if BOOTLOADER_MCUBOOT
+
+config MCUBOOT_SIGNATURE_KEY_FILE
+	string "Path to the mcuboot signing key file"
+	default ""
+	depends on !MCUBOOT_GENERATE_UNSIGNED_IMAGE
+	help
+	  The file contains a key pair whose public half is verified
+	  by your target's MCUboot image. The file is in PEM format.
+
+	  If set to a non-empty value, the build system tries to
+	  sign the final binaries using a 'west sign -t imgtool' command.
+	  The signed binaries are placed in the build directory
+	  at zephyr/zephyr.signed.bin and zephyr/zephyr.signed.hex.
+
+	  The file names can be customized with CONFIG_KERNEL_BIN_NAME.
+	  The existence of bin and hex files depends on CONFIG_BUILD_OUTPUT_BIN
+	  and CONFIG_BUILD_OUTPUT_HEX.
+
+	  This option should contain a path to the same file as the
+	  BOOT_SIGNATURE_KEY_FILE option in your MCUboot .config. The path
+	  may be absolute or relative to the west workspace topdir. (The MCUboot
+	  config option is used for the MCUboot bootloader image; this option is
+	  for your application which is to be loaded by MCUboot. The MCUboot
+	  config option can be a relative path from the MCUboot repository
+	  root.)
+
+	  If left empty, you must sign the Zephyr binaries manually.
+
+config MCUBOOT_ENCRYPTION_KEY_FILE
+	string "Path to the mcuboot encryption key file"
+	default ""
+	depends on MCUBOOT_SIGNATURE_KEY_FILE != ""
+	help
+	  The file contains the public key that is used to encrypt the
+	  ephemeral key that encrypts the image. The corresponding
+	  private key is hard coded in the MCUboot source code and is
+	  used to decrypt the ephemeral key that is embedded in the
+	  image. The file is in PEM format.
+
+	  If set to a non-empty value, the build system tries to
+	  sign and encrypt the final binaries using a 'west sign -t imgtool'
+	  command. The binaries are placed in the build directory at
+	  zephyr/zephyr.signed.encrypted.bin and
+	  zephyr/zephyr.signed.encrypted.hex.
+
+	  The file names can be customized with CONFIG_KERNEL_BIN_NAME.
+	  The existence of bin and hex files depends on CONFIG_BUILD_OUTPUT_BIN
+	  and CONFIG_BUILD_OUTPUT_HEX.
+
+	  This option should either be an absolute path or a path relative to
+	  the west workspace topdir.
+	  Example: './bootloader/mcuboot/enc-rsa2048-pub.pem'
+
+	  If left empty, you must encrypt the Zephyr binaries manually.
+
+config MCUBOOT_EXTRA_IMGTOOL_ARGS
+	string "Extra arguments to pass to imgtool"
+	default ""
+	help
+	  If CONFIG_MCUBOOT_SIGNATURE_KEY_FILE is a non-empty string,
+	  you can use this option to pass extra options to imgtool.
+	  For example, you could set this to "--version 1.2".
+
+config MCUBOOT_GENERATE_UNSIGNED_IMAGE
+	bool "Generate unsigned binary image bootable with MCUboot"
+	help
+	  Enabling this configuration allows automatic unsigned binary image
+	  generation when MCUboot signing key is not provided,
+	  i.e., MCUBOOT_SIGNATURE_KEY_FILE is left empty.
+
+config MCUBOOT_GENERATE_CONFIRMED_IMAGE
+	bool "Also generate a padded, confirmed image"
+	help
+	  The signed, padded, and confirmed binaries are placed in the build
+	  directory at zephyr/zephyr.signed.confirmed.bin and
+	  zephyr/zephyr.signed.confirmed.hex.
+
+	  The file names can be customized with CONFIG_KERNEL_BIN_NAME.
+	  The existence of bin and hex files depends on CONFIG_BUILD_OUTPUT_BIN
+	  and CONFIG_BUILD_OUTPUT_HEX.
+
+endif # BOOTLOADER_MCUBOOT
+
+config BOOTLOADER_ESP_IDF
+	bool "ESP-IDF bootloader support"
+	depends on (SOC_ESP32 || SOC_ESP32S2 || SOC_ESP32C3) && !BOOTLOADER_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"
@@ -1058,17 +845,22 @@ endmenu
 
 menu "Compatibility"
 
-config LEGACY_GENERATED_INCLUDE_PATH
-	bool "Legacy include path for generated headers"
+config COMPAT_INCLUDES
+	bool "Suppress warnings when using header shims"
 	default y
 	help
-	  Allow applications and libraries to use the Zephyr legacy include
-	  path for the generated headers which does not use the `zephyr/` prefix.
-
-	  From now on, i.e., the preferred way to include the `version.h` header is to
-	  use <zephyr/version.h>, this Kconfig is currently enabled by default so that
-	  user applications won't immediately fail to compile.
-
-	  This Kconfig will be deprecated and eventually removed in the future releases.
+	  Suppress any warnings from the pre-processor when including
+	  deprecated header files.
 
 endmenu
+
+config LEGACY_INCLUDE_PATH
+	bool "Allow for the legacy include paths (without the zephyr/ prefix) (DEPRECATED)"
+	select DEPRECATED
+	help
+	  DEPRECATED: Allow applications and libraries to use the Zephyr legacy
+	  include path which does not use the zephyr/ prefix. For example, the
+	  preferred way to include a Zephyr header is to use <zephyr/kernel.h>,
+	  but enabling CONFIG_LEGACY_INCLUDE_PATH will allow developers to use
+	  <kernel.h> instead. This (without the zephyr/ prefix) is deprecated
+	  and should be avoided. Eventually, it will not be supported.

README.rst

@@ -2,11 +2,7 @@
 
    <a href="https://www.zephyrproject.org">
      <p align="center">
-       <picture>
-         <source media="(prefers-color-scheme: dark)" srcset="doc/_static/images/logo-readme-dark.svg">
-         <source media="(prefers-color-scheme: light)" srcset="doc/_static/images/logo-readme-light.svg">
-         <img src="doc/_static/images/logo-readme-light.svg">
-       </picture>
+       <img src="doc/_static/images/logo-readme.svg">
      </p>
    </a>
 
@@ -54,59 +50,39 @@ Resources
 
 Here's a quick summary of resources to help you find your way around:
 
-Getting Started
----------------
+* **Help**: `Asking for Help Tips`_
+* **Documentation**: http://docs.zephyrproject.org (`Getting Started Guide`_)
+* **Source Code**: https://github.com/zephyrproject-rtos/zephyr is the main
+  repository; https://elixir.bootlin.com/zephyr/latest/source contains a
+  searchable index
+* **Releases**: https://github.com/zephyrproject-rtos/zephyr/releases
+* **Samples and example code**: see `Sample and Demo Code Examples`_
+* **Mailing Lists**: users@lists.zephyrproject.org and
+  devel@lists.zephyrproject.org are the main user and developer mailing lists,
+  respectively. You can join the developer's list and search its archives at
+  `Zephyr Development mailing list`_. The other `Zephyr mailing list
+  subgroups`_ have their own archives and sign-up pages.
+* **Nightly CI Build Status**: https://lists.zephyrproject.org/g/builds
+  The builds@lists.zephyrproject.org mailing list archives the CI nightly build results.
+* **Chat**: Real-time chat happens in Zephyr's Discord Server. Use
+  this `Discord Invite`_ to register.
+* **Contributing**: see the `Contribution Guide`_
+* **Wiki**: `Zephyr GitHub wiki`_
+* **Issues**: https://github.com/zephyrproject-rtos/zephyr/issues
+* **Security Issues**: Email vulnerabilities@zephyrproject.org to report
+  security issues; also see our `Security`_ documentation. Security issues are
+  tracked separately at https://zephyrprojectsec.atlassian.net.
+* **Zephyr Project Website**: https://zephyrproject.org
 
-  | 📖 `Zephyr Documentation`_
-  | 🚀 `Getting Started Guide`_
-  | 🙋🏽 `Tips when asking for help`_
-  | 💻 `Code samples`_
-
-Code and Development
---------------------
-
-  | 🌐 `Source Code Repository`_
-  | 📦 `Releases`_
-  | 🤝 `Contribution Guide`_
-
-Community and Support
----------------------
-
-  | 💬 `Discord Server`_ for real-time community discussions
-  | 📧 `User mailing list (users@lists.zephyrproject.org)`_
-  | 📧 `Developer mailing list (devel@lists.zephyrproject.org)`_
-  | 📬 `Other project mailing lists`_
-  | 📚 `Project Wiki`_
-
-Issue Tracking and Security
----------------------------
-
-  | 🐛 `GitHub Issues`_
-  | 🔒 `Security documentation`_
-  | 🛡️ `Security Advisories Repository`_
-  | ⚠️ Report security vulnerabilities at vulnerabilities@zephyrproject.org
-
-Additional Resources
---------------------
-  | 🌐 `Zephyr Project Website`_
-  | 📺 `Zephyr Tech Talks`_
-
-.. _Zephyr Project Website: https://www.zephyrproject.org
-.. _Discord Server: https://chat.zephyrproject.org
-.. _supported boards: https://docs.zephyrproject.org/latest/boards/index.html
-.. _Zephyr Documentation: https://docs.zephyrproject.org
-.. _Introduction to Zephyr: https://docs.zephyrproject.org/latest/introduction/index.html
-.. _Getting Started Guide: https://docs.zephyrproject.org/latest/develop/getting_started/index.html
-.. _Contribution Guide: https://docs.zephyrproject.org/latest/contribute/index.html
-.. _Source Code Repository: https://github.com/zephyrproject-rtos/zephyr
-.. _GitHub Issues: https://github.com/zephyrproject-rtos/zephyr/issues
-.. _Releases: https://github.com/zephyrproject-rtos/zephyr/releases
-.. _Project Wiki: https://github.com/zephyrproject-rtos/zephyr/wiki
-.. _User mailing list (users@lists.zephyrproject.org): https://lists.zephyrproject.org/g/users
-.. _Developer mailing list (devel@lists.zephyrproject.org): https://lists.zephyrproject.org/g/devel
-.. _Other project mailing lists: https://lists.zephyrproject.org/g/main/subgroups
-.. _Code samples: https://docs.zephyrproject.org/latest/samples/index.html
-.. _Security documentation: https://docs.zephyrproject.org/latest/security/index.html
-.. _Security Advisories Repository: https://github.com/zephyrproject-rtos/zephyr/security
-.. _Tips when asking for help: https://docs.zephyrproject.org/latest/develop/getting_started/index.html#asking-for-help
-.. _Zephyr Tech Talks: https://www.zephyrproject.org/tech-talks
+.. _Discord Invite: https://chat.zephyrproject.org
+.. _supported boards: http://docs.zephyrproject.org/latest/boards/index.html
+.. _Zephyr Documentation: http://docs.zephyrproject.org
+.. _Introduction to Zephyr: http://docs.zephyrproject.org/latest/introduction/index.html
+.. _Getting Started Guide: http://docs.zephyrproject.org/latest/develop/getting_started/index.html
+.. _Contribution Guide: http://docs.zephyrproject.org/latest/contribute/index.html
+.. _Zephyr GitHub wiki: https://github.com/zephyrproject-rtos/zephyr/wiki
+.. _Zephyr Development mailing list: https://lists.zephyrproject.org/g/devel
+.. _Zephyr mailing list subgroups: https://lists.zephyrproject.org/g/main/subgroups
+.. _Sample and Demo Code Examples: http://docs.zephyrproject.org/latest/samples/index.html
+.. _Security: http://docs.zephyrproject.org/latest/security/index.html
+.. _Asking for Help Tips: https://docs.zephyrproject.org/latest/develop/getting_started/index.html#asking-for-help

SDK_VERSION

@@ -1 +0,0 @@
-0.16.9

VERSION

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

arch/CMakeLists.txt

@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-# FIXME: SHADOW_VARS: Remove this once we have enabled -Wshadow globally.
-add_compile_options($<TARGET_PROPERTY:compiler,warning_shadow_variables>)
-
 add_definitions(-D__ZEPHYR_SUPERVISOR__)
 
 include_directories(

arch/Kconfig

@@ -8,10 +8,8 @@
 # Include these first so that any properties (e.g. defaults) below can be
 # overridden (by defining symbols in multiple locations)
 
-source "$(ARCH_DIR)/Kconfig.$(HWM_SCHEME)"
-
-# ToDo: Generate a Kconfig.arch for loading of additional arch in HWMv2.
-osource "$(KCONFIG_BINARY_DIR)/Kconfig.arch"
+# Note: $ARCH might be a glob pattern
+source "$(ARCH_DIR)/$(ARCH)/Kconfig"
 
 # Architecture symbols
 #
@@ -21,10 +19,9 @@ osource "$(KCONFIG_BINARY_DIR)/Kconfig.arch"
 config ARC
 	bool
 	select ARCH_IS_SET
+	select HAS_DTS
 	imply XIP
 	select ARCH_HAS_THREAD_LOCAL_STORAGE
-	select ARCH_SUPPORTS_ROM_START
-	select ARCH_HAS_DIRECTED_IPIS
 	help
 	  ARC architecture
 
@@ -32,11 +29,11 @@ config ARM
 	bool
 	select ARCH_IS_SET
 	select ARCH_SUPPORTS_COREDUMP if CPU_CORTEX_M
+	select HAS_DTS
 	# FIXME: current state of the code for all ARM requires this, but
 	# is really only necessary for Cortex-M with ARM MPU!
 	select GEN_PRIV_STACKS
 	select ARCH_HAS_THREAD_LOCAL_STORAGE if CPU_AARCH32_CORTEX_R || CPU_CORTEX_M || CPU_AARCH32_CORTEX_A
-	select BARRIER_OPERATIONS_ARCH
 	help
 	  ARM architecture
 
@@ -44,14 +41,12 @@ config ARM64
 	bool
 	select ARCH_IS_SET
 	select 64BIT
-	select ARCH_SUPPORTS_COREDUMP
+	select HAS_DTS
 	select HAS_ARM_SMCCC
 	select ARCH_HAS_THREAD_LOCAL_STORAGE
 	select USE_SWITCH
 	select USE_SWITCH_SUPPORTED
 	select IRQ_OFFLOAD_NESTED if IRQ_OFFLOAD
-	select BARRIER_OPERATIONS_ARCH
-	select ARCH_HAS_DIRECTED_IPIS
 	help
 	  ARM64 (AArch64) architecture
 
@@ -59,12 +54,14 @@ config MIPS
 	bool
 	select ARCH_IS_SET
 	select ATOMIC_OPERATIONS_C
+	select HAS_DTS
 	help
 	  MIPS architecture
 
 config SPARC
 	bool
 	select ARCH_IS_SET
+	select HAS_DTS
 	select USE_SWITCH
 	select USE_SWITCH_SUPPORTED
 	select BIG_ENDIAN
@@ -79,21 +76,19 @@ config X86
 	bool
 	select ARCH_IS_SET
 	select ATOMIC_OPERATIONS_BUILTIN
+	select HAS_DTS
 	select ARCH_SUPPORTS_COREDUMP
-	select ARCH_SUPPORTS_ROM_START if !X86_64
 	select CPU_HAS_MMU
 	select ARCH_MEM_DOMAIN_DATA if USERSPACE && !X86_COMMON_PAGE_TABLE
 	select ARCH_MEM_DOMAIN_SYNCHRONOUS_API if USERSPACE
 	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
 
@@ -101,6 +96,7 @@ config NIOS2
 	bool
 	select ARCH_IS_SET
 	select ATOMIC_OPERATIONS_C
+	select HAS_DTS
 	imply XIP
 	select ARCH_HAS_TIMING_FUNCTIONS
 	help
@@ -109,17 +105,14 @@ config NIOS2
 config RISCV
 	bool
 	select ARCH_IS_SET
+	select HAS_DTS
 	select ARCH_SUPPORTS_COREDUMP
-	select ARCH_SUPPORTS_ROM_START if !SOC_FAMILY_ESPRESSIF_ESP32
 	select ARCH_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
 	  RISCV architecture
@@ -127,35 +120,25 @@ config RISCV
 config XTENSA
 	bool
 	select ARCH_IS_SET
+	select HAS_DTS
 	select USE_SWITCH
 	select USE_SWITCH_SUPPORTED
 	select IRQ_OFFLOAD_NESTED if IRQ_OFFLOAD
-	select ARCH_HAS_CODE_DATA_RELOCATION
 	select ARCH_HAS_TIMING_FUNCTIONS
-	select ARCH_MEM_DOMAIN_DATA if USERSPACE
-	select ARCH_HAS_DIRECTED_IPIS
-	select THREAD_STACK_INFO
+	imply ATOMIC_OPERATIONS_ARCH
 	help
 	  Xtensa architecture
 
 config ARCH_POSIX
 	bool
 	select ARCH_IS_SET
+	select HAS_DTS
 	select ATOMIC_OPERATIONS_BUILTIN
 	select ARCH_HAS_CUSTOM_SWAP_TO_MAIN
 	select ARCH_HAS_CUSTOM_BUSY_WAIT
 	select ARCH_HAS_THREAD_ABORT
-	select NATIVE_BUILD
+	select NATIVE_APPLICATION
 	select HAS_COVERAGE_SUPPORT
-	select BARRIER_OPERATIONS_BUILTIN
-	# POSIX arch based targets get their memory cleared on entry by the host OS
-	select SKIP_BSS_CLEAR
-	# Override the C standard used for compilation to C 2011
-	# This is due to some tests using _Static_assert which is a 2011 feature, but
-	# otherwise relying on compilers supporting it also when set to C99.
-	# This was in general ok, but with some host compilers and C library versions
-	# it led to problems. So we override it to 2011 for the native targets.
-	select REQUIRES_STD_C11
 	help
 	  POSIX (native) architecture
 
@@ -183,14 +166,6 @@ config BIG_ENDIAN
 	  modifying it.  The option is used to select linker script OUTPUT_FORMAT
 	  and command line option for gen_isr_tables.py.
 
-config LITTLE_ENDIAN
-	# Hidden Kconfig option representing the default little-endian architecture
-	# This is just the opposite of BIG_ENDIAN and is used for non-negative
-	# conditional compilation
-	bool
-	depends on !BIG_ENDIAN
-	default y
-
 config 64BIT
 	bool
 	help
@@ -215,11 +190,11 @@ 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.
 
-if ARC || ARM || ARM64 || NIOS2 || X86 || RISCV
+if ARC || ARM || ARM64 || NIOS2 || X86
 
 # Workaround for not being able to have commas in macro arguments
 DT_CHOSEN_Z_FLASH := zephyr,flash
@@ -227,7 +202,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
@@ -236,13 +210,12 @@ 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
 	  avoid modifying it via the menu configuration.
 
-endif # ARM || ARM64 || ARC || NIOS2 || X86 || RISCV
+endif # ARM || ARM64 || ARC || NIOS2 || X86
 
 if ARCH_HAS_TRUSTED_EXECUTION
 
@@ -292,7 +265,6 @@ config USERSPACE
 	depends on RUNTIME_ERROR_CHECKS
 	depends on SRAM_REGION_PERMISSIONS
 	select THREAD_STACK_INFO
-	select LINKER_USE_NO_RELAX
 	help
 	  When enabled, threads may be created or dropped down to user mode,
 	  which has significantly restricted permissions and must interact
@@ -307,7 +279,6 @@ config USERSPACE
 
 config PRIVILEGED_STACK_SIZE
 	int "Size of privileged stack"
-	default 2048 if EMUL
 	default 1024
 	depends on ARCH_HAS_USERSPACE
 	help
@@ -406,46 +377,8 @@ config NOCACHE_MEMORY
 	  transfers when cache coherence issues are not optimal or can not
 	  be solved using cache maintenance operations.
 
-config FRAME_POINTER
-	bool "Compile the kernel with frame pointers"
-	select OVERRIDE_FRAME_POINTER_DEFAULT
-	help
-	  Select Y here to gain precise stack traces at the expense of slightly
-	  increased size and decreased speed.
-
-config ARCH_STACKWALK_MAX_FRAMES
-	int "Max depth for stack walk function"
-	default 8
-	depends on ARCH_HAS_STACKWALK
-	help
-	  Depending on implementation, this can place a hard limit on the depths of the stack
-	  for the stack walk function to examine.
-
 menu "Interrupt Configuration"
 
-config ISR_TABLES_LOCAL_DECLARATION_SUPPORTED
-	bool
-	default y
-	# Userspace is currently not supported
-	depends on !USERSPACE
-	# List of currently supported architectures
-	depends on ARM || ARM64
-	# List of currently supported toolchains
-	depends on "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "zephyr" || "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "gnuarmemb"
-
-config ISR_TABLES_LOCAL_DECLARATION
-	bool "ISR tables created locally and placed by linker [EXPERIMENTAL]"
-	depends on ISR_TABLES_LOCAL_DECLARATION_SUPPORTED
-	select EXPERIMENTAL
-	help
-	  Enable new scheme of interrupt tables generation.
-	  This is totally different generator that would create tables entries locally
-	  where the IRQ_CONNECT macro is called and then use the linker script to position it
-	  in the right place in memory.
-	  The most important advantage of such approach is that the generated interrupt tables
-	  are LTO compatible.
-	  The drawback is that the support on the architecture port is required.
-
 config DYNAMIC_INTERRUPTS
 	bool "Installation of IRQs at runtime"
 	help
@@ -453,23 +386,6 @@ config DYNAMIC_INTERRUPTS
 	  interrupt-related data structures to RAM instead of ROM, and
 	  on some architectures increase code size.
 
-config SHARED_INTERRUPTS
-	bool "Set this to enable support for shared interrupts"
-	depends on GEN_SW_ISR_TABLE
-	select EXPERIMENTAL
-	help
-	  Set this to enable support for shared interrupts. Use this with
-	  caution as enabling this will increase the image size by a
-	  non-negligible amount.
-
-config SHARED_IRQ_MAX_NUM_CLIENTS
-	int "Maximum number of clients allowed per shared interrupt"
-	default 2
-	depends on SHARED_INTERRUPTS
-	help
-	  This option controls the maximum number of clients allowed
-	  per shared interrupt. Set this according to your needs.
-
 config GEN_ISR_TABLES
 	bool "Use generated IRQ tables"
 	help
@@ -530,14 +446,13 @@ config GEN_SW_ISR_TABLE
 
 config ARCH_SW_ISR_TABLE_ALIGN
 	int "Alignment size of a software ISR table"
-	default 64 if RISCV_HAS_CLIC
 	default 4
 	depends on GEN_SW_ISR_TABLE
 	help
 	  This option controls alignment size of generated
 	  _sw_isr_table.  Some architecture needs a software ISR table
 	  to be aligned to architecture specific size.  The default
-	  size is 4.
+	  size is 0 for no alignment.
 
 config GEN_IRQ_START_VECTOR
 	int
@@ -568,16 +483,6 @@ config IRQ_OFFLOAD_NESTED
 	  synchronous nested interrupt on the current CPU.  Not all
 	  hardware is capable.
 
-config EXCEPTION_DEBUG
-	bool "Unhandled exception debugging"
-	default y
-	depends on PRINTK || LOG
-	help
-	  Install handlers for various CPU exception/trap vectors to
-	  make debugging them easier, at a small expense in code size.
-	  This prints out the specific exception vector and any associated
-	  error codes.
-
 config EXTRA_EXCEPTION_INFO
 	bool "Collect extra exception info"
 	depends on ARCH_HAS_EXTRA_EXCEPTION_INFO
@@ -586,18 +491,6 @@ config EXTRA_EXCEPTION_INFO
 	  register state, when a fault occurs. This information can be useful
 	  to collect for post-mortem analysis and debug of issues.
 
-config SIMPLIFIED_EXCEPTION_CODES
-	bool "Convert arch specific exception codes to K_ERR_CPU_EXCEPTION"
-	default y if ZTEST
-	help
-	  The same piece of faulty code (NULL dereference, etc) can result in
-	  a multitude of potential exception codes at the CPU level, depending
-	  upon whether addresses exist, an MPU is configured, the particular
-	  implementation of the CPU or any number of other reasons. Enabling
-	  this option collapses all the architecture specific exception codes
-	  down to the generic K_ERR_CPU_EXCEPTION, which makes testing code
-	  much more portable.
-
 endmenu # Interrupt configuration
 
 config INIT_ARCH_HW_AT_BOOT
@@ -657,20 +550,12 @@ config ARCH_SUPPORTS_COREDUMP
 config ARCH_SUPPORTS_ARCH_HW_INIT
 	bool
 
-config ARCH_SUPPORTS_ROM_START
-	bool
-
 config ARCH_HAS_EXTRA_EXCEPTION_INFO
 	bool
 
 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
@@ -686,14 +571,6 @@ config ARCH_HAS_SUSPEND_TO_RAM
 	help
 	  When selected, the architecture supports suspend-to-RAM (S2RAM).
 
-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
 #
@@ -730,11 +607,6 @@ config CPU_HAS_FPU
 	  This option is enabled when the CPU has hardware floating point
 	  unit.
 
-config CPU_HAS_DSP
-	bool
-	help
-	  This option is enabled when the CPU has hardware DSP unit.
-
 config CPU_HAS_FPU_DOUBLE_PRECISION
 	bool
 	select CPU_HAS_FPU
@@ -767,25 +639,11 @@ config ARCH_HAS_RESERVED_PAGE_FRAMES
 	  memory mappings. The architecture will need to implement
 	  arch_reserved_pages_update().
 
-config ARCH_HAS_DIRECTED_IPIS
-	bool
-	help
-	  This hidden configuration should be selected by the architecture if
-	  it has an implementation for arch_sched_directed_ipi() which allows
-	  for IPIs to be directed to specific CPUs.
-
 config CPU_HAS_DCACHE
 	bool
 	help
 	  This hidden configuration should be selected when the CPU has a d-cache.
 
-config CPU_CACHE_INCOHERENT
-	bool
-	help
-	  This hidden configuration should be selected when the CPU has
-	  incoherent cache. This applies to intra-CPU multiprocessing
-	  incoherence and makes only sense when MP_NUM_CPUS > 1.
-
 config CPU_HAS_ICACHE
 	bool
 	help
@@ -809,7 +667,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"
@@ -913,17 +771,6 @@ config CODE_DATA_RELOCATION
 	  the target regions should be specified in CMakeLists.txt using
 	  zephyr_code_relocate().
 
-menu "DSP Options"
-
-config DSP_SHARING
-	bool "DSP register sharing"
-	depends on CPU_HAS_DSP
-	help
-	  This option enables preservation of the hardware DSP registers
-	  across context switches to allow multiple threads to perform concurrent
-	  DSP operations.
-endmenu
-
 menu "Floating Point Options"
 
 config FPU
@@ -981,23 +828,12 @@ config ICACHE
 	help
 	  This option enables the support for the instruction cache (i-cache).
 
-config CACHE_DOUBLEMAP
-	bool "Cache double-mapping support"
-	depends on CPU_CACHE_INCOHERENT
-	default y
-	help
-	  Double-mapping behavior where a pointer can be cheaply converted to
-	  point to the same cached/uncached memory at different locations.
-
-	  This applies to intra-CPU multiprocessing incoherence and makes only
-	  sense when MP_NUM_CPUS > 1.
-
 config CACHE_MANAGEMENT
 	bool "Cache management features"
 	depends on DCACHE || ICACHE
 	help
-	  This option enables the cache management functions backed by arch or
-	  driver code.
+	  This links in the cache management functions (for d-cache and i-cache
+	  where possible).
 
 config DCACHE_LINE_SIZE_DETECT
 	bool "Detect d-cache line size at runtime"
@@ -1047,17 +883,17 @@ config ICACHE_LINE_SIZE
 choice CACHE_TYPE
 	prompt "Cache type"
 	depends on CACHE_MANAGEMENT
-	default ARCH_CACHE
+	default HAS_ARCH_CACHE
 
-config ARCH_CACHE
+config HAS_ARCH_CACHE
 	bool "Integrated cache controller"
 	help
-	  Integrated on-core cache controller
+	  "Integrated on-core cache controller"
 
-config EXTERNAL_CACHE
+config HAS_EXTERNAL_CACHE
 	bool "External cache controller"
 	help
-	  External cache controller
+	  "External cache controller or cache management system"
 
 endchoice
 
@@ -1068,15 +904,29 @@ config ARCH
 	help
 	  System architecture string.
 
+config SOC
+	string
+	help
+	  SoC name which can be found under soc/<arch>/<soc name>.
+	  This option holds the directory name used by the build system to locate
+	  the correct linker and header files for the SoC.
+
+config SOC_SERIES
+	string
+	help
+	  SoC series name which can be found under soc/<arch>/<family>/<series>.
+	  This option holds the directory name used by the build system to locate
+	  the correct linker and header files.
+
+config SOC_FAMILY
+	string
+	help
+	  SoC family name which can be found under soc/<arch>/<family>.
+	  This option holds the directory name used by the build system to locate
+	  the correct linker and header files.
+
 config TOOLCHAIN_HAS_BUILTIN_FFS
 	bool
 	default y if !(64BIT && RISCV)
 	help
 	  Hidden option to signal that toolchain has __builtin_ffs*().
-
-config ARCH_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.

arch/Kconfig.v1

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

arch/Kconfig.v2

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

arch/arc/CMakeLists.txt

@@ -12,16 +12,11 @@ zephyr_cc_option(-fno-delete-null-pointer-checks)
 
 zephyr_cc_option_ifdef(CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS -munaligned-access)
 
-if(NOT COMPILER STREQUAL arcmwdt)
-  if(CONFIG_THREAD_LOCAL_STORAGE)
-    # Instruct compiler to use proper register as cached thread pointer for thread local storage.
-    # For ARCv2 the default register is usually not specified - so we need to specify it
-    # For ARCv3 the register is fixed to r30, so we don't need to specify it
-    zephyr_compile_options_ifdef(CONFIG_ISA_ARCV2 -mtp-regno=26)
-  else()
-    # If thread local storage isn't used - we can safely schedule thread pointer register
-    zephyr_compile_options_ifdef(CONFIG_ISA_ARCV2 -mtp-regno=none)
-  endif()
+if(CONFIG_ISA_ARCV2)
+  # Instruct compiler to use register R26 as thread pointer
+  # for thread local storage.
+  # For ARCv3 the register is fixed to r30, so we don't need to specify it
+  zephyr_cc_option_ifdef(CONFIG_THREAD_LOCAL_STORAGE -mtp-regno=26)
 endif()
 
 add_subdirectory(core)

arch/arc/Kconfig

@@ -9,6 +9,7 @@ menu "ARC Options"
 config ARCH
 	default "arc"
 
+
 config CPU_ARCEM
 	bool
 	select ATOMIC_OPERATIONS_C
@@ -18,7 +19,6 @@ config CPU_ARCEM
 config CPU_ARCHS
 	bool
 	select ATOMIC_OPERATIONS_BUILTIN
-	select BARRIER_OPERATIONS_BUILTIN
 	help
 	  This option signifies the use of an ARC HS CPU
 
@@ -87,15 +87,7 @@ config CPU_HS3X
 	select CPU_HAS_DCACHE
 	select CPU_HAS_ICACHE
 	help
-	  If y, the SoC uses an ARC HS3x CPU
-
-config CPU_HS4X
-	bool
-	select CPU_ARCHS
-	select CPU_HAS_DCACHE
-	select CPU_HAS_ICACHE
-	help
-	  If y, the SoC uses an HS4X CPU
+	  If y, the SoC uses an ARC HS3x or HS4x CPU
 
 endif #ISA_ARCV2
 
@@ -179,7 +171,6 @@ config ARC_FIRQ
 	bool "FIRQ enable"
 	depends on ISA_ARCV2
 	depends on NUM_IRQ_PRIO_LEVELS > 1
-	depends on !ARC_HAS_SECURE
 	default y
 	help
 	  Fast interrupts are supported (FIRQ). If FIRQ enabled, for interrupts
@@ -253,17 +244,20 @@ config ARC_USE_UNALIGNED_MEM_ACCESS
 	  to support unaligned memory access which is then disabled by default.
 	  Enable unaligned access in hardware and make software to use it.
 
-config ARC_CURRENT_THREAD_USE_NO_TLS
-	bool
-	select CURRENT_THREAD_USE_NO_TLS
-	default y if (RGF_NUM_BANKS > 1) || ("$(ZEPHYR_TOOLCHAIN_VARIANT)" = "arcmwdt")
+config FAULT_DUMP
+	int "Fault dump level"
+	default 2
+	range 0 2
 	help
-	  Disable current Thread Local Storage for ARC. For cores with more then one
-	  RGF_NUM_BANKS the parameter is disabled by-default because banks syncronization
-	  requires significant time, and it slows down performance.
-	  ARCMWDT works with tls pointer in different way then GCC. Optimized access to
-	  TLS pointer via _current variable does not provide significant advantages
-	  in case of MetaWare.
+	  Different levels for display information when a fault occurs.
+
+	  2: The default. Display specific and verbose information. Consumes
+		the most memory (long strings).
+
+	  1: Display general and short information. Consumes less memory
+		(short strings).
+
+	  0: Off.
 
 config GEN_ISR_TABLES
 	default y
@@ -283,8 +277,8 @@ config CODE_DENSITY
 	  Enable code density option to get better code density
 
 config ARC_HAS_ACCL_REGS
-	bool "Reg Pair ACCL:ACCH (FPU and/or MPY > 6 and/or DSP)"
-	default y if CPU_HS3X || CPU_HS4X || CPU_HS5X || CPU_HS6X
+	bool "Reg Pair ACCL:ACCH (FPU and/or MPY > 6)"
+	default y if CPU_HS3X || CPU_HS5X || CPU_HS6X
 	help
 	  Depending on the configuration, CPU can contain accumulator reg-pair
 	  (also referred to as r58:r59). These can also be used by gcc as GPR so
@@ -343,8 +337,6 @@ config ARC_NORMAL_FIRMWARE
 	  resources of the ARC processors, and, therefore, it shall avoid
 	  accessing them.
 
-source "arch/arc/core/dsp/Kconfig"
-
 menu "ARC MPU Options"
 depends on CPU_HAS_MPU
 
@@ -373,12 +365,16 @@ config ARC_EXCEPTION_STACK_SIZE
 
 endmenu
 
-config ARC_EARLY_SOC_INIT
-	bool "Make early stage SoC-specific initialization"
+config ARC_EXCEPTION_DEBUG
+	bool "Unhandled exception debugging information"
+	default n
+	depends on PRINTK || LOG
 	help
-	  Call SoC per-core setup code on early stage initialization
-	  (before C runtime initialization). Setup code is called in form of
-	  soc_early_asm_init_percpu assembler macro.
+	  Print human-readable information about exception vectors, cause codes,
+	  and parameters, at a cost of code/data size for the human-readable
+	  strings.
+
+endmenu
 
 config MAIN_STACK_SIZE
 	default 4096 if 64BIT
@@ -406,5 +402,3 @@ config CMSIS_V2_THREAD_MAX_STACK_SIZE
 
 config CMSIS_V2_THREAD_DYNAMIC_STACK_SIZE
 	default 2048 if 64BIT
-
-endmenu

arch/arc/arcmwdt/CMakeLists.txt

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_ARCMWDT_LIBC OR CONFIG_CPP)
+if(CONFIG_ARCMWDT_LIBC OR CONFIG_CPLUSPLUS)
   zephyr_sources(arcmwdt-dtr-stubs.c)
 endif()

arch/arc/core/CMakeLists.txt

@@ -19,14 +19,14 @@ zephyr_library_sources(
   vector_table.c
   )
 
-zephyr_library_sources_ifdef(CONFIG_ARCH_CACHE cache.c)
+zephyr_library_sources_ifdef(CONFIG_CACHE_MANAGEMENT cache.c)
 zephyr_library_sources_ifdef(CONFIG_ARC_FIRQ fast_irq.S)
 
 zephyr_library_sources_ifdef(CONFIG_IRQ_OFFLOAD irq_offload.c)
 
 zephyr_library_sources_ifdef(CONFIG_USERSPACE userspace.S)
 zephyr_library_sources_ifdef(CONFIG_ARC_CONNECT arc_connect.c)
-zephyr_library_sources_ifdef(CONFIG_ARC_CONNECT smp.c)
+zephyr_library_sources_ifdef(CONFIG_ARC_CONNECT arc_smp.c)
 
 zephyr_library_sources_ifdef(CONFIG_THREAD_LOCAL_STORAGE tls.c)
 

arch/arc/core/arc_connect.c

@@ -20,7 +20,7 @@ static struct k_spinlock arc_connect_spinlock;
 /* Generate an inter-core interrupt to the target core */
 void z_arc_connect_ici_generate(uint32_t core)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_INTRPT_GENERATE_IRQ, core);
 	}
 }
@@ -28,7 +28,7 @@ void z_arc_connect_ici_generate(uint32_t core)
 /* Acknowledge the inter-core interrupt raised by core */
 void z_arc_connect_ici_ack(uint32_t core)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_INTRPT_GENERATE_ACK, core);
 	}
 }
@@ -38,7 +38,7 @@ uint32_t z_arc_connect_ici_read_status(uint32_t core)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_INTRPT_READ_STATUS, core);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -51,7 +51,7 @@ uint32_t z_arc_connect_ici_check_src(void)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_INTRPT_CHECK_SOURCE, 0);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -64,7 +64,7 @@ void z_arc_connect_ici_clear(void)
 {
 	uint32_t cpu, c;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 
 		z_arc_connect_cmd(ARC_CONNECT_CMD_INTRPT_CHECK_SOURCE, 0);
 		cpu = z_arc_connect_cmd_readback(); /* 1,2,4,8... */
@@ -85,7 +85,7 @@ void z_arc_connect_ici_clear(void)
 /* Reset the cores in core_mask */
 void z_arc_connect_debug_reset(uint32_t core_mask)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_RESET,
 			0, core_mask);
 	}
@@ -94,7 +94,7 @@ void z_arc_connect_debug_reset(uint32_t core_mask)
 /* Halt the cores in core_mask */
 void z_arc_connect_debug_halt(uint32_t core_mask)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_HALT,
 			0, core_mask);
 	}
@@ -103,7 +103,7 @@ void z_arc_connect_debug_halt(uint32_t core_mask)
 /* Run the cores in core_mask */
 void z_arc_connect_debug_run(uint32_t core_mask)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_RUN,
 			0, core_mask);
 	}
@@ -112,7 +112,7 @@ void z_arc_connect_debug_run(uint32_t core_mask)
 /* Set core mask */
 void z_arc_connect_debug_mask_set(uint32_t core_mask, uint32_t mask)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_SET_MASK,
 			mask, core_mask);
 	}
@@ -123,7 +123,7 @@ uint32_t z_arc_connect_debug_mask_read(uint32_t core_mask)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_READ_MASK,
 			0, core_mask);
 		ret = z_arc_connect_cmd_readback();
@@ -137,7 +137,7 @@ uint32_t z_arc_connect_debug_mask_read(uint32_t core_mask)
  */
 void z_arc_connect_debug_select_set(uint32_t core_mask)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_DEBUG_SET_SELECT,
 			0, core_mask);
 	}
@@ -148,7 +148,7 @@ uint32_t z_arc_connect_debug_select_read(void)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_DEBUG_READ_SELECT, 0);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -161,7 +161,7 @@ uint32_t z_arc_connect_debug_en_read(void)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_DEBUG_READ_EN, 0);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -174,7 +174,7 @@ uint32_t z_arc_connect_debug_cmd_read(void)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_DEBUG_READ_CMD, 0);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -187,7 +187,7 @@ uint32_t z_arc_connect_debug_core_read(void)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_DEBUG_READ_CORE, 0);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -198,7 +198,7 @@ uint32_t z_arc_connect_debug_core_read(void)
 /* Clear global free running counter */
 void z_arc_connect_gfrc_clear(void)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_GFRC_CLEAR, 0);
 	}
 }
@@ -233,7 +233,7 @@ uint64_t z_arc_connect_gfrc_read(void)
 /* Enable global free running counter */
 void z_arc_connect_gfrc_enable(void)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_GFRC_ENABLE, 0);
 	}
 }
@@ -241,7 +241,7 @@ void z_arc_connect_gfrc_enable(void)
 /* Disable global free running counter */
 void z_arc_connect_gfrc_disable(void)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_GFRC_DISABLE, 0);
 	}
 }
@@ -249,7 +249,7 @@ void z_arc_connect_gfrc_disable(void)
 /* Disable global free running counter */
 void z_arc_connect_gfrc_core_set(uint32_t core_mask)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_GFRC_SET_CORE,
 			0, core_mask);
 	}
@@ -260,7 +260,7 @@ uint32_t z_arc_connect_gfrc_halt_read(void)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_GFRC_READ_HALT, 0);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -273,7 +273,7 @@ uint32_t z_arc_connect_gfrc_core_read(void)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_GFRC_READ_CORE, 0);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -284,7 +284,7 @@ uint32_t z_arc_connect_gfrc_core_read(void)
 /* Enable interrupt distribute unit */
 void z_arc_connect_idu_enable(void)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_ENABLE, 0);
 	}
 }
@@ -292,7 +292,7 @@ void z_arc_connect_idu_enable(void)
 /* Disable interrupt distribute unit */
 void z_arc_connect_idu_disable(void)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_DISABLE, 0);
 	}
 }
@@ -302,7 +302,7 @@ uint32_t z_arc_connect_idu_read_enable(void)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_READ_ENABLE, 0);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -317,7 +317,7 @@ uint32_t z_arc_connect_idu_read_enable(void)
 void z_arc_connect_idu_set_mode(uint32_t irq_num,
 	uint16_t trigger_mode, uint16_t distri_mode)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_IDU_SET_MODE,
 			irq_num, (distri_mode | (trigger_mode << 4)));
 	}
@@ -328,7 +328,7 @@ uint32_t z_arc_connect_idu_read_mode(uint32_t irq_num)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_READ_MODE, irq_num);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -342,7 +342,7 @@ uint32_t z_arc_connect_idu_read_mode(uint32_t irq_num)
  */
 void z_arc_connect_idu_set_dest(uint32_t irq_num, uint32_t core_mask)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_IDU_SET_DEST,
 			irq_num, core_mask);
 	}
@@ -353,7 +353,7 @@ uint32_t z_arc_connect_idu_read_dest(uint32_t irq_num)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_READ_DEST, irq_num);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -364,7 +364,7 @@ uint32_t z_arc_connect_idu_read_dest(uint32_t irq_num)
 /* Assert the specified common interrupt */
 void z_arc_connect_idu_gen_cirq(uint32_t irq_num)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_GEN_CIRQ, irq_num);
 	}
 }
@@ -372,7 +372,7 @@ void z_arc_connect_idu_gen_cirq(uint32_t irq_num)
 /* Acknowledge the specified common interrupt */
 void z_arc_connect_idu_ack_cirq(uint32_t irq_num)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_ACK_CIRQ, irq_num);
 	}
 }
@@ -382,7 +382,7 @@ uint32_t z_arc_connect_idu_check_status(uint32_t irq_num)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_CHECK_STATUS, irq_num);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -395,7 +395,7 @@ uint32_t z_arc_connect_idu_check_source(uint32_t irq_num)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_CHECK_SOURCE, irq_num);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -406,7 +406,7 @@ uint32_t z_arc_connect_idu_check_source(uint32_t irq_num)
 /* Mask or unmask the specified common interrupt */
 void z_arc_connect_idu_set_mask(uint32_t irq_num, uint32_t mask)
 {
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd_data(ARC_CONNECT_CMD_IDU_SET_MASK,
 			irq_num, mask);
 	}
@@ -417,7 +417,7 @@ uint32_t z_arc_connect_idu_read_mask(uint32_t irq_num)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_READ_MASK, irq_num);
 		ret = z_arc_connect_cmd_readback();
 	}
@@ -433,7 +433,7 @@ uint32_t z_arc_connect_idu_check_first(uint32_t irq_num)
 {
 	uint32_t ret = 0;
 
-	K_SPINLOCK(&arc_connect_spinlock) {
+	LOCKED(&arc_connect_spinlock) {
 		z_arc_connect_cmd(ARC_CONNECT_CMD_IDU_CHECK_FIRST, irq_num);
 		ret = z_arc_connect_cmd_readback();
 	}

arch/arc/core/arc_smp.c

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

arch/arc/core/cache.c

@@ -40,6 +40,7 @@ size_t sys_cache_line_size;
 #define DC_CTRL_INDIRECT_ACCESS      0x20 /* indirect access mode */
 #define DC_CTRL_OP_SUCCEEDED         0x4  /* d-cache operation succeeded */
 
+
 static bool dcache_available(void)
 {
 	unsigned long val = z_arc_v2_aux_reg_read(_ARC_V2_D_CACHE_BUILD);
@@ -60,12 +61,7 @@ void arch_dcache_enable(void)
 	dcache_dc_ctrl(DC_CTRL_DC_ENABLE);
 }
 
-void arch_dcache_disable(void)
-{
-	/* nothing */
-}
-
-int arch_dcache_flush_range(void *start_addr_ptr, size_t size)
+static void arch_dcache_flush(void *start_addr_ptr, size_t size)
 {
 	size_t line_size = sys_cache_data_line_size_get();
 	uintptr_t start_addr = (uintptr_t)start_addr_ptr;
@@ -73,7 +69,7 @@ int arch_dcache_flush_range(void *start_addr_ptr, size_t size)
 	unsigned int key;
 
 	if (!dcache_available() || (size == 0U) || line_size == 0U) {
-		return -ENOTSUP;
+		return;
 	}
 
 	end_addr = start_addr + size;
@@ -99,10 +95,9 @@ int arch_dcache_flush_range(void *start_addr_ptr, size_t size)
 
 	arch_irq_unlock(key); /* --exit critical section-- */
 
-	return 0;
 }
 
-int arch_dcache_invd_range(void *start_addr_ptr, size_t size)
+static void arch_dcache_invd(void *start_addr_ptr, size_t size)
 {
 	size_t line_size = sys_cache_data_line_size_get();
 	uintptr_t start_addr = (uintptr_t)start_addr_ptr;
@@ -110,7 +105,7 @@ int arch_dcache_invd_range(void *start_addr_ptr, size_t size)
 	unsigned int key;
 
 	if (!dcache_available() || (size == 0U) || line_size == 0U) {
-		return -ENOTSUP;
+		return;
 	}
 	end_addr = start_addr + size;
 	start_addr = ROUND_DOWN(start_addr, line_size);
@@ -125,26 +120,36 @@ int arch_dcache_invd_range(void *start_addr_ptr, size_t size)
 		start_addr += line_size;
 	} while (start_addr < end_addr);
 	irq_unlock(key); /* -exit critical section- */
+}
+
+int arch_dcache_range(void *addr, size_t size, int op)
+{
+	if (op == K_CACHE_INVD) {
+		/*
+		 * TODO: On invalidate we can contextually flush by setting the
+		 * DC_CTRL_INVALID_FLUSH bit
+		 */
+		arch_dcache_invd(addr, size);
+	} else if (op == K_CACHE_WB) {
+		arch_dcache_flush(addr, size);
+	} else {
+		return -ENOTSUP;
+	}
 
 	return 0;
 }
 
-int arch_dcache_flush_and_invd_range(void *start_addr_ptr, size_t size)
+int arch_icache_range(void *addr, size_t size, int op)
 {
 	return -ENOTSUP;
 }
 
-int arch_dcache_flush_all(void)
+int arch_dcache_all(int op)
 {
 	return -ENOTSUP;
 }
 
-int arch_dcache_invd_all(void)
-{
-	return -ENOTSUP;
-}
-
-int arch_dcache_flush_and_invd_all(void)
+int arch_icache_all(int op)
 {
 	return -ENOTSUP;
 }
@@ -167,58 +172,11 @@ size_t arch_dcache_line_size_get(void)
 }
 #endif
 
-void arch_icache_enable(void)
+static int init_dcache(const struct device *unused)
 {
-	/* nothing */
-}
+	ARG_UNUSED(unused);
 
-void arch_icache_disable(void)
-{
-	/* nothing */
-}
-
-int arch_icache_flush_all(void)
-{
-	return -ENOTSUP;
-}
-
-int arch_icache_invd_all(void)
-{
-	return -ENOTSUP;
-}
-
-int arch_icache_flush_and_invd_all(void)
-{
-	return -ENOTSUP;
-}
-
-int arch_icache_flush_range(void *addr, size_t size)
-{
-	ARG_UNUSED(addr);
-	ARG_UNUSED(size);
-
-	return -ENOTSUP;
-}
-
-int arch_icache_invd_range(void *addr, size_t size)
-{
-	ARG_UNUSED(addr);
-	ARG_UNUSED(size);
-
-	return -ENOTSUP;
-}
-
-int arch_icache_flush_and_invd_range(void *addr, size_t size)
-{
-	ARG_UNUSED(addr);
-	ARG_UNUSED(size);
-
-	return -ENOTSUP;
-}
-
-static int init_dcache(void)
-{
-	sys_cache_data_enable();
+	arch_dcache_enable();
 
 #if defined(CONFIG_DCACHE_LINE_SIZE_DETECT)
 	init_dcache_line_size();

arch/arc/core/dsp/Kconfig

@@ -1,70 +0,0 @@
-# Digital Signal Processing (DSP) configuration options
-
-# Copyright (c) 2022 Synopsys
-# SPDX-License-Identifier: Apache-2.0
-
-menu "ARC DSP Options"
-depends on CPU_HAS_DSP
-
-config ARC_DSP
-	bool "digital signal processing (DSP)"
-	help
-	  This option enables DSP and DSP instructions.
-
-config ARC_DSP_TURNED_OFF
-	bool "Turn off DSP if it presents"
-	depends on !ARC_DSP
-	help
-	  This option disables DSP block via resetting DSP_CRTL register.
-
-config DSP_SHARING
-	bool "DSP register sharing"
-	depends on ARC_DSP && MULTITHREADING
-	select ARC_HAS_ACCL_REGS
-	help
-	  This option enables preservation of the hardware DSP registers
-	  across context switches to allow multiple threads to perform concurrent
-	  DSP operations.
-
-config ARC_DSP_BFLY_SHARING
-	bool "ARC complex DSP operation"
-	depends on ARC_DSP && CPU_ARCEM
-	help
-	  This option is to enable Zephyr to store and restore DSP_BFLY0
-	  and FFT_CTRL registers during context switch. This option is
-	  only required when butterfly instructions are used in
-	  multi-thread.
-
-config ARC_XY_ENABLE
-	bool "ARC address generation unit registers"
-	help
-	  Processors with XY memory and AGU registers can configure this
-	  option to accelerate DSP instrctions.
-
-config ARC_AGU_SHARING
-	bool "ARC address generation unit register sharing"
-	depends on ARC_XY_ENABLE && MULTITHREADING
-	default y if DSP_SHARING
-	help
-	  This option enables preservation of the hardware AGU registers
-	  across context switches to allow multiple threads to perform concurrent
-	  operations on XY memory. Save and restore small size AGU registers is
-	  set as default, including 4 address pointers regs, 2 address offset regs
-	  and 4 modifiers regs.
-
-config ARC_AGU_MEDIUM
-	bool "ARC AGU medium size register"
-	depends on ARC_AGU_SHARING
-	help
-	  Save and restore medium AGU registers, including 8 address pointers regs,
-	  4 address offset regs and 12 modifiers regs.
-
-config ARC_AGU_LARGE
-	bool "ARC AGU large size register"
-	depends on ARC_AGU_SHARING
-	select ARC_AGU_MEDIUM
-	help
-	  Save and restore large AGU registers, including 12 address pointers regs,
-	  8 address offset regs and 24 modifiers regs.
-
-endmenu

arch/arc/core/dsp/dsp_offsets.c

@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2022 Synopsys.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @file
- * @brief ARCv2 DSP and AGU structure member offset definition file
- *
- */
-#ifdef CONFIG_DSP_SHARING
-GEN_OFFSET_SYM(_callee_saved_stack_t, dsp_ctrl);
-GEN_OFFSET_SYM(_callee_saved_stack_t, acc0_glo);
-GEN_OFFSET_SYM(_callee_saved_stack_t, acc0_ghi);
-#ifdef CONFIG_ARC_DSP_BFLY_SHARING
-GEN_OFFSET_SYM(_callee_saved_stack_t, dsp_bfly0);
-GEN_OFFSET_SYM(_callee_saved_stack_t, dsp_fft_ctrl);
-#endif
-#endif
-#ifdef CONFIG_ARC_AGU_SHARING
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap0);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap1);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap2);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap3);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_os0);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_os1);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod0);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod1);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod2);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod3);
-#ifdef CONFIG_ARC_AGU_MEDIUM
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap4);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap5);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap6);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap7);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_os2);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_os3);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod4);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod5);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod6);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod7);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod8);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod9);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod10);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod11);
-#endif
-#ifdef CONFIG_ARC_AGU_LARGE
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap8);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap9);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap10);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_ap11);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_os4);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_os5);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_os6);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_os7);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod12);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod13);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod14);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod15);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod16);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod17);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod18);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod19);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod20);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod21);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod22);
-GEN_OFFSET_SYM(_callee_saved_stack_t, agu_mod23);
-#endif
-#endif

arch/arc/core/dsp/swap_dsp_macros.h

@@ -1,269 +0,0 @@
-/*
- * Copyright (c) 2022 Synopsys.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @file
- * @brief save and load macro for ARCv2 DSP and AGU regs
- *
- */
-.macro _save_dsp_regs
-#ifdef CONFIG_DSP_SHARING
-	ld_s r13, [r2, ___thread_base_t_user_options_OFFSET]
-	bbit0 r13, K_DSP_IDX, dsp_skip_save
-	lr r13, [_ARC_V2_DSP_CTRL]
-	st_s r13, [sp, ___callee_saved_stack_t_dsp_ctrl_OFFSET]
-	lr r13, [_ARC_V2_ACC0_GLO]
-	st_s r13, [sp, ___callee_saved_stack_t_acc0_glo_OFFSET]
-	lr r13, [_ARC_V2_ACC0_GHI]
-	st_s r13, [sp, ___callee_saved_stack_t_acc0_ghi_OFFSET]
-#ifdef CONFIG_ARC_DSP_BFLY_SHARING
-	lr r13, [_ARC_V2_DSP_BFLY0]
-	st_s r13, [sp, ___callee_saved_stack_t_dsp_bfly0_OFFSET]
-	lr r13, [_ARC_V2_DSP_FFT_CTRL]
-	st_s r13, [sp, ___callee_saved_stack_t_dsp_fft_ctrl_OFFSET]
-#endif
-#endif
-dsp_skip_save :
-#ifdef CONFIG_ARC_AGU_SHARING
-	_save_agu_regs
-#endif
-.endm
-
-.macro _save_agu_regs
-#ifdef CONFIG_ARC_AGU_SHARING
-	ld_s r13, [r2, ___thread_base_t_user_options_OFFSET]
-	btst r13, K_AGU_IDX
-
-	jeq agu_skip_save
-
-	lr r13, [_ARC_V2_AGU_AP0]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap0_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP1]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap1_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP2]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap2_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP3]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap3_OFFSET]
-	lr r13, [_ARC_V2_AGU_OS0]
-	st r13, [sp, ___callee_saved_stack_t_agu_os0_OFFSET]
-	lr r13, [_ARC_V2_AGU_OS1]
-	st r13, [sp, ___callee_saved_stack_t_agu_os1_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD0]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod0_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD1]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod1_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD2]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod2_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD3]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod3_OFFSET]
-#ifdef CONFIG_ARC_AGU_MEDIUM
-	lr r13, [_ARC_V2_AGU_AP4]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap4_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP5]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap5_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP6]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap6_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP7]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap7_OFFSET]
-	lr r13, [_ARC_V2_AGU_OS2]
-	st r13, [sp, ___callee_saved_stack_t_agu_os2_OFFSET]
-	lr r13, [_ARC_V2_AGU_OS3]
-	st r13, [sp, ___callee_saved_stack_t_agu_os3_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD4]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod4_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD5]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod5_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD6]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod6_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD7]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod7_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD8]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod8_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD9]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod9_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD10]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod10_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD11]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod11_OFFSET]
-#endif
-#ifdef CONFIG_ARC_AGU_LARGE
-	lr r13, [_ARC_V2_AGU_AP8]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap8_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP9]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap9_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP10]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap10_OFFSET]
-	lr r13, [_ARC_V2_AGU_AP11]
-	st r13, [sp, ___callee_saved_stack_t_agu_ap11_OFFSET]
-	lr r13, [_ARC_V2_AGU_OS4]
-	st r13, [sp, ___callee_saved_stack_t_agu_os4_OFFSET]
-	lr r13, [_ARC_V2_AGU_OS5]
-	st r13, [sp, ___callee_saved_stack_t_agu_os5_OFFSET]
-	lr r13, [_ARC_V2_AGU_OS6]
-	st r13, [sp, ___callee_saved_stack_t_agu_os6_OFFSET]
-	lr r13, [_ARC_V2_AGU_OS7]
-	st r13, [sp, ___callee_saved_stack_t_agu_os7_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD12]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod12_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD13]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod13_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD14]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod14_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD15]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod15_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD16]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod16_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD17]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod17_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD18]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod18_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD19]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod19_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD20]
-	st r13, [sp, ___callee_saved_stack_t_agu_mod20_OFFSET]
-	lr r13, [_ARC_V2_AGU_MOD21]
-	_st32_huge_offset r13, sp, ___callee_saved_stack_t_agu_mod21_OFFSET, r1
-	lr r13, [_ARC_V2_AGU_MOD22]
-	_st32_huge_offset r13, sp, ___callee_saved_stack_t_agu_mod22_OFFSET, r1
-	lr r13, [_ARC_V2_AGU_MOD23]
-	_st32_huge_offset r13, sp, ___callee_saved_stack_t_agu_mod23_OFFSET, r1
-#endif
-#endif
-agu_skip_save :
-.endm
-
-.macro _load_dsp_regs
-#ifdef CONFIG_DSP_SHARING
-	ld_s r13, [r2, ___thread_base_t_user_options_OFFSET]
-	bbit0 r13, K_DSP_IDX, dsp_skip_load
-	ld_s r13, [sp, ___callee_saved_stack_t_dsp_ctrl_OFFSET]
-	sr r13, [_ARC_V2_DSP_CTRL]
-	ld_s r13, [sp, ___callee_saved_stack_t_acc0_glo_OFFSET]
-	sr r13, [_ARC_V2_ACC0_GLO]
-	ld_s r13, [sp, ___callee_saved_stack_t_acc0_ghi_OFFSET]
-	sr r13, [_ARC_V2_ACC0_GHI]
-#ifdef CONFIG_ARC_DSP_BFLY_SHARING
-	ld_s r13, [sp, ___callee_saved_stack_t_dsp_bfly0_OFFSET]
-	sr r13, [_ARC_V2_DSP_BFLY0]
-	ld_s r13, [sp, ___callee_saved_stack_t_dsp_fft_ctrl_OFFSET]
-	sr r13, [_ARC_V2_DSP_FFT_CTRL]
-#endif
-#endif
-dsp_skip_load :
-#ifdef CONFIG_ARC_AGU_SHARING
-	_load_agu_regs
-#endif
-.endm
-
-.macro _load_agu_regs
-#ifdef CONFIG_ARC_AGU_SHARING
-	ld_s r13, [r2, ___thread_base_t_user_options_OFFSET]
-	btst r13, K_AGU_IDX
-
-	jeq agu_skip_load
-
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap0_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP0]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap1_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP1]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap2_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP2]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap3_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP3]
-	ld r13, [sp, ___callee_saved_stack_t_agu_os0_OFFSET]
-	sr r13, [_ARC_V2_AGU_OS0]
-	ld r13, [sp, ___callee_saved_stack_t_agu_os1_OFFSET]
-	sr r13, [_ARC_V2_AGU_OS1]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod0_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD0]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod1_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD1]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod2_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD2]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod3_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD3]
-#ifdef CONFIG_ARC_AGU_MEDIUM
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap4_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP4]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap5_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP5]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap6_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP6]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap7_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP7]
-	ld r13, [sp, ___callee_saved_stack_t_agu_os2_OFFSET]
-	sr r13, [_ARC_V2_AGU_OS2]
-	ld r13, [sp, ___callee_saved_stack_t_agu_os3_OFFSET]
-	sr r13, [_ARC_V2_AGU_OS3]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod4_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD4]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod5_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD5]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod6_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD6]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod7_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD7]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod8_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD8]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod9_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD9]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod10_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD10]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod11_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD11]
-#endif
-#ifdef CONFIG_ARC_AGU_LARGE
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap8_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP8]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap9_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP9]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap10_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP10]
-	ld r13, [sp, ___callee_saved_stack_t_agu_ap11_OFFSET]
-	sr r13, [_ARC_V2_AGU_AP11]
-	ld r13, [sp, ___callee_saved_stack_t_agu_os4_OFFSET]
-	sr r13, [_ARC_V2_AGU_OS4]
-	ld r13, [sp, ___callee_saved_stack_t_agu_os5_OFFSET]
-	sr r13, [_ARC_V2_AGU_OS5]
-	ld r13, [sp, ___callee_saved_stack_t_agu_os6_OFFSET]
-	sr r13, [_ARC_V2_AGU_OS6]
-	ld r13, [sp, ___callee_saved_stack_t_agu_os7_OFFSET]
-	sr r13, [_ARC_V2_AGU_OS7]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod12_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD12]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod13_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD13]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod14_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD14]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod15_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD15]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod16_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD16]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod17_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD17]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod18_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD18]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod19_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD19]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod20_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD20]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod21_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD21]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod22_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD22]
-	ld r13, [sp, ___callee_saved_stack_t_agu_mod23_OFFSET]
-	sr r13, [_ARC_V2_AGU_MOD23]
-#endif
-#endif
-agu_skip_load :
-.endm
-
-.macro _dsp_extension_probe
-#ifdef CONFIG_ARC_DSP_TURNED_OFF
-	mov	 r0, 0 /* DSP_CTRL_DISABLED_ALL */
-	sr	 r0, [_ARC_V2_DSP_CTRL]
-#endif
-.endm

arch/arc/core/fatal.c

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

arch/arc/core/fault.c

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

arch/arc/core/fault_s.S

@@ -34,6 +34,9 @@ GTEXT(__ev_extension)
 GTEXT(__ev_div_zero)
 GTEXT(__ev_dc_error)
 GTEXT(__ev_maligned)
+#ifdef CONFIG_IRQ_OFFLOAD
+GTEXT(z_irq_do_offload);
+#endif
 
 .macro _save_exc_regs_into_stack
 #ifdef CONFIG_ARC_HAS_SECURE
@@ -118,11 +121,6 @@ _exc_return:
 
 	BREQR r0, 0, _exc_return_from_exc
 
-	/* Save old thread into switch handle which is required by z_sched_switch_spin which
-	 * will be called during old thread abort.
-	 */
-	STR r2, r2, ___thread_t_switch_handle_OFFSET
-
 	MOVR r2, r0
 
 #ifdef CONFIG_ARC_SECURE_FIRMWARE
@@ -233,4 +231,38 @@ valid_syscall_id:
 
 _do_non_syscall_trap:
 #endif /* CONFIG_USERSPACE */
+#ifdef CONFIG_IRQ_OFFLOAD
+	/*
+	 * IRQ_OFFLOAD is to simulate interrupt handling through exception,
+	 * so its entry is different with normal exception handling, it is
+	 * handled in isr stack
+	 */
+	CMPR ilink, _TRAP_S_SCALL_IRQ_OFFLOAD
+	bne _exc_entry
+	/* save caller saved registers */
+	_create_irq_stack_frame
+
+	_save_exc_regs_into_stack
+
+	/* check whether irq stack is used */
+	_check_and_inc_int_nest_counter r0, r1
+
+	bne.d exc_nest_handle
+	MOVR r0, sp
+
+	_get_curr_cpu_irq_stack sp
+exc_nest_handle:
+	PUSHR r0
+
+	jl z_irq_do_offload
+
+	POPR sp
+
+	_dec_int_nest_counter r0, r1
+
+	_pop_irq_stack_frame
+
+	/* ERSTATUS, ERET are not changed, so ok to rtie */
+	rtie
+#endif /* CONFIG_IRQ_OFFLOAD */
 	b _exc_entry

arch/arc/core/irq_manage.c

@@ -32,7 +32,7 @@
  */
 #if defined(CONFIG_ARC_FIRQ_STACK)
 #if defined(CONFIG_SMP)
-K_KERNEL_STACK_ARRAY_DEFINE(_firq_interrupt_stack, CONFIG_MP_MAX_NUM_CPUS,
+K_KERNEL_STACK_ARRAY_DEFINE(_firq_interrupt_stack, CONFIG_MP_NUM_CPUS,
 			    CONFIG_ARC_FIRQ_STACK_SIZE);
 #else
 K_KERNEL_STACK_DEFINE(_firq_interrupt_stack, CONFIG_ARC_FIRQ_STACK_SIZE);
@@ -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
 
@@ -81,53 +81,6 @@ void z_arc_firq_stack_set(void)
 }
 #endif
 
-/*
- * ARC CPU interrupt controllers hierarchy.
- *
- * Single-core (UP) case:
- *
- *   --------------------------
- *   |  CPU core 0            |
- *   --------------------------
- *   |  core 0 (private)      |
- *   |  interrupt controller  |
- *   --------------------------
- *               |
- *      [internal interrupts]
- *      [external interrupts]
- *
- *
- * Multi-core (SMP) case:
- *
- *   --------------------------               --------------------------
- *   |  CPU core 0            |               |  CPU core 1            |
- *   --------------------------               --------------------------
- *   |  core 0 (private)      |               |  core 1 (private)      |
- *   |  interrupt controller  |               |  interrupt controller  |
- *   --------------------------               --------------------------
- *     |    |      |                                |     |      |
- *     |    | [core 0 private internal interrupts]  |     |   [core 1 private internal interrupts]
- *     |    |                                       |     |
- *     |    |                                       |     |
- *     |   -------------------------------------------    |
- *     |   |     IDU (Interrupt Distribution Unit)   |    |
- *     |   -------------------------------------------    |
- *     |                       |                          |
- *     |          [common (shared) interrupts]            |
- *     |                                                  |
- *     |                                                  |
- *   [core 0 private external interrupts]               [core 1 private external interrupts]
- *
- *
- *
- *  The interrupts are grouped in HW in the same order - firstly internal interrupts
- *  (with lowest line numbers in IVT), than common interrupts (if present), than external
- *  interrupts (with highest line numbers in IVT).
- *
- *  NOTE: in case of SMP system we currently support in Zephyr only private internal and common
- *  interrupts, so the core-private external interrupts are currently not supported for SMP.
- */
-
 /**
  * @brief Enable an interrupt line
  *
@@ -135,7 +88,11 @@ void z_arc_firq_stack_set(void)
  * line. After this call, the CPU will receive interrupts for the specified
  * @a irq.
  */
-void arch_irq_enable(unsigned int irq);
+
+void arch_irq_enable(unsigned int irq)
+{
+	z_arc_v2_irq_unit_int_enable(irq);
+}
 
 /**
  * @brief Disable an interrupt line
@@ -143,7 +100,11 @@ void arch_irq_enable(unsigned int irq);
  * Disable an interrupt line. After this call, the CPU will stop receiving
  * interrupts for the specified @a irq.
  */
-void arch_irq_disable(unsigned int irq);
+
+void arch_irq_disable(unsigned int irq)
+{
+	z_arc_v2_irq_unit_int_disable(irq);
+}
 
 /**
  * @brief Return IRQ enable state
@@ -151,55 +112,10 @@ void arch_irq_disable(unsigned int irq);
  * @param irq IRQ line
  * @return interrupt enable state, true or false
  */
-int arch_irq_is_enabled(unsigned int irq);
-
-#ifdef CONFIG_ARC_CONNECT
-
-#define IRQ_NUM_TO_IDU_NUM(id)		((id) - ARC_CONNECT_IDU_IRQ_START)
-#define IRQ_IS_COMMON(id)		((id) >= ARC_CONNECT_IDU_IRQ_START)
-
-void arch_irq_enable(unsigned int irq)
-{
-	if (IRQ_IS_COMMON(irq)) {
-		z_arc_connect_idu_set_mask(IRQ_NUM_TO_IDU_NUM(irq), 0x0);
-	} else {
-		z_arc_v2_irq_unit_int_enable(irq);
-	}
-}
-
-void arch_irq_disable(unsigned int irq)
-{
-	if (IRQ_IS_COMMON(irq)) {
-		z_arc_connect_idu_set_mask(IRQ_NUM_TO_IDU_NUM(irq), 0x1);
-	} else {
-		z_arc_v2_irq_unit_int_disable(irq);
-	}
-}
-
-int arch_irq_is_enabled(unsigned int irq)
-{
-	if (IRQ_IS_COMMON(irq)) {
-		return !z_arc_connect_idu_read_mask(IRQ_NUM_TO_IDU_NUM(irq));
-	} else {
-		return z_arc_v2_irq_unit_int_enabled(irq);
-	}
-}
-#else
-void arch_irq_enable(unsigned int irq)
-{
-	z_arc_v2_irq_unit_int_enable(irq);
-}
-
-void arch_irq_disable(unsigned int irq)
-{
-	z_arc_v2_irq_unit_int_disable(irq);
-}
-
 int arch_irq_is_enabled(unsigned int irq)
 {
 	return z_arc_v2_irq_unit_int_enabled(irq);
 }
-#endif /* CONFIG_ARC_CONNECT */
 
 /**
  * @internal

arch/arc/core/irq_offload.c

@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2015 Intel corporation
- * Copyright (c) 2022 Synopsys
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -11,61 +10,24 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/irq_offload.h>
-#include <zephyr/init.h>
 
-/* Choose a reasonable default for interrupt line which is used for irq_offload with the option
- * to override it by setting interrupt line via device tree.
- */
-#if DT_NODE_EXISTS(DT_NODELABEL(test_irq_offload_line_0))
-#define IRQ_OFFLOAD_LINE	DT_IRQN(DT_NODELABEL(test_irq_offload_line_0))
-#else
-/* Last two lined are already used in the IRQ tests, so we choose 3rd from the end line */
-#define IRQ_OFFLOAD_LINE	(CONFIG_NUM_IRQS - 3)
-#endif
+static irq_offload_routine_t offload_routine;
+static const void *offload_param;
 
-#define IRQ_OFFLOAD_PRIO	0
-
-#define CURR_CPU (IS_ENABLED(CONFIG_SMP) ? arch_curr_cpu()->id : 0)
-
-static struct {
-	volatile irq_offload_routine_t fn;
-	const void *volatile arg;
-} offload_params[CONFIG_MP_MAX_NUM_CPUS];
-
-static void arc_irq_offload_handler(const void *unused)
+/* Called by trap_s exception handler */
+void z_irq_do_offload(void)
 {
-	ARG_UNUSED(unused);
-
-	offload_params[CURR_CPU].fn(offload_params[CURR_CPU].arg);
+	offload_routine(offload_param);
 }
 
 void arch_irq_offload(irq_offload_routine_t routine, const void *parameter)
 {
-	offload_params[CURR_CPU].fn = routine;
-	offload_params[CURR_CPU].arg = parameter;
-	compiler_barrier();
 
-	z_arc_v2_aux_reg_write(_ARC_V2_AUX_IRQ_HINT, IRQ_OFFLOAD_LINE);
+	offload_routine = routine;
+	offload_param = parameter;
 
-	__asm__ volatile("sync");
+	__asm__ volatile ("trap_s %[id]"
+		:
+		: [id] "i"(_TRAP_S_SCALL_IRQ_OFFLOAD) : );
 
-	/* If _current was aborted in the offload routine, we shouldn't be here */
-	__ASSERT_NO_MSG((_current->base.thread_state & _THREAD_DEAD) == 0);
 }
-
-/* need to be executed on every core in the system */
-int arc_irq_offload_init(void)
-{
-
-	IRQ_CONNECT(IRQ_OFFLOAD_LINE, IRQ_OFFLOAD_PRIO, arc_irq_offload_handler, NULL, 0);
-
-	/* The line is triggered and controlled with core private interrupt controller,
-	 * so even in case common (IDU) interrupt line usage on SMP we need to enable it not
-	 * with generic irq_enable() but via z_arc_v2_irq_unit_int_enable().
-	 */
-	z_arc_v2_irq_unit_int_enable(IRQ_OFFLOAD_LINE);
-
-	return 0;
-}
-
-SYS_INIT(arc_irq_offload_init, POST_KERNEL, 0);

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

@@ -5,12 +5,12 @@
 
 config ARC_MPU_VER
 	int "ARC MPU version"
-	range 2 8
+	range 2 6
 	default 2
 	help
 	  ARC MPU has several versions. For MPU v2, the minimum region is 2048 bytes;
 	  For other versions, the minimum region is 32 bytes; v4 has secure features,
-	  v6 supports up to 32 regions. Note: MPU v5 & v7 are not supported.
+	  v6 supports up to 32 regions.
 
 config ARC_CORE_MPU
 	bool "ARC Core MPU functionalities"
@@ -32,10 +32,8 @@ config ARC_MPU
 	select SRAM_REGION_PERMISSIONS
 	select ARC_CORE_MPU
 	select THREAD_STACK_INFO
-	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
+	select GEN_PRIV_STACKS if ARC_MPU_VER != 4
+	select MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT if ARC_MPU_VER !=4
+	select MPU_REQUIRES_NON_OVERLAPPING_REGIONS if ARC_MPU_VER = 4
 	help
-	  Target has ARC MPU
+	  Target has ARC MPU (currently only works for EMSK 2.2/2.3 ARCEM7D)

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

@@ -51,7 +51,7 @@ static inline uint32_t get_region_attr_by_type(uint32_t type)
 	}
 }
 
-#if (CONFIG_ARC_MPU_VER == 4) || (CONFIG_ARC_MPU_VER == 8)
+#if CONFIG_ARC_MPU_VER == 4
 #include "arc_mpu_v4_internal.h"
 #else
 #include "arc_mpu_common_internal.h"

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.
@@ -238,8 +238,9 @@ int arc_core_mpu_buffer_validate(const void *addr, size_t size, int write)
  * This function provides the default configuration mechanism for the Memory
  * Protection Unit (MPU).
  */
-static int arc_mpu_init(void)
+static int arc_mpu_init(const struct device *arg)
 {
+	ARG_UNUSED(arg);
 
 	uint32_t num_regions = get_num_regions();
 

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();
@@ -814,8 +814,9 @@ int arc_core_mpu_buffer_validate(const void *addr, size_t size, int write)
  * This function provides the default configuration mechanism for the Memory
  * Protection Unit (MPU).
  */
-static int arc_mpu_init(void)
+static int arc_mpu_init(const struct device *arg)
 {
+	ARG_UNUSED(arg);
 	uint32_t num_regions;
 	uint32_t i;
 

arch/arc/core/mpu/arc_mpu_v6_internal.h

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

arch/arc/core/offsets/offsets.c

@@ -26,9 +26,6 @@
 #include <kernel_arch_data.h>
 #include <gen_offset.h>
 #include <kernel_offsets.h>
-#ifdef CONFIG_DSP_SHARING
-#include "../dsp/dsp_offsets.c"
-#endif
 
 GEN_OFFSET_SYM(_thread_arch_t, relinquish_cause);
 #ifdef CONFIG_ARC_STACK_CHECKING
@@ -79,6 +76,7 @@ GEN_OFFSET_SYM(_isf_t, status32);
 GEN_ABSOLUTE_SYM(___isf_t_SIZEOF, sizeof(_isf_t));
 
 GEN_OFFSET_SYM(_callee_saved_t, sp);
+GEN_ABSOLUTE_SYM(___callee_saved_t_SIZEOF, sizeof(_callee_saved_t));
 
 GEN_OFFSET_SYM(_callee_saved_stack_t, r13);
 GEN_OFFSET_SYM(_callee_saved_stack_t, r14);
@@ -119,8 +117,10 @@ GEN_OFFSET_SYM(_callee_saved_stack_t, dpfp2l);
 GEN_OFFSET_SYM(_callee_saved_stack_t, dpfp1h);
 GEN_OFFSET_SYM(_callee_saved_stack_t, dpfp1l);
 #endif
-#endif
 
+#endif
 GEN_ABSOLUTE_SYM(___callee_saved_stack_t_SIZEOF, sizeof(_callee_saved_stack_t));
 
+GEN_ABSOLUTE_SYM(_K_THREAD_NO_FLOAT_SIZEOF, sizeof(struct k_thread));
+
 GEN_ABS_SYM_END

arch/arc/core/prep_c.c

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

arch/arc/core/reset.S

@@ -16,9 +16,6 @@
 #include <zephyr/arch/cpu.h>
 #include <swap_macros.h>
 #include <zephyr/arch/arc/asm-compat/assembler.h>
-#ifdef CONFIG_ARC_EARLY_SOC_INIT
-  #include <soc_ctrl.h>
-#endif
 
 GDATA(z_interrupt_stacks)
 GDATA(z_main_stack)
@@ -40,7 +37,7 @@ GTEXT(__start)
  *
  * Locking interrupts prevents anything from interrupting the CPU.
  *
- * When these steps are completed, jump to z_prep_c(), which will finish setting
+ * When these steps are completed, jump to _PrepC(), which will finish setting
  * up the system for running C code.
  */
 
@@ -112,12 +109,6 @@ done_icache_invalidate:
 
 done_dcache_invalidate:
 
-#ifdef CONFIG_ARC_EARLY_SOC_INIT
-	soc_early_asm_init_percpu
-#endif
-
-	_dsp_extension_probe
-
 /*
  * Init ARC internal architecture state
  * Force to initialize internal architecture state to reset values
@@ -126,8 +117,8 @@ done_dcache_invalidate:
  * substitution of normal hardware reset sequence.
  */
 #ifdef CONFIG_INIT_ARCH_HW_AT_BOOT
-	/* Set MPU (v4 or v8) registers to default */
-#if CONFIG_ARC_MPU_VER == 4 || CONFIG_ARC_MPU_VER == 8
+	/* Set MPU (v4) registers to default */
+#if CONFIG_ARC_MPU_VER == 4
 	/* Set default reset value to _ARC_V2_MPU_EN register */
 #define ARC_MPU_EN_RESET_VALUE 0x400181C0
 	mov_s r1, ARC_MPU_EN_RESET_VALUE
@@ -151,17 +142,7 @@ done_mpu_regions_reset:
 #endif
 #endif
 
-#ifdef CONFIG_ISA_ARCV3
-	/* Enable HW prefetcher if exist */
-	lr r0, [_ARC_HW_PF_BUILD]
-	breq r0, 0, hw_pf_setup_done
-	lr r1, [_ARC_HW_PF_CTRL]
-	or r1, r1, _ARC_HW_PF_CTRL_ENABLE
-	sr r1, [_ARC_HW_PF_CTRL]
-hw_pf_setup_done:
-#endif
-
-#if defined(CONFIG_SMP) || CONFIG_MP_MAX_NUM_CPUS  > 1
+#if defined(CONFIG_SMP) || CONFIG_MP_NUM_CPUS  > 1
 	_get_cpu_id r0
 	breq r0, 0, _master_core_startup
 
@@ -169,7 +150,7 @@ hw_pf_setup_done:
  * Non-masters wait for master core (core 0) to boot enough
  */
 _slave_core_wait:
-#if CONFIG_MP_MAX_NUM_CPUS == 1
+#if CONFIG_MP_NUM_CPUS == 1
 	kflag	1
 #endif
 	ld r1, [arc_cpu_wake_flag]
@@ -184,7 +165,7 @@ _slave_core_wait:
 	jl z_arc_firq_stack_set
 	pop r0
 #endif
-	j arch_secondary_cpu_init
+	j z_arc_slave_start
 
 _master_core_startup:
 #endif
@@ -212,4 +193,4 @@ _master_core_startup:
 	jl z_arc_firq_stack_set
 #endif
 
-	j z_prep_c
+	j _PrepC

arch/arc/core/secureshield/arc_sjli.c

@@ -48,7 +48,7 @@ static void sjli_table_init(void)
 /*
  * @brief initialization of secureshield related functions.
  */
-static int arc_secureshield_init(void)
+static int arc_secureshield_init(const struct device *arg)
 {
 	sjli_table_init();
 

arch/arc/core/smp.c

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

arch/arc/core/thread.c

@@ -14,15 +14,12 @@
 #include <zephyr/kernel.h>
 #include <ksched.h>
 #include <offsets_short.h>
+#include <zephyr/wait_q.h>
 
 #ifdef CONFIG_USERSPACE
 #include <zephyr/arch/arc/v2/mpu/arc_core_mpu.h>
 #endif
 
-#if defined(CONFIG_ARC_DSP) && defined(CONFIG_DSP_SHARING)
-#include <zephyr/arch/arc/v2/dsp/arc_dsp.h>
-static struct k_spinlock lock;
-#endif
 /*  initial stack frame */
 struct init_stack_frame {
 	uintptr_t pc;
@@ -124,15 +121,10 @@ static inline void arch_setup_callee_saved_regs(struct k_thread *thread,
 
 	ARG_UNUSED(regs);
 
-/* GCC uses tls pointer cached in register, MWDT just call for _mwget_tls */
-#if defined(CONFIG_THREAD_LOCAL_STORAGE) && !defined(__CCAC__)
+#ifdef CONFIG_THREAD_LOCAL_STORAGE
 #ifdef CONFIG_ISA_ARCV2
-#if __ARC_TLS_REGNO__ <= 0
-#error Compiler not configured for thread local storage
-#endif
-#define TLSREG _CONCAT(r, __ARC_TLS_REGNO__)
-	/* __ARC_TLS_REGNO__ is used for thread pointer for ARCv2 */
-	regs->TLSREG = thread->tls;
+	/* R26 is used for thread pointer for ARCv2 */
+	regs->r26 = thread->tls;
 #else
 	/* R30 is used for thread pointer for ARCv3 */
 	regs->r30 = thread->tls;
@@ -273,7 +265,7 @@ int arch_float_enable(struct k_thread *thread, unsigned int options)
 
 #if !defined(CONFIG_MULTITHREADING)
 
-K_KERNEL_STACK_ARRAY_DECLARE(z_interrupt_stacks, CONFIG_MP_MAX_NUM_CPUS, CONFIG_ISR_STACK_SIZE);
+K_KERNEL_STACK_ARRAY_DECLARE(z_interrupt_stacks, CONFIG_MP_NUM_CPUS, CONFIG_ISR_STACK_SIZE);
 K_THREAD_STACK_DECLARE(z_main_stack, CONFIG_MAIN_STACK_SIZE);
 
 extern void z_main_no_multithreading_entry_wrapper(void *p1, void *p2, void *p3,
@@ -283,10 +275,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);
@@ -296,27 +288,3 @@ FUNC_NORETURN void z_arc_switch_to_main_no_multithreading(k_thread_entry_t main_
 	CODE_UNREACHABLE; /* LCOV_EXCL_LINE */
 }
 #endif /* !CONFIG_MULTITHREADING */
-
-#if defined(CONFIG_ARC_DSP) && defined(CONFIG_DSP_SHARING)
-void arc_dsp_disable(struct k_thread *thread, unsigned int options)
-{
-	/* Ensure a preemptive context switch does not occur */
-	k_spinlock_key_t key = k_spin_lock(&lock);
-
-	/* Disable DSP or AGU capabilities for the thread */
-	thread->base.user_options &= ~(uint8_t)options;
-
-	k_spin_unlock(&lock, key);
-}
-
-void arc_dsp_enable(struct k_thread *thread, unsigned int options)
-{
-	/* Ensure a preemptive context switch does not occur */
-	k_spinlock_key_t key = k_spin_lock(&lock);
-
-	/* Enable dsp or agu capabilities for the thread */
-	thread->base.user_options |= (uint8_t)options;
-
-	k_spin_unlock(&lock, key);
-}
-#endif /* CONFIG_ARC_DSP && CONFIG_DSP_SHARING */

arch/arc/core/tls.c

@@ -10,29 +10,6 @@
 #include <kernel_tls.h>
 #include <zephyr/sys/util.h>
 
-#ifdef __CCAC__
-extern char _arcmwdt_tls_start[];
-extern char _arcmwdt_tls_size[];
-
-size_t arch_tls_stack_setup(struct k_thread *new_thread, char *stack_ptr)
-{
-	size_t tls_size = (size_t)_arcmwdt_tls_size;
-	size_t tls_size_aligned = ROUND_UP(tls_size, ARCH_STACK_PTR_ALIGN);
-
-	stack_ptr -= tls_size_aligned;
-	memcpy(stack_ptr, _arcmwdt_tls_start, tls_size);
-
-	new_thread->tls = POINTER_TO_UINT(stack_ptr);
-
-	return tls_size_aligned;
-}
-
-void *_Preserve_flags _mwget_tls(void)
-{
-	return (void *)(_current->tls);
-}
-
-#else
 size_t arch_tls_stack_setup(struct k_thread *new_thread, char *stack_ptr)
 {
 	/*
@@ -63,4 +40,3 @@ size_t arch_tls_stack_setup(struct k_thread *new_thread, char *stack_ptr)
 
 	return (z_tls_data_size() + (sizeof(uintptr_t) * 2));
 }
-#endif

arch/arc/include/arc_irq_offload.h

@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2022 Synopsys.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_ARCH_ARC_INCLUDE_ARC_IRQ_OFFLOAD_H_
-#define ZEPHYR_ARCH_ARC_INCLUDE_ARC_IRQ_OFFLOAD_H_
-
-#ifdef CONFIG_IRQ_OFFLOAD
-
-int arc_irq_offload_init(const struct device *unused);
-
-static inline void arc_irq_offload_init_smp(void)
-{
-	arc_irq_offload_init(NULL);
-}
-
-#else
-
-static inline void arc_irq_offload_init_smp(void) {}
-
-#endif /* CONFIG_IRQ_OFFLOAD */
-
-#endif /* ZEPHYR_ARCH_ARC_INCLUDE_ARC_IRQ_OFFLOAD_H_ */