downstream: rebase hardware models onto master

.gitignore

@@ -1,6 +1,7 @@
 /GNUmakefile
 /build/
 /.cache/
+/.oh-my-qemu/
 /.vscode/
 *.pyc
 .sdk

.gitmodules

@@ -45,3 +45,6 @@
 [submodule "tests/lcitool/libvirt-ci"]
 	path = tests/lcitool/libvirt-ci
 	url = https://gitlab.com/libvirt/libvirt-ci.git
+[submodule ".agents"]
+	path = .agents
+	url = https://github.com/processmission/oh-my-qemu.git

MAINTAINERS

@@ -888,6 +888,22 @@ F: include/hw/misc/arm_integrator_debug.h
 F: tests/functional/arm/test_integratorcp.py
 F: docs/system/arm/integratorcp.rst
 
+M5Stack AI Pyramid (AX650X)
+M: Chao Liu <[email protected]>
+L: [email protected]
+S: Maintained
+F: docs/system/arm/ax650x-pyramid.rst
+F: hw/arm/ax650x*.c
+F: hw/gpio/dw-apb-gpio.c
+F: hw/misc/ax650x-*.c
+F: hw/sd/ax650x-sdhci.c
+F: include/hw/arm/ax650x*.h
+F: include/hw/gpio/dw-apb-gpio.h
+F: include/hw/misc/ax650x-*.h
+F: include/hw/sd/ax650x-sdhci.h
+F: tests/functional/aarch64/test_ax650x_ubuntu.py
+F: tests/qtest/ax650x-pyramid-test.c
+
 MAX78000FTHR
 L: [email protected]
 S: Orphan
@@ -1821,18 +1837,67 @@ F: docs/system/riscv/xiangshan-kunminghu.rst
 F: hw/riscv/xiangshan_kmh.c
 F: include/hw/riscv/xiangshan_kmh.h
 
-K230 Machines
+CanMV-K230 Machines
 M: Chao Liu <[email protected]>
 L: [email protected]
 S: Maintained
-F: docs/system/riscv/k230.rst
+F: docs/system/riscv/k230-canmv.rst
+F: hw/display/k230_*.c
+F: hw/dma/k230_*.c
+F: hw/i2c/k230_*.c
+F: hw/intc/k230_*.c
+F: hw/misc/k230_*.c
+F: hw/rtc/k230_*.c
 F: hw/riscv/k230.c
+F: hw/sd/k230_sdhci.c
+F: hw/ssi/k230_spi.c
 F: hw/watchdog/k230_wdt.c
+F: include/hw/display/k230_*.h
+F: include/hw/dma/k230_*.h
+F: include/hw/i2c/k230_*.h
+F: include/hw/intc/k230_*.h
+F: include/hw/misc/k230_*.h
+F: include/hw/rtc/k230_*.h
 F: include/hw/riscv/k230.h
+F: include/hw/sd/k230_sdhci.h
+F: include/hw/ssi/k230_spi.h
 F: include/hw/watchdog/k230_wdt.h
 F: tests/functional/riscv64/test_k230.py
+F: tests/qtest/k230-sysctl-test.c
 F: tests/qtest/k230-wdt-test.c
 
+SpacemiT K3 Pico-ITX
+M: Chao Liu <[email protected]>
+L: [email protected]
+S: Maintained
+F: docs/system/riscv/spacemit-k3.rst
+F: hw/misc/spacemit-k3.c
+F: hw/riscv/spacemit-k3.c
+F: hw/sd/spacemit-k3-sdhci.c
+F: include/hw/misc/spacemit-k3.h
+F: include/hw/riscv/spacemit-k3.h
+F: include/hw/sd/spacemit-k3-sdhci.h
+F: tests/functional/riscv64/test_spacemit_k3.py
+F: tests/qtest/spacemit-k3-test.c
+
+Milk-V Duo
+M: Kuan-Wei Chiu <[email protected]>
+S: Maintained
+F: docs/system/riscv/milkv-duo.rst
+F: hw/char/dw8250.c
+F: hw/misc/cv1800b_clk.c
+F: hw/riscv/cv1800b.c
+F: hw/riscv/milkv_duo.c
+F: include/hw/char/dw8250.h
+F: include/hw/misc/cv1800b_clk.h
+F: include/hw/riscv/cv1800b.h
+F: tests/qtest/milkv-duo-test.c
+
+RTL8152 USB Ethernet
+M: Chao Liu <[email protected]>
+S: Maintained
+F: hw/usb/dev-rtl8152.c
+
 RX Machines
 -----------
 rx-gdbsim

