Skip to content

Pin M33MU to upstream master with deterministic USART timing #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattia-moffa merged 1 commit into from
Oct 1, 2026
Merged

Pin M33MU to upstream master with deterministic USART timing #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/m33mu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ jobs:
WT_MAX_GUESTS: 2
ZEPHYR_BOARD: nucleo_h563zi/stm32h563xx/ns
WT_TEST_GUEST: ${{ matrix.guest }}
# Upstream master with danielinux/m33mu PR #19 (STM32H5 DBGMCU_IDCODE).
M33MU_REF: 5d7f854acd8bcb5b56a6dba391995f9373261b1c
# Upstream master with danielinux/m33mu PR #21 (deterministic USART IRQ timing).
M33MU_REF: f3c03675260264cdec815adebe4b020bb6fe57b8
steps:
- uses: actions/checkout@v4

Expand Down
8 changes: 2 additions & 6 deletions docs/Testing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,8 @@ framework, its PAL, and the test lists are the upstream sources the Secure
build fetches and generates.

The runner builds its own pinned emulator and wolfBoot first stage. The
emulator is `M33MU_REF` plus `tests/target/m33mu-imxrt700.patch`, the model
correction the chain needs until it lands upstream: a Secure AHBSC SRAM rule
refuses Non-secure transactions but no longer overrides the SAU's NSC
attribution, so the SG veneers in the Secure-ruled code-RAM band stay callable
as the SRM's transaction check allows. The rules otherwise apply to CPU0 as
documented, which is stricter than the EVK measured.
emulator is upstream M33MU at `M33MU_REF`, unpatched. Its Secure AHBSC SRAM
rules apply to CPU0 as documented, which is stricter than the EVK measured.
wolfBoot is `WOLFBOOT_REF` built from `config/examples/imx-rt700-tz.config`
plus `tests/target/wolfboot-imxrt700-lifecycle.patch` (the RT700 HAL's PSA
lifecycle hook, which the attestation service needs; it goes once wolfBoot
Expand Down
57 changes: 0 additions & 57 deletions tests/target/m33mu-imxrt700.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/target/run_m33mu_scenario.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export WT_ZEPHYR_DTC_OVERLAY_FILE=boards/wolfboot-stm32h563.overlay
export WT_MAX_GUESTS=2
export ZEPHYR_BOARD=nucleo_h563zi/stm32h563xx/ns
WOLFBOOT_REF=d85fa9dbdf6c36f47b7e96eba5c9df750ad3c963
M33MU_REF=5d7f854acd8bcb5b56a6dba391995f9373261b1c
M33MU_REF=f3c03675260264cdec815adebe4b020bb6fe57b8
Comment thread
mattia-moffa marked this conversation as resolved.

# --- Build the pinned M33MU emulator. Reuse a caller-supplied or already-built
# binary so back-to-back scenarios in one container share the build (and a
Expand Down
13 changes: 5 additions & 8 deletions tests/target/run_rt700_m33mu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
# IPC suite's panic tests stay cheap.
#
# Environment (all optional):
# M33MU prebuilt emulator carrying tests/target/m33mu-imxrt700.patch;
# otherwise M33MU_REF is built under /tmp
# M33MU prebuilt emulator at M33MU_REF or later; otherwise
# M33MU_REF is built under /tmp
# RT700_WOLFBOOT_DIR wolfBoot tree holding wolfboot.bin, tools/keytools/sign
# and wolfboot_signing_private_key.der, built with
# tests/target/wolfboot-imxrt700-lifecycle.patch applied;
Expand Down Expand Up @@ -83,7 +83,7 @@ wolfboot_dir="${RT700_WOLFBOOT_DIR:-/tmp/wolfboot_rt700}"
log="$repo/build/rt700_m33mu_$scenario.log"

WOLFBOOT_REF=e6d169c7218d82e33bd04e2c086146ed37ec0cca
M33MU_REF=9733c2bf99995f33e7b1d4aa31e2f17bfa2d13c1
M33MU_REF=f3c03675260264cdec815adebe4b020bb6fe57b8

# The guests' manifest restart budget (port/mimxrt700/partitions.c): ahbscneg
# relaunches guest0 this many times before quarantining it.
Expand All @@ -103,21 +103,18 @@ GUEST_STARTED_RE='wolfTrust RT700 guest[01]: start'
# shellcheck disable=SC2034
GUEST_DONE_RE='wolfTrust RT700 guest[01]: FF-M connect ok, done'

# --- The pinned M33MU with the model fix this chain needs: a Secure AHBSC
# SRAM rule keeps the SAU's NSC veneer band callable. Drop the patch once
# M33MU_REF carries it. ---
# --- The pinned upstream M33MU. ---
if [ -n "${M33MU:-}" ] && [ -x "$M33MU" ]; then
log "Using prebuilt M33MU: $M33MU"
elif [ -x /tmp/m33mu_rt700_src/build/m33mu ]; then
Comment thread
mattia-moffa marked this conversation as resolved.
M33MU=/tmp/m33mu_rt700_src/build/m33mu
log "Reusing M33MU from a prior scenario: $M33MU"
else
stage "build M33MU $M33MU_REF with m33mu-imxrt700.patch"
stage "build M33MU $M33MU_REF"
rm -rf /tmp/m33mu_rt700_src
git clone --no-checkout https://github.com/danielinux/m33mu.git /tmp/m33mu_rt700_src
git -C /tmp/m33mu_rt700_src fetch --depth 1 origin "$M33MU_REF"
git -C /tmp/m33mu_rt700_src checkout --detach "$M33MU_REF"
git -C /tmp/m33mu_rt700_src apply "$here/m33mu-imxrt700.patch"
cmake -S /tmp/m33mu_rt700_src -B /tmp/m33mu_rt700_src/build \
-DM33MU_ENABLE_WOLFSSL=OFF -DM33MU_BUILD_TESTS=OFF \
-DM33MU_ENABLE_RUST_PLUGINS=OFF
Expand Down
Loading