release: Bump release to 2.7.1

Bump version to 2.7.1

Signed-off-by: Christopher Friedt <chrisfriedt@gmail.com>

.github/workflows/bluetooth.yaml

@@ -11,16 +11,16 @@ on:
       - "arch/posix/**"
 
 jobs:
-  bsim-build-cancel:
+  bluetooth-test-prep:
     runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
         uses: styfle/cancel-workflow-action@0.6.0
         with:
           access_token: ${{ github.token }}
-  bsim-build:
+  bluetooth-test-build:
     runs-on: ubuntu-latest
-    needs: bsim-build-cancel
+    needs: bluetooth-test-prep
     container:
       image: zephyrprojectrtos/ci:v0.18.4
       options: '--entrypoint /bin/bash'
@@ -46,11 +46,11 @@ jobs:
       - name: west setup
         run: |
           west init -l . || true
-          west update
+          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: |
-          #source zephyr-env.sh
           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} \
@@ -63,9 +63,9 @@ jobs:
           name: Bluetooth Test Results
           path: ./bsim_bt_out/bsim_results.xml
 
-  publish-test-results:
-    name: "Publish Unit Tests Results"
-    needs: bsim-build
+  bluetooth-test-results:
+    name: "Publish Bluetooth Test Results"
+    needs: bluetooth-test-build
     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()
@@ -76,10 +76,10 @@ jobs:
         with:
           path: artifacts
 
-      - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v1.12
+      - name: Publish Bluetooth Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v1
         with:
           check_name: Bluetooth Test Results
           github_token: ${{ secrets.GITHUB_TOKEN }}
           files: "**/bsim_results.xml"
-          comment_on_pr: false
+          comment_mode: off

.github/workflows/clang.yaml

@@ -3,7 +3,7 @@ name: Build with Clang/LLVM
 on: pull_request_target
 
 jobs:
-  clang-build-cancel:
+  clang-build-prep:
     runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
@@ -11,38 +11,51 @@ jobs:
         with:
           access_token: ${{ github.token }}
   clang-build:
-    runs-on: ubuntu-latest
-    needs: clang-build-cancel
+    runs-on: zephyr_runner
+    needs: clang-build-prep
     container:
       image: zephyrprojectrtos/ci:v0.18.4
       options: '--entrypoint /bin/bash'
+      volumes:
+        - /home/runners/zephyrproject:/github/cache/zephyrproject
     strategy:
       fail-fast: false
       matrix:
-        subset: [1, 2, 3, 4, 5]
+        platform: ["native_posix"]
     env:
       ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.13.1
       CLANG_ROOT_DIR: /usr/lib/llvm-12
-      MATRIX_SIZE: 5
+      COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
+      BASE_REF: ${{ github.base_ref }}
+    outputs:
+      report_needed: ${{ steps.twister.outputs.report_needed }}
     steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.6.0
-        with:
-          access_token: ${{ github.token }}
-      - name: Update PATH for west
+      - name: Cleanup
         run: |
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - name: checkout
+          # hotfix, until we have a better way to deal with existing data
+          rm -rf zephyr zephyr-testing
+      - name: Checkout
         uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
 
-      - name: west setup
+      - name: Environment Setup
         run: |
+          pip3 install GitPython
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+          git config --global user.email "bot@zephyrproject.org"
+          git config --global user.name "Zephyr Bot"
+          git rebase origin/${BASE_REF}
+          git log  --pretty=oneline | head -n 10
           west init -l . || true
-          west update
+          west config --global update.narrow true
+          # 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 /github/cache/zephyrproject 2>&1 1> west.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west2.log || ( rm -rf ../modules && west update --path-cache /github/cache/zephyrproject)
 
       - name: Check Environment
         run: |
@@ -51,40 +64,76 @@ jobs:
           gcc --version
           ls -la
 
-      - name: Run Tests with Twister
+      - name: Prepare ccache timestamp/data
+        id: ccache_cache_timestamp
+        shell: cmake -P {0}
+        run: |
+          string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+          string(REPLACE "/" "_" repo ${{github.repository}})
+          string(REPLACE "-" "_" repo2 ${repo})
+          message("::set-output name=repo::${repo2}")
+      - name: use cache
+        id: cache-ccache
+        uses: nashif/action-s3-cache@master
+        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: ${{ secrets.CCACHE_S3_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.CCACHE_S3_SECRET_ACCESS_KEY }}
+          aws-region: us-east-2
+
+      - name: ccache stats initial
+        run: |
+          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
         run: |
-          #source zephyr-env.sh
           export ZEPHYR_BASE=${PWD}
           export ZEPHYR_TOOLCHAIN_VARIANT=llvm
-          ./scripts/twister --inline-logs -M -N -v -p native_posix --subset ${{matrix.subset}}/${MATRIX_SIZE} --retry-failed 3
+
+          # check if we need to run a full twister or not based on files changed
+          python3 ./scripts/ci/test_plan.py --platform ${{ matrix.platform }} -c origin/${BASE_REF}..
+
+          # We can limit scope to just what has changed
+          if [ -s testplan.csv ]; then
+            echo "::set-output name=report_needed::1";
+            # Full twister but with options based on changes
+            ./scripts/twister --inline-logs -M -N -v --load-tests testplan.csv --retry-failed 2
+          else
+            # if nothing is run, skip reporting step
+            echo "::set-output name=report_needed::0";
+          fi
+
+      - name: ccache stats post
+        run: |
+          ccache -s
 
       - name: Upload Unit Test Results
-        if: always()
+        if: always() && steps.twister.outputs.report_needed != 0
         uses: actions/upload-artifact@v2
         with:
-          name: Unit Test Results (Subset ${{ matrix.subset }})
+          name: Unit Test Results (Subset ${{ matrix.platform }})
           path: twister-out/twister.xml
 
-  publish-test-results:
+  clang-build-results:
     name: "Publish Unit Tests Results"
     needs: clang-build
     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()
-
+    if: (success() || failure() ) && needs.clang-build.outputs.report_needed != 0
     steps:
       - name: Download Artifacts
         uses: actions/download-artifact@v2
         with:
           path: artifacts
 
-      - name: Display structure of downloaded files
-        run: ls -R
-
       - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v1.12
+        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_on_pr: false
+          comment_mode: off

.github/workflows/codecov.yaml