README.md

@@ -0,0 +1,111 @@
+# Process Mission QEMU
+
+Process Mission maintains this downstream QEMU branch for board and SoC model
+development that is not yet carried by upstream QEMU. It tracks new machine
+models, boot flows, and test coverage as they are added.
+
+This branch is regularly rebased on top of upstream QEMU. Please file an issue
+for new machine requests or bug reports.
+
+## Machine Models
+
+| arch | machine | direct | firmware | src |
+| --- | --- | --- | --- | --- |
+| RISC-V | [`k230-canmv`](docs/system/riscv/k230-canmv.rst) | ✅ | ✅ | PM |
+| RISC-V | [`k3-pico-itx`](docs/system/riscv/spacemit-k3.rst) | ✅ | ✅ | PM |
+| RISC-V | [`milkv-duo`](docs/system/riscv/milkv-duo.rst) | ✅ | ✅ | UP |
+| RISC-V | [`riscv-server-ref`](docs/system/riscv/riscv-server-ref.rst) | ✅ | ✅ | UP |
+| ARM | [`ax650x-pyramid`](docs/system/arm/ax650x-pyramid.rst) | ✅ | ❌ | PM |
+| ARM | [`phytium-pi`](docs/system/arm/phytium-pi.rst) | ✅ | ✅ | PM |
+| ARM | [`rk3588-evb`](docs/system/arm/rk3588.rst) | ✅ | ✅ | PM |
+| ARM | [`rk3588s-roc-pc`](docs/system/arm/rk3588.rst) | ✅ | ✅ | PM |
+| ARM | [`s32k566-cvb-r52`](docs/system/arm/s32k5.rst) | ✅ | ❌ | PM |
+
+Source legend:
+
+- `PM`: Process Mission downstream-maintained model.
+- `UP`: imported from upstream QEMU/qemu-devel.
+- `OSS`: imported from other open-source repositories.
+- `VND`: imported from vendor sources.
+
+## Development Workflow
+
+The machine models in this branch are developed with the `oh-my-qemu` workflow.
+It provides agent skills for planning, register extraction, peripheral modeling,
+board modeling, qtest, build, debugging, and verification.
+
+- Skill repository: <https://github.com/processmission/oh-my-qemu>
+
+## AX650X Pyramid quick start
+
+The `ax650x-pyramid` machine directly boots Linux on the M5Stack AI Pyramid /
+AXERA AX650X platform. Detailed machine documentation is available in
+[docs/system/arm/ax650x-pyramid.rst](docs/system/arm/ax650x-pyramid.rst).
+
+### Boot Ubuntu 22.04 from eMMC
+
+The Ubuntu image has no MBR or GPT. Linux creates its twelve partitions from
+the fixed `blkdevparts` command line. The command below uses `snapshot=on`, so
+guest writes are discarded when QEMU exits.
+
+```sh
+QEMU=${QEMU:-build/qemu-system-aarch64}
+ASSET_DIR=${ASSET_DIR:-assets/ax650x}
+KERNEL=${KERNEL:-$ASSET_DIR/Image-5.15.73-axera}
+EMMC=${EMMC:-$ASSET_DIR/ax650x-ubuntu-22.04-emmc.raw}
+
+PARTS='mmcblk0:1536K(uboot),1536K(uboot_bk),1M(env),20M(param)'
+PARTS="$PARTS,6M(logo),1M(dtb),64M(kernel),1M(atf),1M(optee)"
+PARTS="$PARTS,1M(recovery_dtb),74M(recovery),30380032K(rootfs)"
+CMDLINE='console=ttyS0,115200n8 earlycon=uart8250,mmio32,0x2016000'
+CMDLINE="$CMDLINE root=/dev/mmcblk0p12 rootfstype=ext4 rw rootwait"
+CMDLINE="$CMDLINE blkdevparts=$PARTS"
+CMDLINE="$CMDLINE systemd.show_status=yes systemd.log_target=console"
+
+for input in "$QEMU" "$KERNEL" "$EMMC"; do
+    if [ ! -r "$input" ]; then
+        echo "missing input: $input" >&2
+        exit 1
+    fi
+done
+
+exec "$QEMU" \
+    -machine ax650x-pyramid \
+    -accel tcg,thread=multi \
+    -cpu cortex-a55 \
+    -smp 8 \
+    -m 2G \
+    -kernel "$KERNEL" \
+    -append "$CMDLINE" \
+    -drive "file=$EMMC,if=sd,format=raw,snapshot=on" \
+    -chardev stdio,id=serial0,signal=off \
+    -serial chardev:serial0 \
+    -display none \
+    -monitor none \
+    -no-reboot
+```
+
+Override `QEMU`, `KERNEL`, or `EMMC` in the environment when the artifacts
+live elsewhere. Remove `snapshot=on` only when persistent image writes are
+intentional.
+
+### Run the Ubuntu quick-boot functional test
+
+The functional test uses the same direct-boot contract but lets the test
+harness own the serial chardev. It is in the `thorough` suite because the
+kernel and compressed eMMC image are downloaded assets.
+
+```sh
+meson test -C build \
+    --suite thorough \
+    func-aarch64-ax650x_ubuntu \
+    --print-errorlogs
+```
+
+The pinned kernel and qcow2 image are published at:
+
+<https://github.com/processmission/qemu/releases/tag/ax650x-ubuntu-22.04-qemu1>
+
+The harness verifies both SHA-256 digests. The test uses disposable eMMC
+writes and waits for DWMAC probe, partition 12, the mounted ext4 root
+filesystem, Ubuntu readiness markers, and the serial login prompt.

