imx95-pqc-demo: show wolfBoot's verified boot of Linux until the benchmarks start

Author: dgarske

imx95-pqc-demo/demo/twopane.py

@@ -27,6 +27,7 @@
 CONTAINER = os.environ.get("CONTAINER", "wolfcrypt-pqc")
 MEMTOOL = os.environ.get("MEMTOOL", "/home/torizon/bin/memtool")
 CONSOLE_ADDR = os.environ.get("CONSOLE_ADDR", "0x80F00000")
+A55_CONSOLE_ADDR = os.environ.get("A55_CONSOLE_ADDR", "0x80F20000")
 INTERVAL = float(os.environ.get("INTERVAL", "1.0"))
 
 ANSI = re.compile(r"\x1b\[[0-9;]*[A-Za-z]")
@@ -41,6 +42,15 @@
 # The raw benchmark line is far too wide for half a console, and truncating it
 # cuts off ops/sec - the one number worth showing. Condense to
 # "<algorithm> <operation>   <rate>" so each result fits on one readable row.
+# The A55 boot log is long and most of it is bookkeeping: the handoff register
+# dump, the MBR walk, and a line per FIT sub-image copied. Only the chain of
+# trust belongs on a demo screen, and the pane holds far fewer rows than the log
+# has lines, so without this the verification scrolls off before anyone reads it.
+BOOT_KEEP = re.compile(
+    r"^(wolfBoot:|scmi:|usdhc:|Boot partition:|Booting version|"
+    r"Checking image integrity|Verifying image signature|info: ML-DSA|"
+    r"info: using ML-DSA|info: wc_MlDsaKey_Verify|Firmware Valid|Booting at)")
+
 OPS = re.compile(r"^(.*?)\s+\d+ ops took [\d.]+ sec, avg [\d.]+ ms,\s+([\d.]+) ops/sec")
 THRU = re.compile(r"^(\S.*?)\s+[\d.]+ [KMG]iB took [\d.]+ seconds,\s+([\d.]+) ([KMG]iB/s)")
 
@@ -84,6 +94,7 @@ def condense(ln, width):
     return f"{shorten(m.group(1))[:wname]:<{wname}} {value:>{len(value)}}"
 
 LEFT_TITLE = " Cortex-A55: wolfCrypt PQC (on 1 of 6 cores) "
+LEFT_BOOT_TITLE = " Cortex-A55: wolfBoot ML-DSA-87 "
 RIGHT_TITLE = " Cortex-M7: wolfBoot ML-DSA-87 "
 
 
@@ -139,6 +150,11 @@ def text(self):
             return "\n".join(self.buf)
 
 
+def boot_lines(text):
+    """Keep only the chain-of-trust lines from wolfBoot's own boot log."""
+    return [ln for ln in text.splitlines() if BOOT_KEEP.match(ln.strip())]
+
+
 def clean(text, width, drop_cycles=False):
     """Strip ANSI so column widths are computed on what is actually shown.
 
@@ -163,10 +179,12 @@ def clean(text, width, drop_cycles=False):
 def fit(lines, width, height, wrap=False):
     """Last `height` lines, fitted to `width`.
 
-    The benchmark pane truncates: its lines are already condensed to fit, and a
-    wrapped one would cost extra rows and break alignment. The wolfBoot pane
-    wraps: its output is short, it is the point of the demo, and losing the end
-    of "wc_MlDsaKey_Verify returned OK" would defeat the purpose.
+    Both panes wrap. The wolfBoot panes must: their output is the point of the
+    demo, and losing the end of "wc_MlDsaKey_Verify returned OK" would defeat
+    it. The benchmark pane is already condensed to the pane width, so wrapping
+    is normally a no-op there, and it is still what we want in the narrow case
+    condense() cannot squeeze (a long value clamps the label at six columns and
+    the line runs over) - an extra row beats a silently cut number.
     """
     out = []
     for ln in lines:
@@ -198,15 +216,30 @@ def main():
         half = (cols - 3) // 2
         body = rows - 4
 
-        left = fit(clean(logtail.text(), half, drop_cycles=True), half, body, wrap=True)
+        # The left pane tells the A55's story in the order it happened: first
+        # wolfBoot verifying the kernel it booted (read back from the DDR ring,
+        # since that output is long gone from the console by the time anything
+        # can render), then the benchmarks, from the moment the container has a
+        # result worth showing.
+        bench = clean(logtail.text(), half, drop_cycles=True)
+        if bench:
+            left_title = LEFT_TITLE
+            left = fit(bench, half, body, wrap=True)
+        else:
+            left_title = LEFT_BOOT_TITLE
+            boot_raw = run(f"{MEMTOOL} con {A55_CONSOLE_ADDR} 2>/dev/null")
+            boot = boot_lines(ANSI.sub("", boot_raw))
+            if not boot:
+                boot = ["waiting for the benchmark container ..."]
+            left = fit(boot, half, body, wrap=True)
         right_raw = run(f"{MEMTOOL} con {CONSOLE_ADDR} 2>/dev/null")
         if not right_raw.strip():
             right_raw = "waiting for the Cortex-M7 to boot ...\n"
         right = fit(clean(right_raw, half), half, body, wrap=True)
 
         buf = ["\x1b[?25l\x1b[H"]   # hide cursor, home - no clear, see note above
         buf.append("\x1b[1;36m" + "NXP i.MX95  -  post-quantum on both clusters".center(cols) + "\x1b[0m")
-        buf.append("\x1b[1;33m" + LEFT_TITLE.ljust(half) + " | " +
+        buf.append("\x1b[1;33m" + left_title.ljust(half) + " | " +
                    RIGHT_TITLE.ljust(half) + "\x1b[0m")
         buf.append("-" * cols)
         for i in range(body):