@@ -0,0 +1,164 @@
+name: Code Coverage with codecov
+
+on:
+  schedule:
+    - cron: '25 */3 * * 1-5'
+
+jobs:
+  codecov-prep:
+    runs-on: ubuntu-latest
+    if: github.repository == 'zephyrproject-rtos/zephyr'
+    steps:
+      - name: Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.6.0
+        with:
+          access_token: ${{ github.token }}
+
+  codecov:
+    runs-on: zephyr_runner
+    needs: codecov-prep
+    container:
+      image: zephyrprojectrtos/ci:v0.18.4
+      options: '--entrypoint /bin/bash'
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: ["native_posix", "qemu_x86", "unit_testing"]
+    env:
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.13.1
+      CLANG_ROOT_DIR: /usr/lib/llvm-12
+    steps:
+      - name: Update PATH for west
+        run: |
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: west setup
+        run: |
+          west init -l . || true
+          west update 1> west.update.log || west update 1> west.update-2.log
+
+      - name: Check Environment
+        run: |
+          cmake --version
+          ${CLANG_ROOT_DIR}/bin/clang --version
+          gcc --version
+          ls -la
+      - name: Prepare ccache keys
+        id: ccache_cache_prop
+        shell: cmake -P {0}
+        run: |
+          string(REPLACE "/" "_" repo ${{github.repository}})
+          string(REPLACE "-" "_" repo2 ${repo})
+          message("::set-output name=repo::${repo2}")
+
+      - name: use cache
+        id: cache-ccache
+        uses: nashif/action-s3-cache@master
+        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: ${{ secrets.CCACHE_S3_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.CCACHE_S3_SECRET_ACCESS_KEY }}
+          aws-region: us-east-2
+
+      - name: ccache stats initial
+        run: |
+          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
+        run: |
+          export ZEPHYR_BASE=${PWD}
+          export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
+          mkdir -p coverage/reports
+          ./scripts/twister -N -v --filter runnable -p ${{ matrix.platform }} --coverage -T tests
+
+      - name: Generate Coverage Report
+        run: |
+          mv twister-out/coverage.info lcov.pre.info
+          lcov -q --remove lcov.pre.info mylib.c --remove lcov.pre.info tests/\* \
+            --remove lcov.pre.info samples/\* --remove lcov.pre.info ext/\* \
+            --remove lcov.pre.info *generated*  \
+            -o coverage/reports/${{ matrix.platform }}.info --rc lcov_branch_coverage=1
+
+      - name: ccache stats post
+        run: |
+          ccache -s
+
+      - name: Upload Coverage Results
+        if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: Coverage Data (Subset ${{ matrix.platform }})
+          path: coverage/reports/${{ matrix.platform }}.info
+
+  codecov-results:
+    name: "Publish Coverage Results"
+    needs: codecov
+    runs-on: ubuntu-latest
+      # the codecov job might be skipped, we don't need to run this job then
+    if: success() || failure()
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Download Artifacts
+        uses: actions/download-artifact@v2
+        with:
+          path: coverage/reports
+
+      - name: Move coverage files
+        run: |
+          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/*.info")
+          set(MERGELIST "")
+          set(FILELIST "")
+          foreach(ITEM ${INPUT_FILES_LIST})
+            get_filename_component(f ${ITEM} NAME)
+            if(FILELIST STREQUAL "")
+              set(FILELIST "${f}")
+            else()
+              set(FILELIST "${FILELIST},${f}")
+            endif()
+          endforeach()
+          foreach(ITEM ${INPUT_FILES_LIST})
+            get_filename_component(f ${ITEM} NAME)
+            if(MERGELIST STREQUAL "")
+              set(MERGELIST "-a ${f}")
+            else()
+              set(MERGELIST "${MERGELIST} -a ${f}")
+            endif()
+          endforeach()
+          message("::set-output name=mergefiles::${MERGELIST}")
+          message("::set-output name=covfiles::${FILELIST}")
+
+      - name: Merge coverage files
+        run: |
+          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@v2
+        with:
+          directory: ./coverage/reports
+          env_vars: OS,PYTHON
+          fail_ci_if_error: false
+          verbose: true
+          files: merged.info

.github/workflows/compliance.yml

@@ -1,4 +1,4 @@
-name: Compliance
+name: Compliance Checks
 
 on: pull_request
 
@@ -19,7 +19,7 @@ jobs:
       run: |
         python3 ./scripts/get_maintainer.py path CMakeLists.txt
 
-  compliance_job:
+  check_compliance:
     runs-on: ubuntu-latest
     name: Run compliance checks on patch series (PR)
     steps:
@@ -57,7 +57,7 @@ jobs:
         # debug
         git log  --pretty=oneline | head -n 10
         west init -l . || true
-        west update
+        west update 2>&1 1> west.update.log || west update 2>&1 1> west.update2.log
 
     - name: Run Compliance Tests
       continue-on-error: true

.github/workflows/conflict.yml

@@ -8,7 +8,7 @@ jobs:
   conflict:
     runs-on: ubuntu-latest
     steps:
-      - uses: mschilde/auto-label-merge-conflicts@master
+      - uses: mschilde/auto-label-merge-conflicts@v2
         with:
           CONFLICT_LABEL_NAME: "has conflicts"
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/devicetree_checks.yml

@@ -22,6 +22,9 @@ jobs:
       matrix:
         python-version: [3.6, 3.7, 3.8]
         os: [ubuntu-latest, macos-latest, windows-latest]
+        exclude:
+          - os: macos-latest
+            python-version: 3.6
     steps:
     - name: checkout
       uses: actions/checkout@v2

.github/workflows/footprint-tracking.yml

@@ -52,7 +52,8 @@ jobs:
       - name: west setup
         run: |
           west init -l . || true
-          west update
+          west config --global update.narrow true
+          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@v1

.github/workflows/footprint.yml

@@ -42,7 +42,8 @@ jobs:
       - name: west setup
         run: |
           west init -l . || true
-          west update
+          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:

.github/workflows/twister.yaml

@@ -0,0 +1,248 @@
+name: Run tests with twister
+
+on:
+  push:
+  pull_request_target:
+  schedule:
+    # Run at 00:00 on Saturday
+    - cron: '20 0 * * 6'
+
+jobs:
+  twister-build-cleanup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.6.0
+        with:
+          access_token: ${{ github.token }}
+
+  twister-build-prep:
+
+    runs-on: zephyr_runner
+    needs: twister-build-cleanup
+    container:
+      image: zephyrprojectrtos/ci:v0.18.4
+      options: '--entrypoint /bin/bash'
+      volumes:
+        - /home/runners/zephyrproject:/github/cache/zephyrproject
+    outputs:
+      subset: ${{ steps.output-services.outputs.subset }}
+      size: ${{ steps.output-services.outputs.size }}
+    env:
+      MATRIX_SIZE: 10
+      PUSH_MATRIX_SIZE: 15
+      DAILY_MATRIX_SIZE: 80
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.13.1
+      CLANG_ROOT_DIR: /usr/lib/llvm-12
+      TESTS_PER_BUILDER: 700
+      COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
+      BASE_REF: ${{ github.base_ref }}
+    steps:
+      - name: Cleanup
+        run: |
+          # hotfix, until we have a better way to deal with existing data
+          rm -rf zephyr zephyr-testing
+
+      - name: Checkout
+        if: github.event_name == 'pull_request_target'
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+
+      - name: Environment Setup
+        if: github.event_name == 'pull_request_target'
+        run: |
+          pip3 install GitPython
+          git config --global user.email "bot@zephyrproject.org"
+          git config --global user.name "Zephyr Bot"
+          git rebase origin/${BASE_REF}
+          git log  --pretty=oneline | head -n 10
+          west init -l . || true
+          # no need for west update here
+
+      - name: Generate Test Plan with Twister
+        if: github.event_name == 'pull_request_target'
+        id: test-plan
+        run: |
+          export ZEPHYR_BASE=${PWD}
+          export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
+          # temporary until we have all PRs rebased on top of this commit.
+          git log -n 500 --oneline | grep -q "run twister using github action" || (
+            echo "Your branch is not up to date, you need to rebase on top of latest HEAD of main branch"
+            exit 1
+          )
+          python3 ./scripts/ci/test_plan.py -c origin/${BASE_REF}.. --pull-request -t $TESTS_PER_BUILDER
+          if [ -s .testplan ]; then
+            cat .testplan >> $GITHUB_ENV
+          else
+            echo "TWISTER_NODES=${MATRIX_SIZE}" >> $GITHUB_ENV
+          fi
+
+
+          rm -f testplan.csv .testplan
+
+      - name: Determine matrix size
+        id: output-services
+        run: |
+          if [ "${{github.event_name}}" = "pull_request_target" ]; then
+            if [ -n "${TWISTER_NODES}" ]; then
+              subset="[$(seq -s',' 1 ${TWISTER_NODES})]"
+            else
+              subset="[$(seq -s',' 1 ${MATRIX_SIZE})]"
+            fi
+            size=${TWISTER_NODES}
+          elif [ "${{github.event_name}}" = "push" ]; then
+            subset="[$(seq -s',' 1 ${PUSH_MATRIX_SIZE})]"
+            size=${MATRIX_SIZE}
+          elif [ "${{github.event_name}}" = "schedule" && "${{github.repository}}" = "zephyrproject-rtos/zephyr" ]; then
+            subset="[$(seq -s',' 1 ${DAILY_MATRIX_SIZE})]"
+            size=${DAILY_MATRIX_SIZE}
+          else
+            size=0
+          fi
+          echo "::set-output name=subset::${subset}";
+          echo "::set-output name=size::${size}";
+
+  twister-build:
+    runs-on: zephyr_runner
+    needs: twister-build-prep
+    if: needs.twister-build-prep.outputs.size != 0
+    container:
+      image: zephyrprojectrtos/ci:v0.18.4
+      options: '--entrypoint /bin/bash'
+      volumes:
+        - /home/runners/zephyrproject:/github/cache/zephyrproject
+    strategy:
+      fail-fast: false
+      matrix:
+        subset: ${{fromJSON(needs.twister-build-prep.outputs.subset)}}
+    env:
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.13.1
+      CLANG_ROOT_DIR: /usr/lib/llvm-12
+      TWISTER_COMMON: ' --inline-logs -v -N -M --retry-failed 3 '
+      DAILY_OPTIONS: ' -M --build-only --all '
+      PR_OPTIONS: ' --clobber-output --integration '
+      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: Cleanup
+        run: |
+          # hotfix, until we have a better way to deal with existing data
+          rm -rf zephyr zephyr-testing
+
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+
+      - name: Environment Setup
+        run: |
+          pip3 install GitPython
+          if [ "${{github.event_name}}" = "pull_request_target" ]; then
+            git config --global user.email "bot@zephyrproject.org"
+            git config --global user.name "Zephyr Builder"
+            git rebase origin/${BASE_REF}
+            git log  --pretty=oneline | head -n 10
+          fi
+          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 && west update --path-cache /github/cache/zephyrproject)
+          west forall -c 'git reset --hard HEAD'
+
+      - name: Check Environment
+        run: |
+          cmake --version
+          ${CLANG_ROOT_DIR}/bin/clang --version
+          gcc --version
+          ls -la
+          echo "github.ref: ${{ github.ref }}"
+          echo "github.base_ref: ${{ github.base_ref }}"
+          echo "github.ref_name: ${{ github.ref_name }}"
+
+      - name: Prepare ccache timestamp/data
+        id: ccache_cache_timestamp
+        shell: cmake -P {0}
+        run: |
+          string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+          string(REPLACE "/" "_" repo ${{github.repository}})
+          string(REPLACE "-" "_" repo2 ${repo})
+          message("::set-output name=repo::${repo2}")
+
+      - name: use cache
+        id: cache-ccache
+        uses: nashif/action-s3-cache@master
+        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: ${{ secrets.CCACHE_S3_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.CCACHE_S3_SECRET_ACCESS_KEY }}
+          aws-region: us-east-2
+
+      - name: ccache stats initial
+        run: |
+          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)
+        run: |
+          export ZEPHYR_BASE=${PWD}
+          export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
+          ./scripts/twister --subset ${{matrix.subset}}/${{ strategy.job-total }} ${TWISTER_COMMON} ${PUSH_OPTIONS}
+
+      - if: github.event_name == 'pull_request_target'
+        name: Run Tests with Twister (Pull Request)
+        run: |
+          rm -f testplan.csv
+          export ZEPHYR_BASE=${PWD}
+          export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
+          python3 ./scripts/ci/test_plan.py -c origin/${BASE_REF}.. --pull-request
+          ./scripts/twister --subset ${{matrix.subset}}/${{ strategy.job-total }} --load-tests testplan.csv ${TWISTER_COMMON} ${PR_OPTIONS}
+
+      - if: github.event_name == 'schedule'
+        name: Run Tests with Twister (Daily)
+        run: |
+          export ZEPHYR_BASE=${PWD}
+          export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
+          ./scripts/twister --subset ${{matrix.subset}}/${{ strategy.job-total }} ${TWISTER_COMMON} ${DAILY_OPTIONS}
+
+      - name: ccache stats post
+        run: |
+          ccache -s
+
+      - name: Upload Unit Test Results
+        if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: Unit Test Results (Subset ${{ matrix.subset }})
+          if-no-files-found: ignore
+          path: |
+            twister-out/twister.xml
+            testplan.csv
+
+  twister-test-results:
+    name: "Publish Unit Tests Results"
+    needs: twister-build
+    runs-on: ubuntu-latest
+      # the build-and-test job might be skipped, we don't need to run this job then
+    if: success() || failure()
+
+    steps:
+      - name: Download Artifacts
+        uses: actions/download-artifact@v2
+        with:
+          path: artifacts
+
+      - name: Publish Unit Test Results
+        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

.github/workflows/west_cmds.yml

@@ -23,6 +23,9 @@ jobs:
       matrix:
         python-version: [3.6, 3.7, 3.8]
         os: [ubuntu-latest, macos-latest, windows-latest]
+        exclude:
+          - os: macos-latest
+            python-version: 3.6
     steps:
     - name: checkout
       uses: actions/checkout@v2

CMakeLists.txt

@@ -168,21 +168,29 @@ if(CONFIG_CPLUSPLUS)
   # Kconfig choice ensures only one of these CONFIG_STD_CPP* is set.
   if(CONFIG_STD_CPP98)
     set(STD_CPP_DIALECT_FLAGS $<TARGET_PROPERTY:compiler-cpp,dialect_cpp98>)
+    list(APPEND CMAKE_CXX_COMPILE_FEATURES ${compile_features_cpp98})
   elseif(CONFIG_STD_CPP11)
     set(STD_CPP_DIALECT_FLAGS $<TARGET_PROPERTY:compiler-cpp,dialect_cpp11>) # Default in kconfig
+    list(APPEND CMAKE_CXX_COMPILE_FEATURES ${compile_features_cpp11})
   elseif(CONFIG_STD_CPP14)
     set(STD_CPP_DIALECT_FLAGS $<TARGET_PROPERTY:compiler-cpp,dialect_cpp14>)
+    list(APPEND CMAKE_CXX_COMPILE_FEATURES ${compile_features_cpp14})
   elseif(CONFIG_STD_CPP17)
     set(STD_CPP_DIALECT_FLAGS $<TARGET_PROPERTY:compiler-cpp,dialect_cpp17>)
+    list(APPEND CMAKE_CXX_COMPILE_FEATURES ${compile_features_cpp17})
   elseif(CONFIG_STD_CPP2A)
     set(STD_CPP_DIALECT_FLAGS $<TARGET_PROPERTY:compiler-cpp,dialect_cpp2a>)
+    list(APPEND CMAKE_CXX_COMPILE_FEATURES ${compile_features_cpp20})
   elseif(CONFIG_STD_CPP20)
     set(STD_CPP_DIALECT_FLAGS $<TARGET_PROPERTY:compiler-cpp,dialect_cpp20>)
+    list(APPEND CMAKE_CXX_COMPILE_FEATURES ${compile_features_cpp20})
   elseif(CONFIG_STD_CPP2B)
     set(STD_CPP_DIALECT_FLAGS $<TARGET_PROPERTY:compiler-cpp,dialect_cpp2b>)
+    list(APPEND CMAKE_CXX_COMPILE_FEATURES ${compile_features_cpp20})
   else()
     assert(0 "Unreachable code. Expected C++ standard to have been chosen. See Kconfig.zephyr.")
   endif()
+  set(CMAKE_CXX_COMPILE_FEATURES ${CMAKE_CXX_COMPILE_FEATURES} PARENT_SCOPE)
 
   zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:${STD_CPP_DIALECT_FLAGS}>)
 endif()
@@ -979,6 +987,7 @@ set_ifndef(CSTD c99)
 zephyr_compile_options(
   $<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,cstd>${CSTD}>
 )
+set(CMAKE_C_COMPILE_FEATURES ${compile_features_${CSTD}} PARENT_SCOPE)
 
 # @Intent: Configure linker scripts, i.e. generate linker scripts with variables substituted
 toolchain_ld_configure_files()
@@ -1035,7 +1044,7 @@ if(CONFIG_USERSPACE)
     OUTPUT ${APP_SMEM_UNALIGNED_LD} ${APP_SMEM_PINNED_UNALIGNED_LD}
     COMMAND ${PYTHON_EXECUTABLE}
     ${ZEPHYR_BASE}/scripts/gen_app_partitions.py
-    -d ${OBJ_FILE_DIR}
+    -f ${CMAKE_BINARY_DIR}/compile_commands.json
     -o ${APP_SMEM_UNALIGNED_LD}
     $<$<BOOL:${APP_SMEM_PINNED_UNALIGNED_LD}>:--pinoutput=${APP_SMEM_PINNED_UNALIGNED_LD}>
     ${APP_SMEM_PINNED_PARTITION_LIST_ARG}

README.rst

@@ -8,9 +8,10 @@
 
    <a href="https://bestpractices.coreinfrastructure.org/projects/74"><img
    src="https://bestpractices.coreinfrastructure.org/projects/74/badge"></a>
-   <a href="https://buildkite.com/zephyr/zephyr">
+   <a
+   href="https://github.com/zephyrproject-rtos/zephyr/actions/workflows/twister.yaml?query=branch%3Amain">
    <img
-   src="https://badge.buildkite.com/f5bd0dc88306cee17c9b38e78d11bb74a6291e3f40e7d13f31.svg?branch=main"></a>
+   src="https://github.com/zephyrproject-rtos/zephyr/actions/workflows/twister.yaml/badge.svg?event=push"></a>
 
 
 The Zephyr Project is a scalable real-time operating system (RTOS) supporting
@@ -62,8 +63,7 @@ Here's a quick summary of resources to help you find your way around:
   `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
-  (buildkite) nightly build results.
+  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`_

VERSION

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

arch/arc/Kconfig

@@ -136,6 +136,7 @@ config NUM_IRQS
 config RGF_NUM_BANKS
 	int "Number of General Purpose Register Banks"
 	depends on ARC_FIRQ
+	depends on NUM_IRQ_PRIO_LEVELS > 1
 	range 1 2
 	default 2
 	help
@@ -145,10 +146,15 @@ config RGF_NUM_BANKS
 	  If fast interrupts are supported but there is only 1
 	  register bank, the fast interrupt handler must save
 	  and restore general purpose registers.
+	  NOTE: it's required to have more than one interrupt priority level
+	  to use second register bank - otherwise all interrupts will use
+	  same register bank. Such configuration isn't supported in software
+	  and it is not beneficial from the performance point of view.
 
 config ARC_FIRQ
 	bool "FIRQ enable"
 	depends on ISA_ARCV2
+	depends on NUM_IRQ_PRIO_LEVELS > 1
 	default y
 	help
 	  Fast interrupts are supported (FIRQ). If FIRQ enabled, for interrupts
@@ -156,6 +162,10 @@ config ARC_FIRQ
 	  other regs will be saved according to the number of register bank;
 	  If FIRQ is disabled, the handle of interrupts with highest priority
 	  will be same with other interrupts.
+	  NOTE: we don't allow the configuration with FIRQ enabled and only one
+	  interrupt priority level (so all interrupts are FIRQ). Such
+	  configuration isn't supported in software and it is not beneficial
+	  from the performance point of view.
 
 config ARC_FIRQ_STACK
 	bool "Enable separate firq stack"

arch/arm/core/aarch32/mpu/arm_core_mpu.c

@@ -278,7 +278,7 @@ void z_arm_configure_dynamic_mpu_regions(struct k_thread *thread)
 
 		__ASSERT((uintptr_t)&z_priv_stacks_ram_start <= guard_start,
 		"Guard start: (0x%lx) below privilege stacks boundary: (%p)",
-		guard_start, &z_priv_stacks_ram_start);
+		guard_start, z_priv_stacks_ram_start);
 	} else
 #endif /* CONFIG_USERSPACE */
 	{

boards/Kconfig

@@ -14,6 +14,13 @@ config QEMU_TARGET
 	  Mark all QEMU targets with this variable for checking whether we are
 	  running in an emulated environment.
 
+config NET_DRIVERS
+	bool
+	default y if QEMU_TARGET && NETWORKING
+	help
+	  When building for a qemu target then NET_DRIVERS will be default
+	  enabled to allow for easy use of SLIP or PPP
+
 # Note: $BOARD_DIR might be a glob pattern
 
 choice

boards/arc/nsim/support/mdb_hs6x.args

@@ -10,7 +10,6 @@
 	-prop=nsim_isa_vec64=1
 	-dcache=65536,64,2,a
 	-dcache_feature=2
-	-dcache_uncached_region
 	-dcache_mem_cycles=2
 	-icache=65536,64,4,a
 	-icache_feature=2

boards/arc/nsim/support/mdb_hs6x_smp.args

@@ -10,7 +10,6 @@
 	-prop=nsim_isa_vec64=1
 	-dcache=65536,64,2,a
 	-dcache_feature=2
-	-dcache_uncached_region
 	-dcache_mem_cycles=2
 	-icache=65536,64,4,a
 	-icache_feature=2

boards/arm/arduino_nano_33_ble/arduino_nano_33_ble_defconfig

@@ -11,7 +11,6 @@ CONFIG_HW_STACK_PROTECTION=y
 # enable peripherals
 CONFIG_GPIO=y
 CONFIG_SERIAL=y
-CONFIG_CONSOLE=y
 
 # enable sam-ba bootloader on legacy mode
 CONFIG_BOOTLOADER_BOSSA=y

boards/arm/b_u585i_iot02a/doc/index.rst

@@ -255,9 +255,9 @@ Debugging
 STM32U5 support is not currently supported in openocd. As a temporary workaround,
 user can use `STMicroelectronics customized version of OpenOCD`_ to debug the
 the B_U585I_IOT02A Discovery kit.
-For this you need to fetch this repo and build openocd following the instructions
-provided in the README of the project. Then, build zephyr project indicating the
-openocd location in west build command.
+For this you need to fetch this repo, checkout branch "openocd-cubeide-r3" and
+build openocd following the instructions provided in the README of the project.
+Then, build zephyr project indicating the openocd location in west build command.
 
 Here is an example for the :ref:`blinky-sample` application.
 
@@ -269,24 +269,18 @@ Here is an example for the :ref:`blinky-sample` application.
 
 Then, indicate openocd as the chosen runner in flash and debug commands:
 
-.. zephyr-app-commands::
-   :zephyr-app: samples/basic/blinky
-   :board: b_u585i_iot02a
-   :gen-args: -r openocd
-   :goals: flash
 
-.. zephyr-app-commands::
-   :zephyr-app: samples/basic/blinky
-   :board: nucleo_u575zi_q
-   :gen-args: -r openocd
-   :goals: debug
+   .. code-block:: console
+
+      $ west flash -r openocd
+      $ west debug -r openocd
 
 
 .. _B U585I IOT02A Discovery kit website:
    https://www.st.com/en/evaluation-tools/b-u585i-iot02a.html
 
 .. _B U585I IOT02A board User Manual:
-   https://www.st.com/resource/en/user_manual/dm00698410.pdf
+   https://www.st.com/resource/en/user_manual/um2839-discovery-kit-for-iot-node-with-stm32u5-series-stmicroelectronics.pdf
 
 .. _STM32U585 on www.st.com:
    https://www.st.com/en/microcontrollers-microprocessors/stm32u575-585.html

boards/arm/bl5340_dvk/doc/index.rst

@@ -43,8 +43,8 @@ This development kit has the following features:
 * :abbr:`USB (Universal Serial Bus)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/bl5340_dvk_front.jpg
-     :width: 800px
+.. figure:: img/bl5340_dvk_top.png
+     :width: 340px
      :align: center
      :alt: BL5340 DVK
 

boards/arm/bt610/Kconfig

@@ -1,4 +1,4 @@
-# BT6X0 board configuration
+# BT610 board configuration
 
 # Copyright (c) 2021 Laird Connectivity
 # SPDX-License-Identifier: Apache-2.0
@@ -7,4 +7,4 @@ config BOARD_ENABLE_DCDC
 	bool "Enable DCDC mode"
 	select SOC_DCDC_NRF52X
 	default y
-	depends on BOARD_BT6X0
+	depends on BOARD_BT610

boards/arm/bt610/Kconfig.board

@@ -1,8 +1,8 @@
-# BT6X0 board configuration
+# BT610 board configuration
 
 # Copyright (c) 2021 Laird Connectivity
 # SPDX-License-Identifier: Apache-2.0
 
-config BOARD_BT6X0
-	bool "BT6X0"
+config BOARD_BT610
+	bool "BT610"
 	depends on SOC_NRF52840_QIAA

boards/arm/bt610/Kconfig.defconfig

@@ -3,10 +3,10 @@
 # Copyright (c) 2021 Laird Connectivity
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_BT6X0
+if BOARD_BT610
 
 config BOARD
-	default "bt6x0"
+	default "bt610"
 
 config IEEE802154_NRF5
 	default y
@@ -21,4 +21,4 @@ DT_COMPAT_TI_TCA9538 := ti,tca9538
 config I2C
 	default $(dt_compat_on_bus,$(DT_COMPAT_TI_TCA9538),i2c)
 
-endif # BOARD_BT6X0
+endif # BOARD_BT610

boards/arm/bt610/bt610.dts

@@ -8,8 +8,8 @@
 #include <nordic/nrf52840_qiaa.dtsi>
 
 / {
-	model = "Laird BT6x0 Sensor";
-	compatible = "lairdconnect,bt6x0";
+	model = "Laird BT610 Sensor";
+	compatible = "lairdconnect,bt610";
 
 	chosen {
 		zephyr,console = &uart0;

boards/arm/bt610/bt610.yaml

@@ -1,5 +1,5 @@
-identifier: bt6x0
-name: BT6X0
+identifier: bt610
+name: BT610
 type: mcu
 arch: arm
 ram: 256

boards/arm/bt610/bt610_defconfig

@@ -2,7 +2,7 @@
 
 CONFIG_SOC_SERIES_NRF52X=y
 CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_BT6X0=y
+CONFIG_BOARD_BT610=y
 
 # Enable MPU
 CONFIG_ARM_MPU=y

boards/arm/bt610/doc/bt610.rst

@@ -1,12 +1,12 @@
-.. _bt6x0:
+.. _bt610:
 
-Laird Connectivity Sentrius BT6x0 Sensor
+Laird Connectivity Sentrius BT610 Sensor
 ########################################
 
 Overview
 ********
 
-The Sentrius™ BT6x0 Sensor is a battery powered, Bluetooth v5 Long Range
+The Sentrius™ BT610 Sensor is a battery powered, Bluetooth v5 Long Range
 integrated sensor platform that uses a Nordic Semiconductor nRF52840 ARM
 Cortex-M4F CPU.
 
@@ -28,19 +28,19 @@ The sensor has the following features:
 * :abbr:`UART (Universal Asynchronous Receiver-Transmitter)`
 * :abbr:`WDT (Watchdog Timer)`
 
-.. figure:: img/bt6x0_front.jpg
+.. figure:: img/bt610_front.jpg
      :width: 500px
      :align: center
-     :alt: Sentrius BT6x0 Sensor, front view
+     :alt: Sentrius BT610 Sensor, front view
 
-     Sentrius BT6x0 Sensor, front view
+     Sentrius BT610 Sensor, front view
 
-.. figure:: img/bt6x0_back.jpg
+.. figure:: img/bt610_back.jpg
      :width: 500px
      :align: center
-     :alt: Sentrius BT6x0 Sensor, rear view
+     :alt: Sentrius BT610 Sensor, rear view
 
-     Sentrius BT6x0 Sensor, rear view
+     Sentrius BT610 Sensor, rear view
 
 More information about the board can be found at the
 `Sentrius BT610 website`_.
@@ -51,7 +51,7 @@ Hardware
 Supported Features
 ==================
 
-The BT6x0 Sensor supports the following
+The BT610 Sensor supports the following
 hardware features:
 
 +-----------+------------+----------------------+
@@ -89,12 +89,12 @@ hardware features:
 | WDT       | on-chip    | watchdog             |
 +-----------+------------+----------------------+
 
-.. figure:: img/bt6x0_board.jpg
+.. figure:: img/bt610_board.jpg
      :width: 500px
      :align: center
-     :alt: Sentrius BT6x0 Sensor, board layout
+     :alt: Sentrius BT610 Sensor, board layout
 
-     Sentrius BT6x0 Sensor, board layout
+     Sentrius BT610 Sensor, board layout
 
 Connections and IOs
 ===================
@@ -102,7 +102,7 @@ Connections and IOs
 LED
 ---
 
-Two LEDs are visible through the BT6x0 housing lid. Note that the LEDs can be
+Two LEDs are visible through the BT610 housing lid. Note that the LEDs can be
 driven either directly, or via PWM. PWM should be used when current consumption
 is required to be minimised.
 
@@ -115,7 +115,7 @@ is required to be minimised.
 Push button
 ------------
 
-The BT6x0 incorporates three mechanical push buttons. Note these are only
+The BT610 incorporates three mechanical push buttons. Note these are only
 accessible with the housing cover removed.
 
 Two of the buttons are available for use via the board DTS file, as follows.
@@ -129,7 +129,7 @@ microcontroller.
 Magnetoresistive sensor
 -----------------------
 
-The BT6x0 incorporates a Honeywell SM351LT magnetoresistive sensor. Refer to
+The BT610 incorporates a Honeywell SM351LT magnetoresistive sensor. Refer to
 the `Honeywell SM351LT datasheet`_ for further details.
 
 * MAG_1 = SW2 = P1.15 (SM3531LT_0)
@@ -157,7 +157,7 @@ This can deliver up to 50mA peak and 20mA continuous current.
 Sensor connectivity
 -------------------
 
-The BT6x0 incorporates three terminal blocks J5, J6 & J7 that allow
+The BT610 incorporates three terminal blocks J5, J6 & J7 that allow
 connectivity to its sensor inputs, as follows.
 
 Terminal Block J5
@@ -485,12 +485,12 @@ Required pins are as follows.
 Programming and Debugging
 *************************
 
-Applications for the ``bt6x0`` board configuration can be
+Applications for the ``bt610`` board configuration can be
 built and flashed in the usual way (see :ref:`build_an_application`
 and :ref:`application_run` for more details); however, the standard
 debugging targets are not currently available.
 
-The BT6x0 features a 10 way header, J3, for connection of a
+The BT610 features a 10 way header, J3, for connection of a
 programmer/debugger, with pinout as follows.
 
 +-----------+------------+----------------------+
@@ -537,7 +537,7 @@ pinout as follows.
 +-----------+------------+----------------------+-----------+
 
 Note that pin 3 requires a solder bridge to be closed to enable powering of the
-BT6x0 board via the UART connector.
+BT610 board via the UART connector.
 
 Flashing
 ========
@@ -552,7 +552,7 @@ Here is an example for the :ref:`hello_world` application.
 
 First, run your favorite terminal program to listen for output.
 
-NOTE: On the BT6x0, the UART lines are at TTL levels and must be passed through
+NOTE: On the BT610, the UART lines are at TTL levels and must be passed through
 an appropriate line driver circuit for translation to RS232 levels. Refer to
 the `MAX3232 datasheet`_ for a suitable driver IC.
 
@@ -560,14 +560,14 @@ the `MAX3232 datasheet`_ for a suitable driver IC.
 
    $ minicom -D <tty_device> -b 115200
 
-Replace :code:`<tty_device>` with the port where the BT6x0 can be found. For
+Replace :code:`<tty_device>` with the port where the BT610 can be found. For
 example, under Linux, :code:`/dev/ttyUSB0`.
 
 Then build and flash the application in the usual way.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: bt6x0
+   :board: bt610
    :goals: build flash
 
 Note that an external debugger is required to perform application flashing.
@@ -575,14 +575,14 @@ Note that an external debugger is required to perform application flashing.
 Debugging
 =========
 
-The ``bt6x0`` board does not have an on-board J-Link debug IC
+The ``bt610`` board does not have an on-board J-Link debug IC
 as some nRF5x development boards, however, instructions from the
 :ref:`nordic_segger` page also apply to this board, with the additional step
 of connecting an external debugger.
 
-Testing Bluetooth on the BT6x0
+Testing Bluetooth on the BT610
 ***********************************
-Many of the Bluetooth examples will work on the BT6x0.
+Many of the Bluetooth examples will work on the BT610.
 Try them out:
 
 * :ref:`ble_peripheral`
@@ -590,7 +590,7 @@ Try them out:
 * :ref:`bluetooth-ibeacon-sample`
 
 
-Testing the LEDs and buttons on the BT6x0
+Testing the LEDs and buttons on the BT610
 *****************************************
 
 There are 2 samples that allow you to test that the buttons (switches) and LEDs
@@ -601,7 +601,7 @@ on the board are working properly with Zephyr:
 
 You can build and flash the examples to make sure Zephyr is running correctly
 on your board. The button, LED and sensor device definitions can be found in
-:zephyr_file:`boards/arm/bt6x0/bt6x0.dts`.
+:zephyr_file:`boards/arm/bt610/bt610.dts`.
 
 
 References

boards/arm/lpcxpresso54114/lpcxpresso54114_m0_defconfig

@@ -7,7 +7,6 @@
 CONFIG_SOC_LPC54114_M0=y
 CONFIG_SOC_SERIES_LPC54XXX=y
 CONFIG_BOARD_LPCXPRESSO54114_M0=y
-CONFIG_CONSOLE=y
 CONFIG_USE_SEGGER_RTT=y
 CONFIG_SERIAL=n
 CONFIG_CORTEX_M_SYSTICK=y

boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840_defconfig

@@ -13,9 +13,6 @@ CONFIG_HW_STACK_PROTECTION=y
 # enable GPIO
 CONFIG_GPIO=y
 
-# enable console
-CONFIG_CONSOLE=y
-
 # additional board options
 CONFIG_GPIO_AS_PINRESET=y
 CONFIG_NFCT_PINS_AS_GPIOS=y

boards/arm/nucleo_l073rz/Kconfig.defconfig

@@ -12,4 +12,10 @@ config SPI_STM32_INTERRUPT
 	default y
 	depends on SPI
 
+# FIXME: LSE not working as LPTIM clock source. Use LSI instead.
+choice STM32_LPTIM_CLOCK
+	default STM32_LPTIM_CLOCK_LSI
+	depends on STM32_LPTIM_TIMER
+endchoice
+
 endif # BOARD_NUCLEO_L073RZ

boards/arm/nucleo_u575zi_q/doc/nucleou575zi_q.rst

@@ -240,9 +240,9 @@ Debugging
 STM32U5 support is not currently supported in openocd. As a temporary workaround,
 user can use `STMicroelectronics customized version of OpenOCD`_ to debug the
 the Nucleo U575ZI Q.
-For this you need to fetch this repo and build openocd following the instructions
-provided in the README of the project. Then, build zephyr project indicating the
-openocd location in west build command.
+For this you need to fetch this repo, checkout branch "openocd-cubeide-r3" and
+build openocd following the instructions provided in the README of the project.
+Then, build zephyr project indicating the openocd location in west build command.
 
 Here is an example for the :ref:`blinky-sample` application.
 
@@ -254,17 +254,11 @@ Here is an example for the :ref:`blinky-sample` application.
 
 Then, indicate openocd as the chosen runner in flash and debug commands:
 
-.. zephyr-app-commands::
-   :zephyr-app: samples/basic/blinky
-   :board: nucleo_u575zi_q
-   :gen-args: -r openocd
-   :goals: flash
 
-.. zephyr-app-commands::
-   :zephyr-app: samples/basic/blinky
-   :board: nucleo_u575zi_q
-   :gen-args: -r openocd
-   :goals: debug
+   .. code-block:: console
+
+      $ west flash -r openocd
+      $ west debug -r openocd
 
 
 .. _STM32 Nucleo-144 board User Manual:

boards/arm/thingy53_nrf5340/thingy53_nrf5340_cpunet_defconfig

@@ -12,6 +12,3 @@ CONFIG_HW_STACK_PROTECTION=y
 
 # Enable GPIO
 CONFIG_GPIO=y
-
-# Enable console
-CONFIG_CONSOLE=y

boards/arm/waveshare_open103z/doc/index.rst

@@ -40,7 +40,7 @@ The Waveshare Open103Z configuration supports the following hardware features:
 +-----------+------------+--------------------------------------+
 | I2C       | on-chip    | i2c                                  |
 +-----------+------------+--------------------------------------+
-| CAN       | on-chip    | can                                  |
+| CAN       | on-chip    | can (disabled by default)            |
 +-----------+------------+--------------------------------------+
 | USB       | on-chip    | usb                                  |
 +-----------+------------+--------------------------------------+

boards/arm/waveshare_open103z/waveshare_open103z.yaml

@@ -16,4 +16,3 @@ supported:
   - watchdog
   - adc
   - usb_device
-  - can

boards/deprecated.cmake

@@ -9,6 +9,7 @@
 # set(<old_board_name>_DEPRECATED <new_board_name>)
 
 set(bl5340_dvk_cpuappns_DEPRECATED bl5340_dvk_cpuapp_ns)
+set(bt6x0_DEPRECATED bt610)
 set(mps2_an521_nonsecure_DEPRECATED mps2_an521_ns)
 set(musca_b1_nonsecure_DEPRECATED musca_b1_ns)
 set(musca_s1_nonsecure_DEPRECATED musca_s1_ns)

boards/x86/acrn/doc/index.rst

@@ -5,6 +5,28 @@ Zephyr's is capable of running as a guest under the x86 ACRN
 hypervisor (see https://projectacrn.org/).  The process for getting
 this to work is somewhat involved, however.
 
+ACRN hypervisor supports a hybrid scenario where Zephyr runs in a so-
+called "pre-launched" mode. This means Zephyr will access the ACRN
+hypervisor directly without involving the SOS VM. This is the most
+practical user scenario in the real world because Zephyr's real-time
+and safety capability can be assured without influence from other
+VMs. The following figure from ACRN's official documentation shows
+how a hybrid scenario works:
+
+.. figure:: ACRN-Hybrid.png
+    :align: center
+    :alt: ACRN Hybrid User Scenario
+    :figclass: align-center
+    :width: 80%
+
+    ACRN Hybrid User Scenario
+
+In this tutorial, we will show you how to build a minimal running instance of Zephyr
+and ACRN hypervisor to demonstrate that it works successfully. To learn more about
+other features of ACRN, such as building and using the SOS VM or other guest VMs,
+please refer to the Getting Started Guide for ACRN:
+https://projectacrn.github.io/latest/tutorials/using_hybrid_mode_on_nuc.html
+
 Build your Zephyr App
 *********************
 
@@ -15,6 +37,10 @@ normally would, selecting an appropriate board:
 
         west build -b acrn_ehl_crb samples/hello_world
 
+In this tutorial, we will use the Intel Elkhart Lake Reference Board
+(`EHL`_ CRB) since it is one of the suggested platform for this
+type of scenario. Use ``acrn_ehl_crb`` as the target board parameter.
+
 Note the kconfig output in ``build/zephyr/.config``, you will need to
 reference that to configure ACRN later.
 
@@ -31,6 +57,9 @@ First you need the source code, clone from:
 
         git clone https://github.com/projectacrn/acrn-hypervisor
 
+We suggest that you use versions v2.5.1 or later of the ACRN hypervisor
+as they have better support for SMP in Zephyr.
+
 Like Zephyr, ACRN favors build-time configuration management instead
 of runtime probing or control.  Unlike Zephyr, ACRN has single large
 configuration files instead of small easily-merged configuration
@@ -102,10 +131,51 @@ many CPUs in the ``<cpu_affinity>`` tag.  For example:
 
     .. code-block:: xml
 
-        <cpu_affinity>
-            <pcpu_id>0</pcpu_id>
-            <pcpu_id>1</pcpu_id>
-        </cpu_affinity>
+        <vm id="0">
+            <vm_type>SAFETY_VM</vm_type>
+            <name>ACRN PRE-LAUNCHED VM0</name>
+            <guest_flags>
+                <guest_flag>0</guest_flag>
+            </guest_flags>
+            <cpu_affinity>
+                <pcpu_id>0</pcpu_id>
+                <pcpu_id>1</pcpu_id>
+            </cpu_affinity>
+            ...
+            <clos>
+                <vcpu_clos>0</vcpu_clos>
+                <vcpu_clos>0</vcpu_clos>
+            </clos>
+            ...
+        </vm>
+
+To use SMP, we have to change the pcpu_id of VM0 to 0 and 1.
+This configures ACRN to run Zephyr on CPU0 and CPU1. The ACRN hypervisor
+and Zephyr application will not boot successfully without this change.
+If you plan to run Zephyr with one CPU only, you can skip it.
+
+Since Zephyr is using CPU0 and CPU1, we also have to change
+VM1's configuration so it runs on CPU2 and CPU3. If your ACRN set up has
+additional VMs, you should change their configurations as well.
+
+    .. code-block:: xml
+
+        <vm id="1">
+            <vm_type>SOS_VM</vm_type>
+            <name>ACRN SOS VM</name>
+            <guest_flags>
+                <guest_flag>0</guest_flag>
+            </guest_flags>
+            <cpu_affinity>
+                <pcpu_id>2</pcpu_id>
+                <pcpu_id>3</pcpu_id>
+            </cpu_affinity>
+            <clos>
+                <vcpu_clos>0</vcpu_clos>
+                <vcpu_clos>0</vcpu_clos>
+            </clos>
+            ...
+        </vm>
 
 Note that these indexes are physical CPUs on the host.  When
 configuring multiple guests, you probably don't want to overlap these
@@ -228,3 +298,6 @@ command:
         ----- Entering VM 0 Shell -----
         *** Booting Zephyr OS build v2.6.0-rc1-324-g1a03783861ad  ***
         Hello World! acrn
+
+
+.. _EHL: https://www.intel.com/content/www/us/en/products/docs/processors/embedded/enhanced-for-iot-platform-brief.html

cmake/app/boilerplate.cmake

@@ -489,10 +489,7 @@ zephyr_boilerplate_watch(CONF_FILE)
 
 if(DTC_OVERLAY_FILE)
   # DTC_OVERLAY_FILE has either been specified on the cmake CLI or is already
-  # in the CMakeCache.txt. This has precedence over the environment
-  # variable DTC_OVERLAY_FILE
-elseif(DEFINED ENV{DTC_OVERLAY_FILE})
-  set(DTC_OVERLAY_FILE $ENV{DTC_OVERLAY_FILE})
+  # in the CMakeCache.txt.
 elseif(APP_BOARD_DTS)
   set(DTC_OVERLAY_FILE ${APP_BOARD_DTS})
 elseif(EXISTS          ${APPLICATION_SOURCE_DIR}/${BOARD}.overlay)
@@ -549,6 +546,14 @@ set(SOC_SERIES ${CONFIG_SOC_SERIES})
 set(SOC_TOOLCHAIN_NAME ${CONFIG_SOC_TOOLCHAIN_NAME})
 set(SOC_FAMILY ${CONFIG_SOC_FAMILY})
 
+# For the gen_app_partitions.py to work correctly, we must ensure that
+# all targets exports their compile commands to fetch object files.
+# We enable it unconditionally, as this is also useful for several IDEs
+set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE CACHE BOOL
+    "Export CMake compile commands. Used by gen_app_partitions.py script"
+    FORCE
+)
+
 if("${SOC_SERIES}" STREQUAL "")
   set(SOC_PATH ${SOC_NAME})
 else()

cmake/compiler/compiler_features.cmake

@@ -0,0 +1,26 @@
+set(c23id c2x gnu2x)
+set(c17id c17 c18 gnu17 gnu18 "iso9899:2017" "iso9899:2018")
+set(c11id c11 gnu11 "iso9899:2011")
+set(c99id c99 gnu99 "iso9899:1999")
+set(c90id c89 c90 gnu89 gnu90 "iso9899:1990" "iso9899:199409")
+
+set(compile_features_list)
+
+# For each id value above a compile_features_${idval} with a list of supported
+# `c_std_XX` values are created for easy lookup.
+# For example, the settings
+# - `compile_feature_c99` will contain `c_std_90;c_std_99`
+# - `compile_feature_iso9899:2011` will contain `c_std_90;c_std_99;c_std_11`
+# that can then be used to set CMAKE_C_COMPILE_FEATURES accordingly.
+foreach(standard 90 99 11 17 23)
+  list(APPEND compile_features_list c_std_${standard})
+  foreach(id ${c${standard}id})
+    set(compile_features_${id} ${compile_features_list})
+  endforeach()
+endforeach()
+
+set(compile_features_cpp98 cxx_std_98)
+set(compile_features_cpp11 cxx_std_11 ${compile_features_cpp98})
+set(compile_features_cpp14 cxx_std_14 ${compile_features_cpp11})
+set(compile_features_cpp17 cxx_std_17 ${compile_features_cpp14})
+set(compile_features_cpp20 cxx_std_20 ${compile_features_cpp17})

cmake/target_toolchain_flags.cmake

@@ -24,6 +24,11 @@ set(TOOLCHAIN_SIGNATURE ${CMAKE_C_COMPILER_MD5_SUM})
 string(MD5 COMPILER_SIGNATURE ${CMAKE_C_COMPILER}_${CMAKE_C_COMPILER_ID}_${CMAKE_C_COMPILER_VERSION})
 set(TOOLCHAIN_SIGNATURE ${TOOLCHAIN_SIGNATURE}_${COMPILER_SIGNATURE})
 
+# Load the compile features file which will provide compile features lists for
+# various C / CXX language dialects that can then be exported based on current
+# Zephyr Kconfig settings or the CSTD global property.
+include(${CMAKE_CURRENT_LIST_DIR}/compiler/compiler_features.cmake)
+
 # Loading of templates are strictly not needed as they does not set any
 # properties.
 # They purely provides an overview as well as a starting point for supporting

doc/contribute/index.rst

@@ -179,8 +179,8 @@ on https://github.com and have Git tools available on your development system.
    (Linux, macOS, and Windows) but some of the tools used in the sections below
    are only available on Linux and macOS. On Windows, instead of running these
    tools yourself, you will need to rely on the Continuous Integration (CI)
-   service ``buildkite``, which runs automatically on GitHub when you submit
-   your Pull Request (PR).  You can see any failure results in the Buildkite
+   service using Github Actions, which runs automatically on GitHub when you submit
+   your Pull Request (PR).  You can see any failure results in the workflow
    details link near the end of the PR conversation list. See
    `Continuous Integration`_ for more information
 
@@ -696,11 +696,10 @@ every Pull Request (PR) in order to verify several aspects of the PR:
 * Twister builds for multiple architectures and boards
 * Documentation build to verify any doc changes
 
-CI is run both on the ``buildkite`` cloud service and Github Actions and it uses
-the same tools described in the `Contribution Tools`_ section.
-The CI results must be green indicating "All checks have passed" before
-the Pull Request can be merged.  CI is run when the PR is created, and
-again every time the PR is modified with a commit.
+CI is run on Github Actions and it uses the same tools described in the
+`Contribution Tools`_ section.  The CI results must be green indicating "All
+checks have passed" before the Pull Request can be merged.  CI is run when the
+PR is created, and again every time the PR is modified with a commit.
 
 The current status of the CI run can always be found at the bottom of the
 GitHub PR page, below the review status. Depending on the success or failure
@@ -710,17 +709,16 @@ of the run you will see:
 * "All checks have failed"
 
 In case of failure you can click on the "Details" link presented below the
-failure message in order to navigate to ``buildkite`` or ``Github Actions``
-and inspect the results.
-Once you click on the link you will be taken to the ``buildkite`` summary
+failure message in order to navigate to ``Github Actions`` and inspect the
+results.
+Once you click on the link you will be taken to the ``Github actions`` summary
 results page where a table with all the different builds will be shown. To see
 what build or test failed click on the row that contains the failed (i.e.
-non-green) build and then click on the "Tests" tab to see the console output
-messages indicating the failure.
+non-green) build.
 
 The `builds@lists.zephyrproject.org mailing list
-<https://lists.zephyrproject.org/g/builds>`_
-archives the CI (buildkite) nightly build results.
+<https://lists.zephyrproject.org/g/builds>`_ archives any nightly build results
+produced by CI.
 
 Contributions to External Modules
 **********************************

doc/getting_started/toolchain_3rd_party_x_compilers.rst

@@ -8,14 +8,14 @@ external organization. Several of these are available.
 
 .. _toolchain_gnuarmemb:
 
-GNU ARM Embedded
+GNU Arm Embedded
 ****************
 
    .. warning::
 
       Do not install the toolchain into a path with spaces.
 
-#. Download and install a `GNU ARM Embedded`_ build for your operating system
+#. Download and install a `GNU Arm Embedded`_ build for your operating system
    and extract it on your file system.
 
    .. note::
@@ -61,6 +61,57 @@ GNU ARM Embedded
       - Set :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``gnuarmemb``.
       - Set :envvar:`GNUARMEMB_TOOLCHAIN_PATH` to the brew installation directory (something like ``/usr/local``)
 
+.. _toolchain_armclang:
+
+Arm Compiler 6
+**************
+
+#. Download and install a development suite containing the `Arm Compiler 6`_
+   for your operating system.
+
+#. :ref:`Set these environment variables <env_vars>`:
+
+   - Set :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``armclang``.
+   - Set :envvar:`ARMCLANG_TOOLCHAIN_PATH` to the toolchain installation
+     directory.
+
+#. The Arm Compiler 6 needs the :envvar:`ARMLMD_LICENSE_FILE` environment
+   variable to point to your license file or server.
+
+For example:
+
+   .. code-block:: console
+
+      # Linux, macOS, license file:
+      export ARMLMD_LICENSE_FILE=/<path>/license_armds.dat
+      # Linux, macOS, license server:
+      export ARMLMD_LICENSE_FILE=8224@myserver
+
+      # Windows, license file:
+      > set ARMLMD_LICENSE_FILE=c:\<path>\license_armds.dat
+      # Windows, license server:
+      > set ARMLMD_LICENSE_FILE=8224@myserver
+
+#. If the Arm Compiler 6 was installed as part of an Arm Development Studio, then
+   you must set the :envvar:`ARM_PRODUCT_DEF` to point to the product definition file:
+   See also: `Product and toolkit configuration <https://developer.arm.com/tools-and-software/software-development-tools/license-management/resources/product-and-toolkit-configuration>`_.
+   For example if the Arm Development Studio is installed in:
+   ``/opt/armds-2020-1`` with a Gold license, then set :envvar:`ARM_PRODUCT_DEF`
+   to point to ``/opt/armds-2020-1/gold.elmap``.
+
+   .. note::
+
+      The Arm Compiler 6 uses ``armlink`` for linking. This is incompatible
+      with Zephyr's linker script template, which works with GNU ld. Zephyr's
+      Arm Compiler 6 support Zephyr's CMake linker script generator, which
+      supports generating scatter files. Basic scatter file support is in
+      place, but there are still areas covered in ld templates which are not
+      fully supported by the CMake linker script generator.
+
+      Some Zephyr subsystems or modules may also contain C or assembly code
+      that relies on GNU intrinsics and have not yet been updated to work fully
+      with ``armclang``.
+
 Intel oneAPI Toolkit
 *********************
 
@@ -159,5 +210,6 @@ You can build toolchains from source code using crosstool-NG.
       $ echo $XTOOLS_TOOLCHAIN_PATH
       /Volumes/CrossToolNGNew/build/output/
 
-.. _GNU ARM Embedded: https://developer.arm.com/open-source/gnu-toolchain/gnu-rm
+.. _GNU Arm Embedded: https://developer.arm.com/open-source/gnu-toolchain/gnu-rm
 .. _crosstool-ng site: http://crosstool-ng.org
+.. _Arm Compiler 6: https://developer.arm.com/tools-and-software/embedded/arm-compiler/downloads/version-6

doc/guides/arch/arc-support-status.rst

@@ -41,7 +41,7 @@ Legend:
 +---------------------------------------------------------------------+------------+-------------+--------+------------+
 | Hardware floating point unit (FPU)                                  | Y          | Y           | N      | TBD        |
 +---------------------------------------------------------------------+------------+-------------+--------+------------+
-| Symmetric multiprocessing (SMP) support, switch-based               | N/A        | Y           | TBD    | WIP        |
+| Symmetric multiprocessing (SMP) support, switch-based               | N/A        | Y           | TBD    | Y          |
 +---------------------------------------------------------------------+------------+-------------+--------+------------+
 | Hardware-assisted stack checking                                    | Y          | Y           | TBD    | N          |
 +---------------------------------------------------------------------+------------+-------------+--------+------------+

doc/guides/device_mgmt/dfu.rst

@@ -36,11 +36,21 @@ In order to use MCUboot with Zephyr you need to take the following into account:
 
 1. You will need to define the flash partitions required by MCUboot; see
    :ref:`flash_map_api` for details.
-2. Your application's :file:`.conf` file needs to enable the
+2. You will have to specify your flash parition as the chosen code partition
+
+.. code-block:: devicetree
+
+   / {
+      chosen {
+         zephyr,code-partition = &slot0_partition;
+      };
+   };
+
+3. Your application's :file:`.conf` file needs to enable the
    :kconfig:`CONFIG_BOOTLOADER_MCUBOOT` Kconfig option in order for Zephyr to
    be built in an MCUboot-compatible manner
-3. You need to build and flash MCUboot itself on your device
-4. You might need to take precautions to avoid mass erasing the flash and also
+4. You need to build and flash MCUboot itself on your device
+5. You might need to take precautions to avoid mass erasing the flash and also
    to flash the Zephyr application image at the correct offset (right after the
    bootloader)
 

doc/guides/dts/howtos.rst

@@ -210,7 +210,6 @@ Here are some ways to set it:
    (``-DDTC_OVERLAY_FILE="file1.overlay;file2.overlay"``)
 #. with the CMake ``set()`` command in the application ``CMakeLists.txt``,
    before including zephyr's :file:`boilerplate.cmake` file
-#. using a ``DTC_OVERLAY_FILE`` environment variable (deprecated)
 #. create a ``boards/<BOARD>_<revision>.overlay`` file in the application
    folder for the current board revision. This requires that the board supports
    multiple revisions, see :ref:`porting_board_revisions`.

doc/reference/devicetree/api.rst

@@ -254,6 +254,8 @@ channels (e.g. ADC or DAC channels) for conversion.
 
 .. doxygengroup:: devicetree-io-channels
 
+.. _devicetree-pinctrl-api:
+
 Pinctrl (pin control)
 =====================
 

doc/reference/kernel/data_passing/message_queues.rst

@@ -202,10 +202,11 @@ in an asynchronous manner.
 .. note::
     A message queue can be used to transfer large data items, if desired.
     However, this can increase interrupt latency as interrupts are locked
-    while a data item is written or read. It is usually preferable to transfer
-    large data items by exchanging a pointer to the data item, rather than the
-    data item itself. The kernel's memory map and memory pool object types
-    can be helpful for data transfers of this sort.
+    while a data item is written or read. The time to write or read a data item
+    increases linearly with its size since the item is copied in its entirety
+    to or from the buffer in memory. For this reason, it is usually preferable
+    to transfer large data items by exchanging a pointer to the data item,
+    rather than the data item itself.
 
     A synchronous transfer can be achieved by using the kernel's mailbox
     object type.

doc/reference/kernel/data_passing/pipes.rst

@@ -164,8 +164,7 @@ Use a pipe to send streams of data between threads.
 .. note::
     A pipe can be used to transfer long streams of data if desired.  However
     it is often preferable to send pointers to large data items to avoid
-    copying the data. The kernel's memory map and memory pool object types
-    can be helpful for data transfers of this sort.
+    copying the data.
 
 Configuration Options
 *********************

doc/reference/kernel/data_passing/stacks.rst

@@ -32,12 +32,12 @@ A stack must be initialized before it can be used. This sets its queue to empty.
 A data value can be **added** to a stack by a thread or an ISR.
 The value is given directly to a waiting thread, if one exists;
 otherwise the value is added to the LIFO's queue.
-The kernel does *not* detect attempts to add a data value to a stack
-that has already reached its maximum quantity of queued values.
 
 .. note::
-    Adding a data value to a stack that is already full will result in
-    array overflow, and lead to unpredictable behavior.
+    If :kconfig:`CONFIG_NO_RUNTIME_CHECKS` is enabled, the kernel will *not* detect
+    and prevent attempts to add a data value to a stack that has already reached
+    its maximum quantity of queued values. Adding a data value to a stack that is
+    already full will result in array overflow, and lead to unpredictable behavior.
 
 A data value may be **removed** from a stack by a thread.
 If the stack's queue is empty a thread may choose to wait for it to be given.

doc/reference/kernel/other/float.rst

@@ -113,7 +113,7 @@ an extra 72 bytes of stack space where the callee-saved FP context can
 be saved.
 
 `Lazy Stacking
-<http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dai0298a/DAFGGBJD.html>`_
+<https://developer.arm.com/documentation/dai0298/a>`_
 is currently enabled in Zephyr applications on ARM Cortex-M
 architecture, minimizing interrupt latency, when the floating
 point context is active.

doc/reference/kernel/scheduling/index.rst

@@ -39,6 +39,15 @@ The kernel's scheduler selects the highest priority ready thread
 to be the current thread. When multiple ready threads of the same priority
 exist, the scheduler chooses the one that has been waiting longest.
 
+A thread's relative priority is primarily determined by its static priority.
+However, when both earliest-deadline-first scheduling is enabled
+(:kconfig:`CONFIG_SCHED_DEADLINE`) and a choice of threads have equal
+static priority, then the thread with the earlier deadline is considered
+to have the higher priority. Thus, when earliest-deadline-first scheduling is
+enabled, two threads are only considered to have the same priority when both
+their static priorities and deadlines are equal. The routine
+:c:func:`k_thread_deadline_set` is used to set a thread's deadline.
+
 .. note::
     Execution of ISRs takes precedence over thread execution,
     so the execution of the current thread may be replaced by an ISR

doc/reference/kernel/synchronization/semaphores.rst

@@ -37,6 +37,13 @@ Any number of threads may wait on an unavailable semaphore simultaneously.
 When the semaphore is given, it is taken by the highest priority thread
 that has waited longest.
 
+.. note::
+    You may initialize a "full" semaphore (count equal to limit) to limit the number
+    of threads able to execute the critical section at the same time. You may also
+    initialize an empty semaphore (count equal to 0, with a limit greater than 0)
+    to create a gate through which no waiting thread may pass until the semaphore
+    is incremented. All standard use cases of the common semaphore are supported.
+
 .. note::
     The kernel does allow an ISR to take a semaphore, however the ISR must
     not attempt to wait if the semaphore is unavailable.

doc/reference/kernel/threads/index.rst

@@ -245,6 +245,10 @@ A thread's initial priority value can be altered up or down after the thread
 has been started. Thus it is possible for a preemptible thread to become
 a cooperative thread, and vice versa, by changing its priority.
 
+.. note::
+    The scheduler does not make heuristic decisions to re-prioritize threads.
+    Thread priorities are set and changed only at the application's request.
+
 The kernel supports a virtually unlimited number of thread priority levels.
 The configuration options :kconfig:`CONFIG_NUM_COOP_PRIORITIES` and
 :kconfig:`CONFIG_NUM_PREEMPT_PRIORITIES` specify the number of priority
@@ -269,9 +273,10 @@ When enabled (see :kconfig:`CONFIG_NUM_METAIRQ_PRIORITIES`), there is a special
 subclass of cooperative priorities at the highest (numerically lowest)
 end of the priority space: meta-IRQ threads.  These are scheduled
 according to their normal priority, but also have the special ability
-to preempt all other threads (and other meta-irq threads) at lower
+to preempt all other threads (and other meta-IRQ threads) at lower
 priorities, even if those threads are cooperative and/or have taken a
-scheduler lock.
+scheduler lock. Meta-IRQ threads are still threads, however,
+and can still be interrupted by any hardware interrupt.
 
 This behavior makes the act of unblocking a meta-IRQ thread (by any
 means, e.g. creating it, calling k_sem_give(), etc.) into the
@@ -284,7 +289,7 @@ run before the current CPU returns into application code.
 
 Unlike similar features in other OSes, meta-IRQ threads are true
 threads and run on their own stack (which must be allocated normally),
-not the per-CPU interrupt stack.  Design work to enable the use of the
+not the per-CPU interrupt stack. Design work to enable the use of the
 IRQ stack on supported architectures is pending.
 
 Note that because this breaks the promise made to cooperative

doc/reference/usb/hid.rst

@@ -0,0 +1,61 @@
+.. _usb_device_hid:
+
+USB Human Interface Devices (HID) support
+#########################################
+
+Since the USB HID specification is not only used by the USB subsystem, the USB HID API
+is split into two header files :zephyr_file:`include/usb/class/hid.h`
+and :zephyr_file:`include/usb/class/usb_hid.h`. The second includes a specific
+part for HID support in the USB device stack.
+
+HID Item helpers
+****************
+
+HID item helper macros can be used to compose a HID Report Descriptor.
+The names correspond to those used in the USB HID Specification.
+
+Example of a HID Report Descriptor:
+
+.. code-block:: c
+
+    static const uint8_t hid_report_desc[] = {
+        HID_USAGE_PAGE(HID_USAGE_GEN_DESKTOP),
+        HID_USAGE(HID_USAGE_GEN_DESKTOP_UNDEFINED),
+        HID_COLLECTION(HID_COLLECTION_APPLICATION),
+        HID_LOGICAL_MIN8(0),
+        /* logical maximum 255 */
+        HID_LOGICAL_MAX16(0xFF, 0x00),
+        HID_REPORT_ID(1),
+        HID_REPORT_SIZE(8),
+        HID_REPORT_COUNT(1),
+        HID_USAGE(HID_USAGE_GEN_DESKTOP_UNDEFINED),
+        /* HID_INPUT (Data, Variable, Absolute)	*/
+        HID_INPUT(0x02),
+        HID_END_COLLECTION,
+    };
+
+
+HID items reference
+*******************
+
+.. doxygengroup:: usb_hid_items
+
+HID types reference
+*******************
+
+.. doxygengroup:: usb_hid_types
+
+HID Mouse and Keyboard report descriptors
+*****************************************
+
+The pre-defined Mouse and Keyboard report descriptors can be used by
+a HID device implementation or simply as examples.
+
+.. doxygengroup:: usb_hid_mk_report_desc
+
+HID Class Device API reference
+******************************
+
+USB HID devices like mouse, keyboard, or any other specific device use this API.
+
+.. doxygengroup:: usb_hid_device_api

doc/reference/usb/index.rst

@@ -1,252 +1,13 @@
 .. _usb_api:
 
-USB device stack
-################
+USB device support
+##################
 
-.. contents::
-   :depth: 2
-   :local:
-   :backlinks: top
+.. toctree::
+   :maxdepth: 1
 
-USB Vendor and Product identifiers
-**********************************
-
-The USB Vendor ID for the Zephyr project is 0x2FE3. The default USB Product
-ID for the Zephyr project is 0x100. The USB bcdDevice Device Release Number
-represents the Zephyr kernel major and minor versions as a binary coded
-decimal value. When a vendor integrates the Zephyr USB subsystem into a
-product, the vendor must use the USB Vendor and Product ID assigned to them.
-A vendor integrating the Zephyr USB subsystem in a product must not use the
-Vendor ID of the Zephyr project.
-
-The USB maintainer, if one is assigned, or otherwise the Zephyr Technical
-Steering Committee, may allocate other USB Product IDs based on well-motivated
-and documented requests.
-
-Each USB sample has its own unique Product ID.
-When adding a new sample, add a new entry in :file:`samples/subsys/usb/usb_pid.Kconfig`
-and a Kconfig file inside your sample subdirectory.
-The following Product IDs are currently used:
-
-* :kconfig:`CONFIG_USB_PID_CDC_ACM_SAMPLE`
-* :kconfig:`CONFIG_USB_PID_CDC_ACM_COMPOSITE_SAMPLE`
-* :kconfig:`CONFIG_USB_PID_HID_CDC_SAMPLE`
-* :kconfig:`CONFIG_USB_PID_CONSOLE_SAMPLE`
-* :kconfig:`CONFIG_USB_PID_DFU_SAMPLE`
-* :kconfig:`CONFIG_USB_PID_HID_SAMPLE`
-* :kconfig:`CONFIG_USB_PID_HID_MOUSE_SAMPLE`
-* :kconfig:`CONFIG_USB_PID_MASS_SAMPLE`
-* :kconfig:`CONFIG_USB_PID_TESTUSB_SAMPLE`
-* :kconfig:`CONFIG_USB_PID_WEBUSB_SAMPLE`
-* :kconfig:`CONFIG_USB_PID_BLE_HCI_H4_SAMPLE`
-
-USB device controller drivers
-*****************************
-
-The Device Controller Driver Layer implements the low level control routines
-to deal directly with the hardware. All device controller drivers should
-implement the APIs described in file usb_dc.h. This allows the integration of
-new USB device controllers to be done without changing the upper layers.
-
-USB Device Controller API
-=========================
-
-.. doxygengroup:: _usb_device_controller_api
-
-USB device core layer
-*********************
-
-The USB Device core layer is a hardware independent interface between USB
-device controller driver and USB device class drivers or customer applications.
-It's a port of the LPCUSB device stack. It provides the following
-functionalities:
-
-* Responds to standard device requests and returns standard descriptors,
-  essentially handling 'Chapter 9' processing, specifically the standard
-  device requests in table 9-3 from the universal serial bus specification
-  revision 2.0.
-* Provides a programming interface to be used by USB device classes or
-  customer applications. The APIs are described in the usb_device.h file.
-* Uses the APIs provided by the device controller drivers to interact with
-  the USB device controller.
-
-
-USB Device Core Layer API
-=========================
-
-There are two ways to transmit data, using the 'low' level read/write API or
-the 'high' level transfer API.
-
-Low level API
-  To transmit data to the host, the class driver should call usb_write().
-  Upon completion the registered endpoint callback will be called. Before
-  sending another packet the class driver should wait for the completion of
-  the previous write. When data is received, the registered endpoint callback
-  is called. usb_read() should be used for retrieving the received data.
-  For CDC ACM sample driver this happens via the OUT bulk endpoint handler
-  (cdc_acm_bulk_out) mentioned in the endpoint array (cdc_acm_ep_data).
-
-High level API
-  The usb_transfer method can be used to transfer data to/from the host. The
-  transfer API will automatically split the data transmission into one or more
-  USB transaction(s), depending endpoint max packet size. The class driver does
-  not have to implement endpoint callback and should set this callback to the
-  generic usb_transfer_ep_callback.
-
-.. doxygengroup:: _usb_device_core_api
-
-USB device class drivers
-************************
-
-Zephyr USB Device Stack supports many standard classes, such as HID, MSC
-Ethernet over USB, DFU, Bluetooth.
-
-Implementing non standard USB class
-===================================
-
-Configuration of USB Device is done in the stack layer.
-
-The following structures and callbacks need to be defined:
-
-* Part of USB Descriptor table
-* USB Endpoint configuration table
-* USB Device configuration structure
-* Endpoint callbacks
-* Optionally class, vendor and custom handlers
-
-For example, for USB loopback application:
-
-.. literalinclude:: ../../../subsys/usb/class/loopback.c
-   :language: c
-   :start-after: usb.rst config structure start
-   :end-before: usb.rst config structure end
-   :linenos:
-
-Endpoint configuration:
-
-.. literalinclude:: ../../../subsys/usb/class/loopback.c
-   :language: c
-   :start-after: usb.rst endpoint configuration start
-   :end-before: usb.rst endpoint configuration end
-   :linenos:
-
-USB Device configuration structure:
-
-.. literalinclude:: ../../../subsys/usb/class/loopback.c
-   :language: c
-   :start-after: usb.rst device config data start
-   :end-before: usb.rst device config data end
-   :linenos:
-
-
-The vendor device requests are forwarded by the USB stack core driver to the
-class driver through the registered vendor handler.
-
-For the loopback class driver, :c:func:`loopback_vendor_handler` processes
-the vendor requests:
-
-.. literalinclude:: ../../../subsys/usb/class/loopback.c
-   :language: c
-   :start-after: usb.rst vendor handler start
-   :end-before:  usb.rst vendor handler end
-   :linenos:
-
-The class driver waits for the :makevar:`USB_DC_CONFIGURED` device status code
-before transmitting any data.
-
-.. _testing_USB_native_posix:
-
-Testing USB over USP/IP in native_posix
-***************************************
-
-Virtual USB controller implemented through USB/IP might be used to test USB
-Device stack. Follow general build procedure to build USB sample for
-the native_posix configuration.
-
-Run built sample with:
-
-.. code-block:: console
-
-   west build -t run
-
-In a terminal window, run the following command to list USB devices:
-
-.. code-block:: console
-
-   $ usbip list -r localhost
-   Exportable USB devices
-   ======================
-    - 127.0.0.1
-           1-1: unknown vendor : unknown product (2fe3:0100)
-              : /sys/devices/pci0000:00/0000:00:01.2/usb1/1-1
-              : (Defined at Interface level) (00/00/00)
-              :  0 - Vendor Specific Class / unknown subclass / unknown protocol (ff/00/00)
-
-In a terminal window, run the following command to attach USB device:
-
-.. code-block:: console
-
-   $ sudo usbip attach -r localhost -b 1-1
-
-The USB device should be connected to your Linux host, and verified with the following commands:
-
-.. code-block:: console
-
-   $ sudo usbip port
-   Imported USB devices
-   ====================
-   Port 00: <Port in Use> at Full Speed(12Mbps)
-          unknown vendor : unknown product (2fe3:0100)
-          7-1 -> usbip://localhost:3240/1-1
-              -> remote bus/dev 001/002
-   $ lsusb -d 2fe3:0100
-   Bus 007 Device 004: ID 2fe3:0100
-
-USB Human Interface Devices (HID) support
-*****************************************
-
-HID Item helpers
-================
-
-HID item helper macros can be used to compose a HID Report Descriptor.
-The names correspond to those used in the USB HID Specification.
-
-Example of a HID Report Descriptor:
-
-.. code-block:: c
-
-    static const uint8_t hid_report_desc[] = {
-        HID_USAGE_PAGE(HID_USAGE_GEN_DESKTOP),
-        HID_USAGE(HID_USAGE_GEN_DESKTOP_UNDEFINED),
-        HID_COLLECTION(HID_COLLECTION_APPLICATION),
-        HID_LOGICAL_MIN8(0),
-        /* logical maximum 255 */
-        HID_LOGICAL_MAX16(0xFF, 0x00),
-        HID_REPORT_ID(1),
-        HID_REPORT_SIZE(8),
-        HID_REPORT_COUNT(1),
-        HID_USAGE(HID_USAGE_GEN_DESKTOP_UNDEFINED),
-        /* HID_INPUT (Data, Variable, Absolute)	*/
-        HID_INPUT(0x02),
-        HID_END_COLLECTION,
-    };
-
-
-.. doxygengroup:: usb_hid_items
-
-.. doxygengroup:: usb_hid_types
-
-HID Mouse and Keyboard report descriptors
-=========================================
-
-The pre-defined Mouse and Keyboard report descriptors can be used by
-a HID device implementation or simply as examples.
-
-.. doxygengroup:: usb_hid_mk_report_desc
-
-HID Class Device API
-********************
-
-USB HID devices like mouse, keyboard, or any other specific device use this API.
-
-.. doxygengroup:: usb_hid_device_api
+   udc.rst
+   uds.rst
+   uds_testing.rst
+   hid.rst
+   uds_cdc_acm.rst

doc/reference/usb/udc.rst

@@ -0,0 +1,17 @@
+.. _udc_api:
+
+USB device controller driver API
+################################
+
+The USB Device Controller Driver Layer implements the low level control routines
+to deal directly with the hardware. All device controller drivers should
+implement the APIs described in :zephyr_file:`include/drivers/usb/usb_dc.h`.
+This allows the integration of new USB device controllers to be done without
+changing the upper layers.
+With this API it is not possible to support more than one controller
+instance at runtime.
+
+API reference
+*************
+
+.. doxygengroup:: _usb_device_controller_api

doc/reference/usb/uds.rst

@@ -0,0 +1,148 @@
+.. _usb_device_stack:
+
+USB device stack
+################
+
+The USB device stack is a hardware independent interface between USB
+device controller driver and USB device class drivers or customer applications.
+It is a port of the LPCUSB device stack and has been modified and expanded
+over time. It provides the following functionalities:
+
+* Uses the APIs provided by the device controller drivers to interact with
+  the USB device controller.
+* Responds to standard device requests and returns standard descriptors,
+  essentially handling 'Chapter 9' processing, specifically the standard
+  device requests in table 9-3 from the universal serial bus specification
+  revision 2.0.
+* Provides a programming interface to be used by USB device classes or
+  customer applications. The APIs is described in
+  :zephyr_file:`include/usb/usb_device.h`
+
+The device stack has few limitations with which it is not possible to support
+more than one controller instance at runtime, and only one USB device
+configuration is supported.
+
+Supported USB classes:
+
+* USB Audio (experimental)
+* USB CDC ACM
+* USB CDC ECM
+* USB CDC EEM
+* RNDIS
+* USB MSC
+* USB DFU
+* Bluetooth HCI over USB
+* USB HID class
+
+:ref:`List<usb-samples>` of samples for different purposes.
+CDC ACM and HID samples have configuration overlays for composite configuration.
+
+Implementing a non-standard USB class
+*************************************
+
+The configuration of USB Device is done in the stack layer.
+
+The following structures and callbacks need to be defined:
+
+* Part of USB Descriptor table
+* USB Endpoint configuration table
+* USB Device configuration structure
+* Endpoint callbacks
+* Optionally class, vendor and custom handlers
+
+For example, for the USB loopback application:
+
+.. literalinclude:: ../../../subsys/usb/class/loopback.c
+   :language: c
+   :start-after: usb.rst config structure start
+   :end-before: usb.rst config structure end
+   :linenos:
+
+Endpoint configuration:
+
+.. literalinclude:: ../../../subsys/usb/class/loopback.c
+   :language: c
+   :start-after: usb.rst endpoint configuration start
+   :end-before: usb.rst endpoint configuration end
+   :linenos:
+
+USB Device configuration structure:
+
+.. literalinclude:: ../../../subsys/usb/class/loopback.c
+   :language: c
+   :start-after: usb.rst device config data start
+   :end-before: usb.rst device config data end
+   :linenos:
+
+
+The vendor device requests are forwarded by the USB stack core driver to the
+class driver through the registered vendor handler.
+
+For the loopback class driver, :c:func:`loopback_vendor_handler` processes
+the vendor requests:
+
+.. literalinclude:: ../../../subsys/usb/class/loopback.c
+   :language: c
+   :start-after: usb.rst vendor handler start
+   :end-before:  usb.rst vendor handler end
+   :linenos:
+
+The class driver waits for the :makevar:`USB_DC_CONFIGURED` device status code
+before transmitting any data.
+
+.. _testing_USB_native_posix:
+
+USB Vendor and Product identifiers
+**********************************
+
+The USB Vendor ID for the Zephyr project is ``0x2FE3``.
+This USB Vendor ID must not be used when a vendor
+integrates Zephyr USB device support into its own product.
+
+Each USB sample has its own unique Product ID.
+The USB maintainer, if one is assigned, or otherwise the Zephyr Technical
+Steering Committee, may allocate other USB Product IDs based on well-motivated
+and documented requests.
+
+When adding a new sample, add a new entry in :file:`samples/subsys/usb/usb_pid.Kconfig`
+and a Kconfig file inside your sample subdirectory.
+The following Product IDs are currently used:
+
+* :kconfig:`CONFIG_USB_PID_CDC_ACM_SAMPLE`
+* :kconfig:`CONFIG_USB_PID_CDC_ACM_COMPOSITE_SAMPLE`
+* :kconfig:`CONFIG_USB_PID_HID_CDC_SAMPLE`
+* :kconfig:`CONFIG_USB_PID_CONSOLE_SAMPLE`
+* :kconfig:`CONFIG_USB_PID_DFU_SAMPLE`
+* :kconfig:`CONFIG_USB_PID_HID_SAMPLE`
+* :kconfig:`CONFIG_USB_PID_HID_MOUSE_SAMPLE`
+* :kconfig:`CONFIG_USB_PID_MASS_SAMPLE`
+* :kconfig:`CONFIG_USB_PID_TESTUSB_SAMPLE`
+* :kconfig:`CONFIG_USB_PID_WEBUSB_SAMPLE`
+* :kconfig:`CONFIG_USB_PID_BLE_HCI_H4_SAMPLE`
+
+The USB device descriptor field ``bcdDevice`` (Device Release Number) represents
+the Zephyr kernel major and minor versions as a binary coded decimal value.
+
+API reference
+*************
+
+There are two ways to transmit data, using the 'low' level read/write API or
+the 'high' level transfer API.
+
+Low level API
+  To transmit data to the host, the class driver should call usb_write().
+  Upon completion the registered endpoint callback will be called. Before
+  sending another packet the class driver should wait for the completion of
+  the previous write. When data is received, the registered endpoint callback
+  is called. usb_read() should be used for retrieving the received data.
+  For CDC ACM sample driver this happens via the OUT bulk endpoint handler
+  (cdc_acm_bulk_out) mentioned in the endpoint array (cdc_acm_ep_data).
+
+High level API
+  The usb_transfer method can be used to transfer data to/from the host. The
+  transfer API will automatically split the data transmission into one or more
+  USB transaction(s), depending endpoint max packet size. The class driver does
+  not have to implement endpoint callback and should set this callback to the
+  generic usb_transfer_ep_callback.
+
+.. doxygengroup:: _usb_device_core_api

doc/reference/usb/uds_cdc_acm.rst

@@ -0,0 +1,108 @@
+.. _usb_device_cdc_acm:
+
+USB device stack CDC ACM support
+################################
+
+The CDC ACM class is used as backend for different subsystems in Zephyr.
+However, its configuration may not be easy for the inexperienced user.
+Below is a description of the different use cases and some pitfalls.
+
+The interface for CDC ACM user is :ref:`uart_api` driver API.
+But there are two important differences in behavior to a real UART controller:
+
+* Data transfer is only possible after the USB device stack has been initialized and started,
+  until then any data is discarded
+* If device is connected to the host, it still needs an application
+  on the host side which requests the data
+
+The devicetree compatible property for CDC ACM UART is
+:dtcompatible:`zephyr,cdc-acm-uart`.
+CDC ACM support is automatically selected when USB device support is enabled
+and a compatible node in the devicetree sources is present. If necessary,
+CDC ACM support can be explicitly disabled by :kconfig:`CONFIG_USB_CDC_ACM`.
+About four CDC ACM UART instances can be defined and used,
+limited by the maximum number of supported endpoints on the controller.
+
+CDC ACM UART node is supposed to be child of a USB device controller node.
+Since the designation of the controller nodes varies from vendor to vendor,
+and our samples and application should be as generic as possible,
+the default USB device controller is usually assigned an ``zephyr_udc0``
+node label. Often, CDC ACM UART is described in a devicetree overlay file
+and looks like this:
+
+.. code-block:: devicetree
+
+   &zephyr_udc0 {
+   	cdc_acm_uart0: cdc_acm_uart0 {
+   		compatible = "zephyr,cdc-acm-uart";
+   		label = "CDC_ACM_0";
+   	};
+   };
+
+Samples :ref:`usb_cdc-acm` and :ref:`usb_hid-cdc` have similar overlay files.
+And since no special properties are present, it may seem overkill to use
+devicetree to describe CDC ACM UART.  The motivation behind using devicetree
+is the easy interchangeability of a real UART controller and CDC ACM UART
+in applications.
+
+Console over CDC ACM UART
+*************************
+
+With the CDC ACM UART node from above and ``zephyr,console`` property of the
+chosen node, we can describe that CDC ACM UART is to be used with the console.
+A similar overlay file is used by :ref:`cdc-acm-console`.
+If USB device support is enabled in the application, as in the console sample,
+:kconfig:`CONFIG_USB_UART_CONSOLE` must be enabled,
+which does nothing but change the initialization time of the console driver.
+
+.. code-block:: devicetree
+
+   / {
+   	chosen {
+   		zephyr,console = &cdc_acm_uart0;
+   	};
+   };
+
+   &zephyr_udc0 {
+   	cdc_acm_uart0: cdc_acm_uart0 {
+   		compatible = "zephyr,cdc-acm-uart";
+   		label = "CDC_ACM_0";
+   	};
+   };
+
+Before the application uses the console, it is recommended to wait for
+the DTR signal:
+
+.. code-block:: c
+
+    const struct device *dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
+    uint32_t dtr = 0;
+
+    if (usb_enable(NULL)) {
+    	return;
+    }
+
+    while (!dtr) {
+    	uart_line_ctrl_get(dev, UART_LINE_CTRL_DTR, &dtr);
+    	k_sleep(K_MSEC(100));
+    }
+
+    printk("nuqneH\n");
+
+CDC ACM UART as backend
+***********************
+
+As for the console sample, it is possible to configure CDC ACM UART as
+backend for other subsystems by setting :ref:`devicetree-chosen-nodes`
+properties.
+
+List of few Zephyr specific chosen properties which can be used to select
+CDC ACM UART as backend for a subsystem or application:
+
+* ``zephyr,bt-c2h-uart`` used in Bluetooth,
+  for example see :ref:`bluetooth-hci-uart-sample`
+* ``zephyr,ot-uart`` used in OpenThread,
+  for example see :ref:`coprocessor-sample`
+* ``zephyr,shell-uart`` used by shell for serial backend,
+  for example see :zephyr_file:`samples/subsys/shell/shell_module`
+* ``zephyr,uart-mcumgr`` used by :ref:`smp_svr_sample`

doc/reference/usb/uds_testing.rst

@@ -0,0 +1,50 @@
+.. _usb_device_testing:
+
+Testing USB device support
+##########################
+
+Testing over USPIP in native_posix
+***********************************
+
+A virtual USB controller implemented through USBIP might be used to test the USB
+Device stack. Follow the general build procedure to build the USB sample for
+the native_posix configuration.
+
+Run built sample with:
+
+.. code-block:: console
+
+   west build -t run
+
+In a terminal window, run the following command to list USB devices:
+
+.. code-block:: console
+
+   $ usbip list -r localhost
+   Exportable USB devices
+   ======================
+    - 127.0.0.1
+           1-1: unknown vendor : unknown product (2fe3:0100)
+              : /sys/devices/pci0000:00/0000:00:01.2/usb1/1-1
+              : (Defined at Interface level) (00/00/00)
+              :  0 - Vendor Specific Class / unknown subclass / unknown protocol (ff/00/00)
+
+In a terminal window, run the following command to attach the USB device:
+
+.. code-block:: console
+
+   $ sudo usbip attach -r localhost -b 1-1
+
+The USB device should be connected to your Linux host, and verified with the following commands:
+
+.. code-block:: console
+
+   $ sudo usbip port
+   Imported USB devices
+   ====================
+   Port 00: <Port in Use> at Full Speed(12Mbps)
+          unknown vendor : unknown product (2fe3:0100)
+          7-1 -> usbip://localhost:3240/1-1
+              -> remote bus/dev 001/002
+   $ lsusb -d 2fe3:0100
+   Bus 007 Device 004: ID 2fe3:0100

doc/reference/usermode/memory_domain.rst

@@ -4,9 +4,9 @@ Memory Protection Design
 ########################
 
 Zephyr's memory protection design is geared towards microcontrollers with MPU
-(Memory Protection Unit) hardware. We do support some architectures which have
-a paged MMU (Memory Management Unit), but in that case the MMU is used like
-an MPU with an identity page table.
+(Memory Protection Unit) hardware. We do support some architectures, such as x86,
+which have a paged MMU (Memory Management Unit), but in that case the MMU is
+used like an MPU with an identity page table.
 
 All of the discussion below will be using MPU terminology; systems with MMUs
 can be considered to have an MPU with an unlimited number of programmable
@@ -46,7 +46,7 @@ text/ro-data, this is sufficient for the boot time configuration.
 Hardware Stack Overflow
 ***********************
 
-``CONFIG_HW_STACK_PROTECTION`` is an optional feature which detects stack
+:kconfig:`CONFIG_HW_STACK_PROTECTION` is an optional feature which detects stack
 buffer overflows when the system is running in supervisor mode. This
 catches issues when the entire stack buffer has overflowed, and not
 individual stack frames, use compiler-assisted :kconfig:`CONFIG_STACK_CANARIES`

doc/security/vulnerabilities.rst

@@ -784,6 +784,24 @@ Possible overflow in mempool
 CVE-2021
 ========
 
+CVE-2021-3319
+-------------
+
+DOS: Incorrect 802154 Frame Validation for Omitted Source / Dest Addresses
+
+Improper processing of omitted source and destination addresses in
+ieee802154 frame validation (ieee802154_validate_frame)
+
+This has been fixed in main for v2.5.0
+
+- `CVE-2020-3319 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3319>`_
+
+- `Zephyr project bug tracker GHSA-94jg-2p6q-5364
+  <https://github.com/zephyrproject-rtos/zephyr/security/advisories/GHSA-94jg-2p6q-5364>`_
+
+- `PR31908 fix for main
+  <https://github.com/zephyrproject-rtos/zephyr/pull/31908>`_
+
 CVE-2021-3320
 -------------------
 Mismatch between validation and handling of 802154 ACK frames, where
@@ -938,6 +956,36 @@ This has been fixed in main for v2.6.0
 - `PR 33418 fix for 1.14.2
   <https://github.com/zephyrproject-rtos/zephyr/pull/33418>`_
 
+CVE-2021-3436
+-------------
+
+Bluetooth: Possible to overwrite an existing bond during keys
+distribution phase when the identity address of the bond is known
+
+During the distribution of the identity address information we don’t
+check for an existing bond with the same identity address.This means
+that a duplicate entry will be created in RAM while the newest entry
+will overwrite the existing one in persistent storage.
+
+This has been fixed in main for v2.6.0
+
+- `CVE-2021-3436 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3436>`_
+
+- `Zephyr project bug tracker GHSA-j76f-35mc-4h63
+  <https://github.com/zephyrproject-rtos/zephyr/security/advisories/GHSA-j76f-35mc-4h63>`_
+
+- `PR 33266 fix for main
+  <https://github.com/zephyrproject-rtos/zephyr/pull/33266>`_
+
+- `PR 33432 fix for 2.5
+  <https://github.com/zephyrproject-rtos/zephyr/pull/33432>`_
+
+- `PR 33433 fix for 2.4
+  <https://github.com/zephyrproject-rtos/zephyr/pull/33433>`_
+
+- `PR 33718 fix for 1.14.2
+  <https://github.com/zephyrproject-rtos/zephyr/pull/33718>`_
+
 CVE-2021-3454
 -------------
 
@@ -989,7 +1037,70 @@ This has been fixed in main for v2.6.0
 - `PR 36105 fix for 2.4
   <https://github.com/zephyrproject-rtos/zephyr/pull/36105>`_
 
+CVE-2021-3510
+-------------
+
+Zephyr JSON decoder incorrectly decodes array of array
+
+When using JSON_OBJ_DESCR_ARRAY_ARRAY, the subarray is has the token
+type JSON_TOK_LIST_START, but then assigns to the object part of the
+union. arr_parse then takes the offset of the array-object (which has
+nothing todo with the list) treats it as relative to the parent
+object, and stores the length of the subarray in there.
+
+This has been fixed in main for v2.7.0
+
+- `CVE-2021-3510 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3510>`_
+
+- `Zephyr project bug tracker GHSA-289f-7mw3-2qf4
+  <https://github.com/zephyrproject-rtos/zephyr/security/advisories/GHSA-289f-7mw3-2qf4>`_
+
+- `PR 36340 fix for main
+  <https://github.com/zephyrproject-rtos/zephyr/pull/36340>`_
+
+- `PR 37816 fix for 2.6
+  <https://github.com/zephyrproject-rtos/zephyr/pull/37816>`_
+
 CVE-2021-3581
 -------------
 
-Under embargo until 2021/09/04
+HCI data not properly checked leads to memory overflow in the Bluetooth stack
+
+In the process of setting SCAN_RSP through the HCI command, the Zephyr
+Bluetooth protocol stack did not effectively check the length of the
+incoming HCI data. Causes memory overflow, and then the data in the
+memory is overwritten, and may even cause arbitrary code execution.
+
+This has been fixed in main for v2.6.0
+
+- `CVE-2021-3581 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3581>`_
+
+- `Zephyr project bug tracker GHSA-8q65-5gqf-fmw5
+  <https://github.com/zephyrproject-rtos/zephyr/security/advisories/GHSA-8q65-5gqf-fmw5>`_
+
+- `PR 35935 fix for main
+  <https://github.com/zephyrproject-rtos/zephyr/pull/35935>`_
+
+- `PR 35984 fix for 2.5
+  <https://github.com/zephyrproject-rtos/zephyr/pull/35984>`_
+
+- `PR 35985 fix for 2.4
+  <https://github.com/zephyrproject-rtos/zephyr/pull/35985>`_
+
+- `PR 35985 fix for 1.14
+  <https://github.com/zephyrproject-rtos/zephyr/pull/35985>`_
+
+CVE-2021-3625
+-------------
+
+Buffer overflow in Zephyr USB DFU DNLOAD
+
+This has been fixed in main for v2.6.0
+
+- `CVE-2021-3625 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3625>`_
+
+- `Zephyr project bug tracker GHSA-c3gr-hgvr-f363
+  <https://github.com/zephyrproject-rtos/zephyr/security/advisories/GHSA-c3gr-hgvr-f363>`_
+
+- `PR 36694 fix for main
+  <https://github.com/zephyrproject-rtos/zephyr/pull/36694>`_

drivers/CMakeLists.txt

@@ -49,8 +49,8 @@ add_subdirectory_ifdef(CONFIG_PM_CPU_OPS pm_cpu_ops)
 
 add_subdirectory_ifdef(CONFIG_FLASH_HAS_DRIVER_ENABLED flash)
 add_subdirectory_ifdef(CONFIG_SERIAL_HAS_DRIVER serial)
-add_subdirectory_ifdef(CONFIG_BT               bluetooth)
-add_subdirectory_ifdef(CONFIG_NETWORKING       net)
+add_subdirectory_ifdef(CONFIG_BT_DRIVERS       bluetooth)
+add_subdirectory_ifdef(CONFIG_NET_DRIVERS      net)
 add_subdirectory_ifdef(CONFIG_NET_L2_ETHERNET  ethernet)
 add_subdirectory_ifdef(CONFIG_ENTROPY_HAS_DRIVER entropy)
 add_subdirectory_ifdef(CONFIG_SYS_CLOCK_EXISTS timer)

drivers/adc/adc_stm32.c

@@ -409,18 +409,10 @@ static int start_read(const struct device *dev,
 		return err;
 	}
 
-#if defined(CONFIG_SOC_SERIES_STM32G0X) || \
-	defined(CONFIG_SOC_SERIES_STM32G4X) || \
-	defined(CONFIG_SOC_SERIES_STM32H7X) || \
-	defined(CONFIG_SOC_SERIES_STM32L0X) || \
-	defined(CONFIG_SOC_SERIES_STM32L4X) || \
-	defined(CONFIG_SOC_SERIES_STM32L5X) || \
-	defined(CONFIG_SOC_SERIES_STM32WBX) || \
-	defined(CONFIG_SOC_SERIES_STM32WLX)
+#if defined(CONFIG_SOC_SERIES_STM32G0X)
 	/*
 	 * Errata: Writing ADC_CFGR1 register while ADEN bit is set
 	 * resets RES[1:0] bitfield. We need to disable and enable adc.
-	 * On all those stm32 devices it is allowed to write these bits only when ADEN = 0.
 	 */
 	if (LL_ADC_IsEnabled(adc) == 1UL) {
 		LL_ADC_Disable(adc);
@@ -436,6 +428,15 @@ static int start_read(const struct device *dev,
 	LL_ADC_SetResolution(adc, resolution);
 #endif
 
+#ifdef CONFIG_SOC_SERIES_STM32L0X
+	/*
+	 * setting OVS bits is conditioned to ADC state: ADC must be disabled
+	 * or enabled without conversion on going : disable it, it will stop
+	 */
+	LL_ADC_Disable(adc);
+	while (LL_ADC_IsEnabled(adc) == 1UL) {
+	}
+#endif /* CONFIG_SOC_SERIES_STM32L0X */
 #if defined(CONFIG_SOC_SERIES_STM32G0X) || \
 	defined(CONFIG_SOC_SERIES_STM32G4X) || \
 	defined(CONFIG_SOC_SERIES_STM32H7X) || \
@@ -444,13 +445,7 @@ static int start_read(const struct device *dev,
 	defined(CONFIG_SOC_SERIES_STM32L5X) || \
 	defined(CONFIG_SOC_SERIES_STM32WBX) || \
 	defined(CONFIG_SOC_SERIES_STM32WLX)
-	/*
-	 * setting OVS bits is conditioned to ADC state: ADC must be disabled
-	 * or enabled without conversion on going : disable it, it will stop
-	 */
-	LL_ADC_Disable(adc);
-	while (LL_ADC_IsEnabled(adc) == 1UL) {
-	}
+
 	switch (sequence->oversampling) {
 	case 0:
 		LL_ADC_SetOverSamplingScope(adc, LL_ADC_OVS_DISABLE);

drivers/bluetooth/Kconfig

@@ -9,9 +9,13 @@
 
 # Controller support is an HCI driver in itself, so these HCI driver
 # options are only applicable if controller support hasn't been enabled.
-menu "Bluetooth Drivers"
+menuconfig BT_DRIVERS
+	bool "Bluetooth Drivers"
+	default y
 	depends on BT && !BT_CTLR
 
+if BT_DRIVERS
+
 if BT_HCI
 source "drivers/bluetooth/hci/Kconfig"
 endif
@@ -20,4 +24,4 @@ if BT_CUSTOM
 # Insert here any custom (non-HCI) offload drives
 endif
 
-endmenu
+endif # BT_DRIVERS

drivers/can/can_mcux_flexcan.c

@@ -462,9 +462,9 @@ int mcux_flexcan_recover(const struct device *dev, k_timeout_t timeout)
 	start_time = k_uptime_ticks();
 	config->base->CTRL1 &= ~CAN_CTRL1_BOFFREC_MASK;
 
-	if (timeout != K_NO_WAIT) {
+	if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT)) {
 		while (mcux_flexcan_get_state(dev, NULL) == CAN_BUS_OFF) {
-			if (timeout != K_FOREVER &&
+			if (!K_TIMEOUT_EQ(timeout, K_FOREVER) &&
 			    k_uptime_ticks() - start_time >= timeout.ticks) {
 				ret = CAN_TIMEOUT;
 			}
@@ -747,19 +747,28 @@ static const struct can_driver_api mcux_flexcan_driver_api = {
 #endif
 	.register_state_change_isr = mcux_flexcan_register_state_change_isr,
 	.get_core_clock = mcux_flexcan_get_core_clock,
+	/*
+	 * FlexCAN timing limits are specified in the "FLEXCANx_CTRL1 field
+	 * descriptions" table in the SoC reference manual.
+	 *
+	 * Note that the values here are the "physical" timing limits, whereas
+	 * the register field limits are physical values minus 1 (which is
+	 * handled by the flexcan_config_t field assignments elsewhere in this
+	 * driver).
+	 */
 	.timing_min = {
-		.sjw = 0x1,
+		.sjw = 0x01,
 		.prop_seg = 0x01,
 		.phase_seg1 = 0x01,
-		.phase_seg2 = 0x01,
+		.phase_seg2 = 0x02,
 		.prescaler = 0x01
 	},
 	.timing_max = {
-		.sjw = 0x03,
-		.prop_seg = 0x07,
-		.phase_seg1 = 0x07,
-		.phase_seg2 = 0x07,
-		.prescaler = 0xFF
+		.sjw = 0x04,
+		.prop_seg = 0x08,
+		.phase_seg1 = 0x08,
+		.phase_seg2 = 0x08,
+		.prescaler = 0x100
 	}
 };
 

drivers/can/can_stm32.c

@@ -586,7 +586,7 @@ int can_stm32_recover(const struct device *dev, k_timeout_t timeout)
 	start_time = k_uptime_ticks();
 
 	while (can->ESR & CAN_ESR_BOFF) {
-		if (timeout != K_FOREVER &&
+		if (!K_TIMEOUT_EQ(timeout, K_FOREVER) &&
 		    k_uptime_ticks() - start_time >= timeout.ticks) {
 			goto done;
 		}

drivers/clock_control/clock_stm32_ll_common.c

@@ -210,7 +210,7 @@ static inline int stm32_clock_control_off(const struct device *dev,
 	defined(CONFIG_SOC_SERIES_STM32WLX) || \
 	defined(CONFIG_SOC_SERIES_STM32G4X)
 	case STM32_CLOCK_BUS_AHB3:
-		LL_AHB3_GRP1_EnableClock(pclken->enr);
+		LL_AHB3_GRP1_DisableClock(pclken->enr);
 		break;
 #endif /* CONFIG_SOC_SERIES_STM32_* */
 	case STM32_CLOCK_BUS_APB1:

drivers/clock_control/clock_stm32_ll_u5.c

@@ -254,20 +254,6 @@ static void set_up_clk_msis(void)
 
 	LL_RCC_MSIS_SetRange(STM32_MSIS_RANGE << RCC_ICSCR1_MSISRANGE_Pos);
 
-	if (STM32_MSIS_RANGE < 4) {
-		/* MSI clock trimming for ranges 0 to 3 */
-		LL_RCC_MSI_SetCalibTrimming(0, LL_RCC_MSI_OSCILLATOR_0);
-	} else if (STM32_MSIS_RANGE < 8) {
-		/* MSI clock trimming for ranges 4 to 7 */
-		LL_RCC_MSI_SetCalibTrimming(0, LL_RCC_MSI_OSCILLATOR_1);
-	} else if (STM32_MSIS_RANGE < 12) {
-		/* MSI clock trimming for ranges 8 to 11 */
-		LL_RCC_MSI_SetCalibTrimming(0, LL_RCC_MSI_OSCILLATOR_2);
-	} else {
-		/* MSI clock trimming for ranges 12 to 15 */
-		LL_RCC_MSI_SetCalibTrimming(0, LL_RCC_MSI_OSCILLATOR_3);
-	}
-
 #if STM32_MSIS_PLL_MODE
 
 #if !STM32_LSE_CLOCK
@@ -491,8 +477,6 @@ void config_src_sysclk_msis(LL_UTILS_ClkInitTypeDef s_ClkInitStruct)
 	uint32_t old_hclk_freq;
 	uint32_t new_hclk_freq;
 
-	set_up_clk_msis();
-
 	old_hclk_freq = HAL_RCC_GetHCLKFreq();
 
 	/* Calculate new SystemCoreClock variable with MSI freq */
@@ -511,7 +495,17 @@ void config_src_sysclk_msis(LL_UTILS_ClkInitTypeDef s_ClkInitStruct)
 		LL_SetFlashLatency(new_hclk_freq);
 	}
 
+	if (new_hclk_freq > MHZ(24)) {
+		/* when freq > 24MHz it is necessary to set voltage scaling
+		 * to range3
+		 */
+		LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE3);
+		while (LL_PWR_IsActiveFlag_VOS() == 0) {
+		}
+	}
+
 	/* Set MSIS as SYSCLCK source */
+	set_up_clk_msis();
 	LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_MSIS);
 	LL_RCC_SetAHBPrescaler(s_ClkInitStruct.AHBCLKDivider);
 	while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_MSIS) {

drivers/ethernet/CMakeLists.txt

@@ -26,16 +26,12 @@ zephyr_library_sources_ifdef(CONFIG_ETH_SAM_GMAC	eth_sam_gmac.c)
 zephyr_library_sources_ifdef(CONFIG_DSA_KSZ8XXX		dsa_ksz8xxx.c)
 
 if(CONFIG_ETH_NATIVE_POSIX)
-	zephyr_library_named(drivers__ethernet__native_posix)
-	zephyr_library_compile_definitions(
-		NO_POSIX_CHEATS
-		_BSD_SOURCE
-		_DEFAULT_SOURCE
-		)
-	zephyr_library_sources(
-		eth_native_posix.c
-		eth_native_posix_adapt.c
-		)
+  set(native_posix_source_files eth_native_posix.c eth_native_posix_adapt.c)
+  set_source_files_properties(${native_posix_source_files}
+    PROPERTIES COMPILE_DEFINITIONS
+    "NO_POSIX_CHEATS;_BSD_SOURCE;_DEFAULT_SOURCE"
+  )
+  zephyr_library_sources(${native_posix_source_files})
 endif()
 
 add_subdirectory(phy)

drivers/ethernet/phy/CMakeLists.txt

@@ -1,5 +1,3 @@
 # SPDX-License-Identifier: Apache-2.0
 
-zephyr_library()
-
 zephyr_library_sources_ifdef(CONFIG_PHY_GENERIC_MII	 phy_mii.c)

drivers/flash/flash_mcux_flexspi_mx25um51345g.c

@@ -23,6 +23,17 @@
 static uint8_t nor_write_buf[SPI_NOR_PAGE_SIZE];
 #endif
 
+/*
+ * NOTE: If CONFIG_FLASH_MCUX_FLEXSPI_XIP is selected, Any external functions
+ * called while interacting with the flexspi MUST be relocated to SRAM or ITCM
+ * at runtime, so that the chip does not access the flexspi to read program
+ * instructions while it is being written to
+ */
+#if defined(CONFIG_FLASH_MCUX_FLEXSPI_XIP) && (CONFIG_FLASH_LOG_LEVEL > 0)
+#warning "Enabling flash driver logging and XIP mode simultaneously can cause \
+	read-while-write hazards. This configuration is not recommended."
+#endif
+
 LOG_MODULE_REGISTER(flash_flexspi_nor, CONFIG_FLASH_LOG_LEVEL);
 
 enum {

drivers/flash/flash_mcux_flexspi_nor.c

@@ -23,6 +23,17 @@
 static uint8_t nor_write_buf[SPI_NOR_PAGE_SIZE];
 #endif
 
+/*
+ * NOTE: If CONFIG_FLASH_MCUX_FLEXSPI_XIP is selected, Any external functions
+ * called while interacting with the flexspi MUST be relocated to SRAM or ITCM
+ * at runtime, so that the chip does not access the flexspi to read program
+ * instructions while it is being written to
+ */
+#if defined(CONFIG_FLASH_MCUX_FLEXSPI_XIP) && (CONFIG_FLASH_LOG_LEVEL > 0)
+#warning "Enabling flash driver logging and XIP mode simultaneously can cause \
+	read-while-write hazards. This configuration is not recommended."
+#endif
+
 LOG_MODULE_REGISTER(flash_flexspi_nor, CONFIG_FLASH_LOG_LEVEL);
 
 enum {

drivers/gpio/gpio_stm32.c

@@ -692,7 +692,8 @@ GPIO_DEVICE_INIT_STM32(k, K);
 #endif /* DT_NODE_HAS_STATUS(DT_NODELABEL(gpiok), okay) */
 
 
-#if defined(CONFIG_SOC_SERIES_STM32F1X)
+#if defined(CONFIG_SOC_SERIES_STM32F1X) && \
+	!defined(CONFIG_GPIO_STM32_SWJ_ENABLE)
 
 static int gpio_stm32_afio_init(const struct device *dev)
 {
@@ -716,6 +717,6 @@ static int gpio_stm32_afio_init(const struct device *dev)
 	return 0;
 }
 
-SYS_DEVICE_DEFINE("gpio_stm32_afio", gpio_stm32_afio_init, NULL, PRE_KERNEL_2, 0);
+SYS_DEVICE_DEFINE("gpio_stm32_afio", gpio_stm32_afio_init, NULL, PRE_KERNEL_1, 0);
 
-#endif /* CONFIG_SOC_SERIES_STM32F1X */
+#endif /* CONFIG_SOC_SERIES_STM32F1X && !CONFIG_GPIO_STM32_SWJ_ENABLE */

drivers/i2c/i2c_ite_it8xxx2.c

@@ -164,6 +164,33 @@ static const struct i2c_pin i2c_pin_regs[] = {
 	{ &GPDMRA, &GPDMRA,	0x10, 0x20},
 };
 
+static int i2c_parsing_return_value(const struct device *dev)
+{
+	struct i2c_it8xxx2_data *data = DEV_DATA(dev);
+	const struct i2c_it8xxx2_config *config = DEV_CFG(dev);
+
+	if (!data->err)
+		return 0;
+
+	/* Connection timed out */
+	if (data->err == ETIMEDOUT)
+		return -ETIMEDOUT;
+
+	if (config->port < I2C_STANDARD_PORT_COUNT) {
+		/* The device does not respond ACK */
+		if (data->err == HOSTA_NACK)
+			return -ENXIO;
+		else
+			return -EIO;
+	} else {
+		/* The device does not respond ACK */
+		if (data->err == E_HOSTA_ACK)
+			return -ENXIO;
+		else
+			return -EIO;
+	}
+}
+
 static int i2c_get_line_levels(const struct device *dev)
 {
 	const struct i2c_it8xxx2_config *config = DEV_CFG(dev);
@@ -835,7 +862,7 @@ static int i2c_it8xxx2_transfer(const struct device *dev, struct i2c_msg *msgs,
 	/* Unlock mutex of i2c controller */
 	k_mutex_unlock(&data->mutex);
 
-	return data->err;
+	return i2c_parsing_return_value(dev);
 }
 
 static void i2c_it8xxx2_isr(void *arg)

drivers/i2s/i2s_nrfx.c

@@ -27,12 +27,12 @@ struct i2s_nrfx_drv_data {
 	const uint32_t *last_tx_buffer;
 	enum i2s_state state;
 	enum i2s_dir active_dir;
+	bool stop;       /* stop after the current (TX or RX) block */
+	bool discard_rx; /* discard further RX blocks */
+	volatile bool next_tx_buffer_needed;
 	bool tx_configured : 1;
 	bool rx_configured : 1;
-	bool stop          : 1; /* stop after the current (TX or RX) block */
-	bool discard_rx    : 1; /* discard further RX blocks */
 	bool request_clock : 1;
-	volatile bool next_tx_buffer_needed;
 };
 
 struct i2s_nrfx_drv_cfg {
@@ -81,6 +81,7 @@ static void find_suitable_clock(const struct i2s_nrfx_drv_cfg *drv_cfg,
 	uint32_t best_diff = UINT32_MAX;
 	uint8_t r, best_r = 0;
 	nrf_i2s_mck_t best_mck_cfg = 0;
+	uint32_t best_mck = 0;
 
 	for (r = 0; r < ARRAY_SIZE(ratios); ++r) {
 		/* Only multiples of the frame width can be used as ratios. */
@@ -110,6 +111,7 @@ static void find_suitable_clock(const struct i2s_nrfx_drv_cfg *drv_cfg,
 
 			if (diff < best_diff) {
 				best_mck_cfg = mck_factor * 4096;
+				best_mck = actual_mck;
 				best_r = r;
 				/* Stop if an exact match is found. */
 				if (diff == 0) {
@@ -150,6 +152,7 @@ static void find_suitable_clock(const struct i2s_nrfx_drv_cfg *drv_cfg,
 
 				if (diff < best_diff) {
 					best_mck_cfg = dividers[d].divider_enum;
+					best_mck = mck_freq;
 					best_r = r;
 					/* Stop if an exact match is found. */
 					if (diff == 0) {
@@ -173,6 +176,8 @@ static void find_suitable_clock(const struct i2s_nrfx_drv_cfg *drv_cfg,
 
 	config->mck_setup = best_mck_cfg;
 	config->ratio = ratios[best_r].ratio_enum;
+	LOG_INF("I2S MCK frequency: %u, actual PCM rate: %u",
+		best_mck, best_mck / ratios[best_r].ratio_val);
 }
 
 static bool get_next_tx_buffer(struct i2s_nrfx_drv_data *drv_data,
@@ -465,9 +470,7 @@ static int i2s_nrfx_configure(const struct device *dev, enum i2s_dir dir,
 		return -EINVAL;
 	}
 
-	if (i2s_cfg->channels == 2 ||
-	    (i2s_cfg->format & I2S_FMT_DATA_FORMAT_MASK)
-		== I2S_FMT_DATA_FORMAT_I2S) {
+	if (i2s_cfg->channels == 2) {
 		nrfx_cfg.channels = NRF_I2S_CHANNELS_STEREO;
 	} else if (i2s_cfg->channels == 1) {
 		nrfx_cfg.channels = NRF_I2S_CHANNELS_LEFT;
@@ -878,8 +881,8 @@ static const struct i2s_driver_api i2s_nrf_drv_api = {
 #define I2S_CLK_SRC(idx)  DT_STRING_TOKEN(I2S(idx), clock_source)
 
 #define I2S_NRFX_DEVICE(idx)						     \
-	static void *tx_msgs[CONFIG_I2S_NRFX_TX_BLOCK_COUNT];		     \
-	static void *rx_msgs[CONFIG_I2S_NRFX_RX_BLOCK_COUNT];		     \
+	static void *tx_msgs##idx[CONFIG_I2S_NRFX_TX_BLOCK_COUNT];	     \
+	static void *rx_msgs##idx[CONFIG_I2S_NRFX_RX_BLOCK_COUNT];	     \
 	static struct i2s_nrfx_drv_data i2s_nrfx_data##idx = {		     \
 		.state = I2S_STATE_READY,				     \
 	};								     \
@@ -889,11 +892,11 @@ static const struct i2s_driver_api i2s_nrf_drv_api = {
 			    nrfx_isr, nrfx_i2s_irq_handler, 0);		     \
 		irq_enable(DT_IRQN(I2S(idx)));				     \
 		k_msgq_init(&i2s_nrfx_data##idx.tx_queue,		     \
-			    (char *)tx_msgs, sizeof(void *),		     \
-			    CONFIG_I2S_NRFX_TX_BLOCK_COUNT);		     \
+			    (char *)tx_msgs##idx, sizeof(void *),	     \
+			    ARRAY_SIZE(tx_msgs##idx));			     \
 		k_msgq_init(&i2s_nrfx_data##idx.rx_queue,		     \
-			    (char *)rx_msgs, sizeof(void *),		     \
-			    CONFIG_I2S_NRFX_RX_BLOCK_COUNT);		     \
+			    (char *)rx_msgs##idx, sizeof(void *),	     \
+			    ARRAY_SIZE(rx_msgs##idx));			     \
 		init_clock_manager(dev);				     \
 		return 0;						     \
 	}								     \

drivers/ieee802154/ieee802154_dw1000.c

@@ -632,7 +632,7 @@ static void dwt_gpio_callback(const struct device *dev,
 	struct dwt_context *ctx = CONTAINER_OF(cb, struct dwt_context, gpio_cb);
 
 	LOG_DBG("IRQ callback triggered %p", ctx);
-	k_work_submit(&ctx->irq_cb_work);
+	k_work_submit_to_queue(&dwt_work_queue, &ctx->irq_cb_work);
 }
 
 static enum ieee802154_hw_caps dwt_get_capabilities(const struct device *dev)

drivers/ieee802154/ieee802154_nrf5.c

@@ -973,14 +973,17 @@ void nrf_802154_transmitted_raw(uint8_t *frame,
 	nrf5_data.tx_frame_is_secured = metadata->frame_props.is_secured;
 	nrf5_data.tx_frame_mac_hdr_rdy = metadata->frame_props.dynamic_data_is_set;
 	nrf5_data.ack_frame.psdu = metadata->data.transmitted.p_ack;
-	nrf5_data.ack_frame.rssi = metadata->data.transmitted.power;
-	nrf5_data.ack_frame.lqi = metadata->data.transmitted.lqi;
 
-#if !defined(CONFIG_NRF_802154_SER_HOST) && defined(CONFIG_NET_PKT_TIMESTAMP)
-	nrf5_data.ack_frame.time =
-		nrf_802154_first_symbol_timestamp_get(
-			metadata->data.transmitted.time, nrf5_data.ack_frame.psdu[0]);
+	if (nrf5_data.ack_frame.psdu) {
+		nrf5_data.ack_frame.rssi = metadata->data.transmitted.power;
+		nrf5_data.ack_frame.lqi = metadata->data.transmitted.lqi;
+
+#if !IS_ENABLED(CONFIG_NRF_802154_SER_HOST) && IS_ENABLED(CONFIG_NET_PKT_TIMESTAMP)
+		nrf5_data.ack_frame.time =
+			nrf_802154_first_symbol_timestamp_get(
+				metadata->data.transmitted.time, nrf5_data.ack_frame.psdu[0]);
 #endif
+	}
 
 	k_sem_give(&nrf5_data.tx_wait);
 }

drivers/led/pca9633.c

@@ -31,7 +31,7 @@ LOG_MODULE_REGISTER(pca9633);
 /* PCA9633 control register */
 #define PCA9633_MODE1           0x00
 #define PCA9633_MODE2           0x01
-#define PCA9633_PWM_BASE        0x02
+#define PCA9633_PWM_BASE        0x02	/* Reg 0x02-0x05 for brightness control LED01-04 */
 #define PCA9633_GRPPWM          0x06
 #define PCA9633_GRPFREQ         0x07
 #define PCA9633_LEDOUT          0x08
@@ -43,8 +43,11 @@ LOG_MODULE_REGISTER(pca9633);
 
 #define PCA9633_MASK            0x03
 
+struct pca9633_config {
+	struct i2c_dt_spec i2c;
+};
+
 struct pca9633_data {
-	const struct device *i2c;
 	struct led_data dev_data;
 };
 
@@ -52,6 +55,7 @@ static int pca9633_led_blink(const struct device *dev, uint32_t led,
 			     uint32_t delay_on, uint32_t delay_off)
 {
 	struct pca9633_data *data = dev->data;
+	const struct pca9633_config *config = dev->config;
 	struct led_data *dev_data = &data->dev_data;
 	uint8_t gdc, gfrq;
 	uint32_t period;
@@ -69,7 +73,7 @@ static int pca9633_led_blink(const struct device *dev, uint32_t led,
 	 *		GDC = ((time_on * 256) / period)
 	 */
 	gdc = delay_on * 256U / period;
-	if (i2c_reg_write_byte(data->i2c, DT_INST_REG_ADDR(0),
+	if (i2c_reg_write_byte_dt(&config->i2c,
 			       PCA9633_GRPPWM,
 			       gdc)) {
 		LOG_ERR("LED reg write failed");
@@ -83,7 +87,7 @@ static int pca9633_led_blink(const struct device *dev, uint32_t led,
 	 *		GFRQ = ((period * 24 / 1000) - 1)
 	 */
 	gfrq = (period * 24U / 1000) - 1;
-	if (i2c_reg_write_byte(data->i2c, DT_INST_REG_ADDR(0),
+	if (i2c_reg_write_byte_dt(&config->i2c,
 			       PCA9633_GRPFREQ,
 			       gfrq)) {
 		LOG_ERR("LED reg write failed");
@@ -91,7 +95,7 @@ static int pca9633_led_blink(const struct device *dev, uint32_t led,
 	}
 
 	/* Enable blinking mode */
-	if (i2c_reg_update_byte(data->i2c, DT_INST_REG_ADDR(0),
+	if (i2c_reg_update_byte_dt(&config->i2c,
 				PCA9633_MODE2,
 				PCA9633_MODE2_DMBLNK,
 				PCA9633_MODE2_DMBLNK)) {
@@ -100,7 +104,7 @@ static int pca9633_led_blink(const struct device *dev, uint32_t led,
 	}
 
 	/* Select the GRPPWM source to drive the LED outpout */
-	if (i2c_reg_update_byte(data->i2c, DT_INST_REG_ADDR(0),
+	if (i2c_reg_update_byte_dt(&config->i2c,
 				PCA9633_LEDOUT,
 				PCA9633_MASK << (led << 1),
 				PCA9633_LED_GRP_PWM << (led << 1))) {
@@ -114,6 +118,7 @@ static int pca9633_led_blink(const struct device *dev, uint32_t led,
 static int pca9633_led_set_brightness(const struct device *dev, uint32_t led,
 				      uint8_t value)
 {
+	const struct pca9633_config *config = dev->config;
 	struct pca9633_data *data = dev->data;
 	struct led_data *dev_data = &data->dev_data;
 	uint8_t val;
@@ -125,7 +130,7 @@ static int pca9633_led_set_brightness(const struct device *dev, uint32_t led,
 
 	/* Set the LED brightness value */
 	val = (value * 255U) / dev_data->max_brightness;
-	if (i2c_reg_write_byte(data->i2c, DT_INST_REG_ADDR(0),
+	if (i2c_reg_write_byte_dt(&config->i2c,
 			       PCA9633_PWM_BASE + led,
 			       val)) {
 		LOG_ERR("LED reg write failed");
@@ -133,7 +138,7 @@ static int pca9633_led_set_brightness(const struct device *dev, uint32_t led,
 	}
 
 	/* Set the LED driver to be controlled through its PWMx register. */
-	if (i2c_reg_update_byte(data->i2c, DT_INST_REG_ADDR(0),
+	if (i2c_reg_update_byte_dt(&config->i2c,
 				PCA9633_LEDOUT,
 				PCA9633_MASK << (led << 1),
 				PCA9633_LED_PWM << (led << 1))) {
@@ -146,10 +151,10 @@ static int pca9633_led_set_brightness(const struct device *dev, uint32_t led,
 
 static inline int pca9633_led_on(const struct device *dev, uint32_t led)
 {
-	struct pca9633_data *data = dev->data;
+	const struct pca9633_config *config = dev->config;
 
 	/* Set LED state to ON */
-	if (i2c_reg_update_byte(data->i2c, DT_INST_REG_ADDR(0),
+	if (i2c_reg_update_byte_dt(&config->i2c,
 				PCA9633_LEDOUT,
 				PCA9633_MASK << (led << 1),
 				PCA9633_LED_ON << (led << 1))) {
@@ -162,10 +167,10 @@ static inline int pca9633_led_on(const struct device *dev, uint32_t led)
 
 static inline int pca9633_led_off(const struct device *dev, uint32_t led)
 {
-	struct pca9633_data *data = dev->data;
+	const struct pca9633_config *config = dev->config;
 
 	/* Set LED state to OFF */
-	if (i2c_reg_update_byte(data->i2c, DT_INST_REG_ADDR(0),
+	if (i2c_reg_update_byte_dt(&config->i2c,
 				PCA9633_LEDOUT,
 				PCA9633_MASK << (led << 1),
 				PCA9633_LED_OFF)) {
@@ -178,17 +183,17 @@ static inline int pca9633_led_off(const struct device *dev, uint32_t led)
 
 static int pca9633_led_init(const struct device *dev)
 {
+	const struct pca9633_config *config = dev->config;
 	struct pca9633_data *data = dev->data;
 	struct led_data *dev_data = &data->dev_data;
 
-	data->i2c = device_get_binding(DT_INST_BUS_LABEL(0));
-	if (data->i2c == NULL) {
-		LOG_DBG("Failed to get I2C device");
-		return -EINVAL;
+	if (!device_is_ready(config->i2c.bus)) {
+		LOG_ERR("I2C bus is not ready");
+		return -ENODEV;
 	}
 
 	/* Take the LED driver out from Sleep mode. */
-	if (i2c_reg_update_byte(data->i2c, DT_INST_REG_ADDR(0),
+	if (i2c_reg_update_byte_dt(&config->i2c,
 				PCA9633_MODE1,
 				PCA9633_MODE1_SLEEP,
 				~PCA9633_MODE1_SLEEP)) {
@@ -204,8 +209,6 @@ static int pca9633_led_init(const struct device *dev)
 	return 0;
 }
 
-static struct pca9633_data pca9633_led_data;
-
 static const struct led_driver_api pca9633_led_api = {
 	.blink = pca9633_led_blink,
 	.set_brightness = pca9633_led_set_brightness,
@@ -213,7 +216,16 @@ static const struct led_driver_api pca9633_led_api = {
 	.off = pca9633_led_off,
 };
 
-DEVICE_DT_INST_DEFINE(0, &pca9633_led_init, NULL,
-		    &pca9633_led_data,
-		    NULL, POST_KERNEL, CONFIG_LED_INIT_PRIORITY,
-		    &pca9633_led_api);
+#define PCA9633_DEVICE(id)						\
+	static const struct pca9633_config pca9633_##id##_cfg = {	\
+		.i2c = I2C_DT_SPEC_INST_GET(id)				\
+	};								\
+	static struct pca9633_data pca9633_##id##_data;			\
+									\
+	DEVICE_DT_INST_DEFINE(id, &pca9633_led_init, NULL,		\
+			&pca9633_##id##_data,				\
+			&pca9633_##id##_cfg, POST_KERNEL,		\
+			CONFIG_LED_INIT_PRIORITY,			\
+			&pca9633_led_api);
+
+DT_INST_FOREACH_STATUS_OKAY(PCA9633_DEVICE)

drivers/memc/memc_mcux_flexspi.c

@@ -11,6 +11,18 @@
 
 #include "memc_mcux_flexspi.h"
 
+
+/*
+ * NOTE: If CONFIG_FLASH_MCUX_FLEXSPI_XIP is selected, Any external functions
+ * called while interacting with the flexspi MUST be relocated to SRAM or ITCM
+ * at runtime, so that the chip does not access the flexspi to read program
+ * instructions while it is being written to
+ */
+#if defined(CONFIG_FLASH_MCUX_FLEXSPI_XIP) && (CONFIG_MEMC_LOG_LEVEL > 0)
+#warning "Enabling memc driver logging and XIP mode simultaneously can cause \
+	read-while-write hazards. This configuration is not recommended."
+#endif
+
 LOG_MODULE_REGISTER(memc_flexspi, CONFIG_MEMC_LOG_LEVEL);
 
 struct memc_flexspi_config {

drivers/memc/memc_mcux_flexspi_hyperram.c

@@ -11,7 +11,19 @@
 
 #include "memc_mcux_flexspi.h"
 
-LOG_MODULE_DECLARE(memc_flexspi, CONFIG_MEMC_LOG_LEVEL);
+
+/*
+ * NOTE: If CONFIG_FLASH_MCUX_FLEXSPI_XIP is selected, Any external functions
+ * called while interacting with the flexspi MUST be relocated to SRAM or ITCM
+ * at runtime, so that the chip does not access the flexspi to read program
+ * instructions while it is being written to
+ */
+#if defined(CONFIG_FLASH_MCUX_FLEXSPI_XIP) && (CONFIG_MEMC_LOG_LEVEL > 0)
+#warning "Enabling memc driver logging and XIP mode simultaneously can cause \
+	read-while-write hazards. This configuration is not recommended."
+#endif
+
+LOG_MODULE_REGISTER(memc_flexspi, CONFIG_MEMC_LOG_LEVEL);
 
 enum {
 	READ_DATA,

drivers/modem/Kconfig.quectel-bg9x

@@ -10,7 +10,6 @@ config MODEM_QUECTEL_BG9X
 	select MODEM_IFACE_UART
 	select MODEM_SOCKET
 	select NET_SOCKETS_OFFLOAD
-	imply GPIO
 	help
 	  Choose this setting to enable quectel BG9x LTE-CatM1/NB-IoT modem
 	  driver.

drivers/modem/Kconfig.ublox-sara-r4

@@ -11,7 +11,6 @@ config MODEM_UBLOX_SARA
 	select MODEM_SOCKET
 	select NET_OFFLOAD
 	select NET_SOCKETS_OFFLOAD
-	imply GPIO
 	help
 	  Choose this setting to enable u-blox SARA-R4 LTE-CatM1/NB-IoT modem
 	  driver.

drivers/modem/hl7800.c

@@ -313,6 +313,8 @@ static const struct mdm_control_pinconfig pinconfig[] = {
 #else
 #define MODEM_HL7800_ADDRESS_FAMILY "IPV6"
 #endif
+#define MDM_HL7800_SOCKET_AF_IPV4 0
+#define MDM_HL7800_SOCKET_AF_IPV6 1
 
 #define SET_RAT_M1_CMD_LEGACY "AT+KSRAT=0"
 #define SET_RAT_NB1_CMD_LEGACY "AT+KSRAT=1"
@@ -5116,26 +5118,23 @@ static int configure_TCP_socket(struct hl7800_socket *sock)
 	int ret;
 	char cmd_cfg[sizeof("AT+KTCPCFG=#,#,\"" IPV6_ADDR_FORMAT "\",#####")];
 	int dst_port = -1;
+	int af;
 
-#if defined(CONFIG_NET_IPV6)
 	if (sock->dst.sa_family == AF_INET6) {
+		af = MDM_HL7800_SOCKET_AF_IPV6;
 		dst_port = net_sin6(&sock->dst)->sin6_port;
-	} else
-#endif
-#if defined(CONFIG_NET_IPV4)
-		if (sock->dst.sa_family == AF_INET) {
+	} else if (sock->dst.sa_family == AF_INET) {
+		af = MDM_HL7800_SOCKET_AF_IPV4;
 		dst_port = net_sin(&sock->dst)->sin_port;
-	} else
-#endif
-	{
+	} else {
 		return -EINVAL;
 	}
 
 	/* socket # needs assigning */
 	sock->socket_id = MDM_MAX_SOCKETS + 1;
 
-	snprintk(cmd_cfg, sizeof(cmd_cfg), "AT+KTCPCFG=%d,%d,\"%s\",%u", 1, 0,
-		 hl7800_sprint_ip_addr(&sock->dst), dst_port);
+	snprintk(cmd_cfg, sizeof(cmd_cfg), "AT+KTCPCFG=%d,%d,\"%s\",%u,,,,%d", 1, 0,
+		 hl7800_sprint_ip_addr(&sock->dst), dst_port, af);
 	ret = send_at_cmd(sock, cmd_cfg, MDM_CMD_SEND_TIMEOUT, 0, false);
 	if (ret < 0) {
 		LOG_ERR("AT+KTCPCFG ret:%d", ret);
@@ -5158,12 +5157,22 @@ done:
 static int configure_UDP_socket(struct hl7800_socket *sock)
 {
 	int ret = 0;
+	char cmd[sizeof("AT+KUDPCFG=1,0,,,,,0")];
+	int af;
 
 	/* socket # needs assigning */
 	sock->socket_id = MDM_MAX_SOCKETS + 1;
 
-	ret = send_at_cmd(sock, "AT+KUDPCFG=1,0", MDM_CMD_SEND_TIMEOUT, 0,
-			  false);
+	if (sock->family == AF_INET) {
+		af = MDM_HL7800_SOCKET_AF_IPV4;
+	} else if (sock->family == AF_INET6) {
+		af = MDM_HL7800_SOCKET_AF_IPV6;
+	} else {
+		return -EINVAL;
+	}
+
+	snprintk(cmd, sizeof(cmd), "AT+KUDPCFG=1,0,,,,,%d", af);
+	ret = send_at_cmd(sock, cmd, MDM_CMD_SEND_TIMEOUT, 0, false);
 	if (ret < 0) {
 		LOG_ERR("AT+KUDPCFG ret:%d", ret);
 		goto done;

drivers/net/Kconfig

@@ -1,6 +1,11 @@
 # Misc network drivers configuration options
 # SPDX-License-Identifier: Apache-2.0
 
+menuconfig NET_DRIVERS
+	bool "Network Drivers"
+
+if NET_DRIVERS
+
 #
 # PPP options
 #
@@ -90,8 +95,7 @@ endif # NET_PPP
 # SLIP options
 #
 menuconfig SLIP
-	bool "SLIP driver"
-	depends on (!QEMU_TARGET || NET_QEMU_SLIP)
+	bool "SLIP driver" if !QEMU_TARGET
 	depends on NET_NATIVE
 	select UART_PIPE
 	select UART_INTERRUPT_DRIVEN
@@ -149,3 +153,5 @@ module-help = Sets log level for network loopback driver.
 source "subsys/net/Kconfig.template.log_config.net"
 
 endif
+
+endif # NET_DRIVERS

drivers/pinmux/CMakeLists.txt

@@ -1,19 +1,17 @@
 # SPDX-License-Identifier: Apache-2.0
 
-zephyr_library()
-
 # Board initialization
-zephyr_library_sources_ifdef(CONFIG_PINMUX_CC13XX_CC26XX   pinmux_cc13xx_cc26xx.c)
-zephyr_library_sources_ifdef(CONFIG_PINMUX_ESP32           pinmux_esp32.c)
-zephyr_library_sources_ifdef(CONFIG_PINMUX_HSDK            pinmux_hsdk.c)
-zephyr_library_sources_ifdef(CONFIG_PINMUX_INTEL_S1000     pinmux_intel_s1000.c)
-zephyr_library_sources_ifdef(CONFIG_PINMUX_ITE_IT8XXX2     pinmux_ite_it8xxx2.c)
-zephyr_library_sources_ifdef(CONFIG_PINMUX_LPC11U6X        pinmux_lpc11u6x.c)
-zephyr_library_sources_ifdef(CONFIG_PINMUX_MCUX            pinmux_mcux.c)
-zephyr_library_sources_ifdef(CONFIG_PINMUX_MCUX_LPC        pinmux_mcux_lpc.c)
-zephyr_library_sources_ifdef(CONFIG_PINMUX_RV32M1          pinmux_rv32m1.c)
-zephyr_library_sources_ifdef(CONFIG_PINMUX_SAM0            pinmux_sam0.c)
-zephyr_library_sources_ifdef(CONFIG_PINMUX_SIFIVE          pinmux_sifive.c)
-zephyr_library_sources_ifdef(CONFIG_PINMUX_STM32           pinmux_stm32.c)
-zephyr_library_sources_ifdef(CONFIG_PINMUX_TELINK_B91      pinmux_b91.c)
-zephyr_library_sources_ifdef(CONFIG_PINMUX_XEC             pinmux_mchp_xec.c)
+zephyr_sources_ifdef(CONFIG_PINMUX_TELINK_B91      pinmux_b91.c)
+zephyr_sources_ifdef(CONFIG_PINMUX_CC13XX_CC26XX   pinmux_cc13xx_cc26xx.c)
+zephyr_sources_ifdef(CONFIG_PINMUX_ESP32           pinmux_esp32.c)
+zephyr_sources_ifdef(CONFIG_PINMUX_HSDK            pinmux_hsdk.c)
+zephyr_sources_ifdef(CONFIG_PINMUX_INTEL_S1000     pinmux_intel_s1000.c)
+zephyr_sources_ifdef(CONFIG_PINMUX_ITE_IT8XXX2     pinmux_ite_it8xxx2.c)
+zephyr_sources_ifdef(CONFIG_PINMUX_LPC11U6X        pinmux_lpc11u6x.c)
+zephyr_sources_ifdef(CONFIG_PINMUX_MCUX            pinmux_mcux.c)
+zephyr_sources_ifdef(CONFIG_PINMUX_MCUX_LPC        pinmux_mcux_lpc.c)
+zephyr_sources_ifdef(CONFIG_PINMUX_RV32M1          pinmux_rv32m1.c)
+zephyr_sources_ifdef(CONFIG_PINMUX_SAM0            pinmux_sam0.c)
+zephyr_sources_ifdef(CONFIG_PINMUX_SIFIVE          pinmux_sifive.c)
+zephyr_sources_ifdef(CONFIG_PINMUX_STM32           pinmux_stm32.c)
+zephyr_sources_ifdef(CONFIG_PINMUX_XEC             pinmux_mchp_xec.c)

drivers/pwm/pwm_mcux_ftm.c

@@ -228,8 +228,8 @@ static int mcux_ftm_pin_enable_capture(const struct device *dev, uint32_t pwm)
 	}
 
 	if (FTM_GetEnabledInterrupts(config->base) & BIT(PAIR_2ND_CH(pair))) {
-		LOG_WRN("Capture already active on channel pair %d", pair);
-		return 0;
+		LOG_ERR("Capture already active on channel pair %d", pair);
+		return -EBUSY;
 	}
 
 	FTM_ClearStatusFlags(config->base, BIT(PAIR_1ST_CH(pair)) |

drivers/pwm/pwm_nrfx.c

@@ -169,10 +169,13 @@ static int pwm_nrfx_pin_set(const struct device *dev, uint32_t pwm,
 		pulse_cycles /= 2;
 	}
 
-	/* Check if period_cycle is either matching currently used, or
+	/* Check if period_cycles is either matching currently used, or
 	 * possible to use with our prescaler options.
+	 * Don't do anything if the period length happens to be zero.
+	 * In such case, pulse cycles will be right below limited to 0
+	 * and this will result in making the channel inactive.
 	 */
-	if (period_cycles != data->period_cycles) {
+	if (period_cycles != 0 && period_cycles != data->period_cycles) {
 		int ret = pwm_period_check_and_set(config, data, channel,
 						   period_cycles);
 		if (ret) {

drivers/sensor/fdc2x1x/fdc2x1x.c

@@ -485,7 +485,6 @@ static int fdc2x1x_device_pm_ctrl(const struct device *dev,
 				  enum pm_device_action action)
 {
 	int ret;
-	struct fdc2x1x_data *data = dev->data;
 	const struct fdc2x1x_config *cfg = dev->config;
 	enum pm_device_state curr_state;
 
@@ -613,7 +612,6 @@ static int fdc2x1x_sample_fetch(const struct device *dev,
 				enum sensor_channel chan)
 {
 #ifdef CONFIG_PM_DEVICE
-	struct fdc2x1x_data *data = dev->data;
 	enum pm_device_state state;
 
 	(void)pm_device_state_get(dev, &state);

drivers/sensor/qdec_nrfx/qdec_nrfx.c

@@ -207,9 +207,11 @@ static int qdec_nrfx_init(const struct device *dev)
 }
 
 #ifdef CONFIG_PM_DEVICE
-static int qdec_nrfx_pm_control(struct qdec_nrfx_data *data,
+static int qdec_nrfx_pm_control(const struct device *dev,
 				enum pm_device_action action)
 {
+	ARG_UNUSED(dev);
+
 	switch (action) {
 	case PM_DEVICE_ACTION_RESUME:
 		qdec_nrfx_gpio_ctrl(true);

drivers/serial/Kconfig

@@ -31,6 +31,12 @@ config SERIAL_SUPPORT_INTERRUPT
 	  This is an option to be enabled by individual serial driver
 	  to signal that the driver and hardware supports interrupts.
 
+config SERIAL_INIT_PRIORITY
+	int "Serial init priority"
+	default KERNEL_INIT_PRIORITY_DEVICE
+	help
+	  Serial driver device initialization priority.
+
 config UART_USE_RUNTIME_CONFIGURE
 	bool "Enable runtime configuration for UART controllers"
 	default y

drivers/serial/leuart_gecko.c

@@ -354,7 +354,7 @@ static struct leuart_gecko_data leuart_gecko_0_data;
 DEVICE_DT_INST_DEFINE(0, &leuart_gecko_init,
 		    NULL, &leuart_gecko_0_data,
 		    &leuart_gecko_0_config, PRE_KERNEL_1,
-		    CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
+		    CONFIG_SERIAL_INIT_PRIORITY,
 		    &leuart_gecko_driver_api);
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN
@@ -407,7 +407,7 @@ static struct leuart_gecko_data leuart_gecko_1_data;
 DEVICE_DT_INST_DEFINE(1, &leuart_gecko_init,
 		    NULL, &leuart_gecko_1_data,
 		    &leuart_gecko_1_config, PRE_KERNEL_1,
-		    CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
+		    CONFIG_SERIAL_INIT_PRIORITY,
 		    &leuart_gecko_driver_api);
 
 #ifdef CONFIG_UART_INTERRUPT_DRIVEN

drivers/serial/serial_test.c

@@ -61,7 +61,7 @@ static int serial_vnd_init(const struct device *dev)
 #define VND_SERIAL_INIT(n)						\
 	DEVICE_DT_INST_DEFINE(n, &serial_vnd_init, NULL,		\
 			      NULL, NULL, POST_KERNEL,			\
-			      CONFIG_KERNEL_INIT_PRIORITY_DEVICE,	\
+			      CONFIG_SERIAL_INIT_PRIORITY,		\
 			      &serial_vnd_api);
 
 DT_INST_FOREACH_STATUS_OKAY(VND_SERIAL_INIT)