configs/devices/riscv64-softmmu/default.mak

@@ -9,7 +9,11 @@
 # CONFIG_SIFIVE_E=n
 # CONFIG_SIFIVE_U=n
 # CONFIG_RISCV_VIRT=n
+# CONFIG_RISCV_SERVER_PLATFORM_REF=n
+# CONFIG_SPACEMIT_K3=n
 # CONFIG_MICROCHIP_PFSOC=n
 # CONFIG_SHAKTI_C=n
+# CONFIG_K230=n
 # CONFIG_XIANGSHAN_KUNMINGHU=n
 # CONFIG_MIPS_BOSTON_AIA=n
+# CONFIG_MILKV_DUO=n

docs/about/deprecated.rst

@@ -392,6 +392,13 @@ It was implemented as a no-op instruction in TCG up to QEMU 9.0, but
 only with ``-cpu max`` (which does not guarantee migration compatibility
 across versions).
 
+``debug=true|false`` on RISC-V CPUs (since 11.0)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This option, since QEMU 10.1, has been a simple alias to the ``sdtrig``
+extension. Users are advised to enable/disable ``sdtrig`` directly instead
+of using ``debug``.
+
 linux-user mode CPUs
 --------------------
 
@@ -416,7 +423,6 @@ ABI is long-obsolete. We are therefore deprecating both OABI support
 and NWFPE emulation, and they will be removed in a future QEMU
 release.
 
-
 Backwards compatibility
 -----------------------