imx95-pqc-demo: give the renderer the DisplayPort on autostart

Author: dgarske

imx95-pqc-demo/demo/demo-run.sh

@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
 # Two-pane i.MX95 demo. Runs ON THE BOARD as root.
 #
-#   left  - wolfCrypt PQC benchmarks in a container on the Cortex-A55 cluster
+#   left  - wolfBoot's own ML-DSA-87 verified boot of Linux, replaced by the
+#           wolfCrypt PQC benchmarks once the container has results
 #   right - wolfBoot ML-DSA-87 verified boot of the Cortex-M7
 #
 # Everything is local to the board, so once this is running nothing depends on
 # a host being connected.
 #
 #   sudo bash demo-run.sh              # render on this terminal
-#   sudo bash demo-run.sh /dev/tty1    # render on the HDMI console
+#   sudo bash demo-run.sh /dev/tty1    # render on the DisplayPort panel
 #
 # The M7 can only be started ONCE per Linux boot, so re-running the demo needs a
 # full board power cycle. That is the "reboot beat" - and it has to come from
@@ -31,9 +32,23 @@ bash "$DEMO/m7-start.sh" || echo "  (M7 already running - power cycle to replay
 
 echo "== rendering =="
 if [ -n "$TARGET" ]; then
-    # A getty owns tty1; stop it first or the two fight over the console.
+    # Torizon's kernel has no fbdev emulation, so text written to a VT reaches
+    # no display: the renderer has to own the DisplayPort through KMS. Take the
+    # screen away from everything else that wants it first - the getty on the
+    # console, the framebuffer console redrawing over the KMS output, and
+    # Torizon's pairing overlay - then render as the sole DRM master.
     systemctl stop getty@"$(basename "$TARGET")" 2>/dev/null || true
-    exec python3 "$DEMO/twopane.py" > "$TARGET" 2>/dev/null
+    for v in /sys/class/vtconsole/vtcon*; do
+        if grep -qi 'frame buffer' "$v/name" 2>/dev/null; then
+            echo 0 > "$v/bind" 2>/dev/null || true
+        fi
+    done
+    docker stop torizon-easy-pairing-bash-1 >/dev/null 2>&1 || true
+    # stderr is left alone on purpose: the DRM path is the most failure-prone
+    # part of the demo (hotplug, EDID, DRM-master contention), and discarding
+    # it turns a black screen into a silent restart loop with nothing in the
+    # journal to explain it.
+    exec env RENDER=drm python3 "$DEMO/twopane.py"
 else
     exec python3 "$DEMO/twopane.py"
 fi

imx95-pqc-demo/demo/install-autostart.sh

@@ -5,22 +5,25 @@
 #   sudo bash install-autostart.sh --off    # disable, restore the getty
 set -euo pipefail
 UNIT=/etc/systemd/system/wolfssl-demo.service
+M7_UNIT=/etc/systemd/system/wolfssl-m7.service
 HERE="$(cd "$(dirname "$0")" && pwd)"
 
 if [ "${1:-}" = "--off" ]; then
     systemctl disable --now wolfssl-demo.service 2>/dev/null || true
+    systemctl disable --now wolfssl-m7.service 2>/dev/null || true
     systemctl start getty@tty1.service 2>/dev/null || true
     sync
     echo "demo autostart disabled, getty on tty1 restored"
     exit 0
 fi
 
 install -m 0644 "$HERE/wolfssl-demo.service" "$UNIT"
+install -m 0644 "$HERE/wolfssl-m7.service" "$M7_UNIT"
 systemctl daemon-reload
-systemctl enable wolfssl-demo.service
+systemctl enable wolfssl-demo.service wolfssl-m7.service
 # The demo's replay beat is a hard power cut, so nothing may sit in the page
 # cache: an unsynced unit file is simply gone after the next cycle.
 sync
-echo "installed and enabled: $UNIT"
+echo "installed and enabled: $UNIT and $M7_UNIT"
 echo "the demo now starts on boot; power cycle is the whole replay"
 echo "disable with: sudo bash $HERE/install-autostart.sh --off"

imx95-pqc-demo/demo/stage.sh

@@ -15,10 +15,12 @@ PAYLOAD="${PAYLOAD:-$DEMO/m7/build/zephyr/payload_v1_signed.bin}"
 
 ssh "$BOARD" 'mkdir -p ~/demo/fw ~/demo/results ~/bin'
 
-scp -q "$DEMO/demo/twopane.py" "$DEMO/demo/demo-run.sh" \
+scp -q "$DEMO/demo/twopane.py" "$DEMO/demo/drmfb.py" "$DEMO/demo/font8x8.py" \
+       "$DEMO/demo/demo-run.sh" \
        "$DEMO/demo/m7-start.sh" "$DEMO/demo/m7-console-tail.sh" \
        "$DEMO/demo/m7-rpmsg-log.sh" "$DEMO/demo/install-autostart.sh" \
-       "$DEMO/demo/wolfssl-demo.service" "$BOARD:~/demo/"
+       "$DEMO/demo/wolfssl-demo.service" "$DEMO/demo/wolfssl-m7.service" \
+       "$BOARD:~/demo/"
 scp -q "$DEMO/container/docker-compose.yml" "$BOARD:~/demo/"
 scp -q "$WOLFBOOT/wolfboot.elf" "$BOARD:~/demo/fw/rproc-imx-rproc-fw"
 scp -q "$PAYLOAD"               "$BOARD:~/demo/fw/payload.bin"

imx95-pqc-demo/demo/wolfssl-demo.service

@@ -16,6 +16,9 @@ Conflicts=getty@tty1.service
 [Service]
 Type=simple
 ExecStart=/bin/bash /home/torizon/demo/demo-run.sh /dev/tty1
+# The renderer owns the DisplayPort through KMS (see demo-run.sh); Torizon has
+# no fbdev emulation, so there is no console path to the screen.
+Environment=RENDER=drm
 # A dead screen is worse than a retry on a show floor. Re-running is safe: the
 # M7 start is skipped when the core is already running, and the compose project
 # is torn down and brought back up on each pass.

imx95-pqc-demo/demo/wolfssl-m7.service

@@ -0,0 +1,18 @@
+[Unit]
+# Release the Cortex-M7 once Linux is up. Separate from the renderer unit so
+# the core still boots (and its log still lands in the shared ring) when the
+# display is absent or the renderer is being restarted.
+Description=wolfSSL i.MX95 demo - start the Cortex-M7 (wolfBoot -> Zephyr)
+Documentation=https://github.com/wolfSSL/wolfBoot-examples/pull/13
+After=multi-user.target
+
+[Service]
+# One shot per Linux boot, because that is the hardware's limit: "echo stop"
+# fails on this BSP and the core stays running, so replaying the M7 boot is a
+# board power cycle. RemainAfterExit keeps the unit from being re-run.
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/home/torizon/demo/m7-start.sh
+
+[Install]
+WantedBy=multi-user.target