Teach the KHO vmtest runner about riscv64: map the target to ARCH riscv and describe the QEMU virt machine, the kernel image and its console -- a 16550A port probed from the device tree on virt, hence the SERIAL_8250{,_CONSOLE} and SERIAL_OF_PLATFORM symbols. Also select CONFIG_SPARSEMEM_MANUAL: the runner requires CONFIG_DEFERRED_STRUCT_PAGE_INIT, which depends on SPARSEMEM, while riscv falls back to FLATMEM (no ARCH_SPARSEMEM_DEFAULT), so without it the test would just be skipped. Signed-off-by: Chen Pei --- Test: qemu-system-riscv64 (virt, -cpu max, TCG), in-tree runner "tools/testing/selftests/kho/vmtest.sh -t riscv64" (boots the Image and kexec'es into the same Image). KHO: found kexec handover data. KHO: exec from: 7.3.0-rc7-00108-gc6e90ee4ccbb (count 1) test_kho: KHO restore succeeded ok 1 KHO succeeded # Totals: pass:1 fail:0 xfail:0 xpass:0 skip:0 error:0 tools/testing/selftests/kho/riscv.conf | 9 +++++++++ tools/testing/selftests/kho/vmtest.sh | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/kho/riscv.conf diff --git a/tools/testing/selftests/kho/riscv.conf b/tools/testing/selftests/kho/riscv.conf new file mode 100644 index 000000000000..ec2a46cd45d5 --- /dev/null +++ b/tools/testing/selftests/kho/riscv.conf @@ -0,0 +1,9 @@ +QEMU_CMD="qemu-system-riscv64 -M virt -cpu max" +QEMU_KCONFIG=" +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SPARSEMEM_MANUAL=y +" +KERNEL_IMAGE="Image" +KERNEL_CMDLINE="console=ttyS0" diff --git a/tools/testing/selftests/kho/vmtest.sh b/tools/testing/selftests/kho/vmtest.sh index 0014bd76e88d..325af59f653a 100755 --- a/tools/testing/selftests/kho/vmtest.sh +++ b/tools/testing/selftests/kho/vmtest.sh @@ -21,7 +21,7 @@ Options: -d) path to the kernel build directory -j) number of jobs for compilation, similar to -j in make -t) run test for target_arch, requires CROSS_COMPILE set - supported targets: aarch64, x86_64 + supported targets: aarch64, x86_64, riscv64 -h) display this help EOF } @@ -127,6 +127,7 @@ function target_to_arch() { case $target in aarch64) echo "arm64" ;; x86_64) echo "x86" ;; + riscv64) echo "riscv" ;; *) skip "architecture $target is not supported" esac } -- 2.50.1