From: George Guo Add the LoongArch kernel configuration, target and cross-compiler detection, and include loongarch64 in the VM test suite. Boot vmlinux.efi through EFI firmware so the EFI stub installs the KHO table. Allow the firmware path to be set with QEMU_EFI and skip the test if it is unavailable. Co-developed-by: Kexin Liu Signed-off-by: Kexin Liu Signed-off-by: George Guo --- .../selftests/liveupdate/config.loongarch64 | 5 +++++ tools/testing/selftests/liveupdate/run-vmtests.sh | 4 ++-- tools/testing/selftests/liveupdate/vmtest.sh | 14 +++++++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 tools/testing/selftests/liveupdate/config.loongarch64 diff --git a/tools/testing/selftests/liveupdate/config.loongarch64 b/tools/testing/selftests/liveupdate/config.loongarch64 new file mode 100644 index 000000000000..264067ef5ab1 --- /dev/null +++ b/tools/testing/selftests/liveupdate/config.loongarch64 @@ -0,0 +1,5 @@ +CONFIG_ACPI_SPCR_TABLE=y +CONFIG_PCI_HOST_GENERIC=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SMP=y diff --git a/tools/testing/selftests/liveupdate/run-vmtests.sh b/tools/testing/selftests/liveupdate/run-vmtests.sh index d656ce58c5a7..f6cfb76b1dac 100755 --- a/tools/testing/selftests/liveupdate/run-vmtests.sh +++ b/tools/testing/selftests/liveupdate/run-vmtests.sh @@ -4,7 +4,7 @@ SCRIPT_DIR=$(dirname "$(realpath "$0")") TEST_RUNNER="$SCRIPT_DIR/vmtest.sh" -TARGETS=("x86_64" "aarch64") +TARGETS=("x86_64" "aarch64" "loongarch64") GREEN='\033[0;32m' RED='\033[0;31m' @@ -72,7 +72,7 @@ function main() { for test_name in "${TEST_NAMES[@]}"; do log="$output_dir/${arch}_${test_name}.log" - printf " -> %-8s %-24s ... " "$arch" "$test_name" + printf " -> %-11s %-24s ... " "$arch" "$test_name" "$TEST_RUNNER" -t "$arch" -T "$test_name" &> "$log" exit_code=$? diff --git a/tools/testing/selftests/liveupdate/vmtest.sh b/tools/testing/selftests/liveupdate/vmtest.sh index 69beda6c961d..ffe82512f3e4 100755 --- a/tools/testing/selftests/liveupdate/vmtest.sh +++ b/tools/testing/selftests/liveupdate/vmtest.sh @@ -21,6 +21,12 @@ function get_arch_conf() { QEMU_CMD="qemu-system-aarch64 -M virt -cpu max" KERNEL_IMAGE="Image" KERNEL_CMDLINE="console=ttyAMA0" + elif [[ "$arch" == "loongarch" ]]; then + local qemu_efi="${QEMU_EFI:-/usr/share/edk2/loongarch64/QEMU_EFI.fd}" + [ -r "$qemu_efi" ] || skip "EFI firmware '$qemu_efi' not found, set QEMU_EFI" + QEMU_CMD="qemu-system-loongarch64 -M virt -cpu la464 -bios $qemu_efi" + KERNEL_IMAGE="vmlinux.efi" + KERNEL_CMDLINE="console=ttyS0 earlycon" elif [[ "$arch" == "x86" ]]; then QEMU_CMD="qemu-system-x86_64" KERNEL_IMAGE="bzImage" @@ -37,11 +43,15 @@ $0 [-d build_dir] [-j jobs] [-t target_arch] [-T test_name] [-w workspace_dir] [ Options: -d) path to the kernel build directory (default: .luo_test_build.) -j) number of jobs for compilation - -t) run test for target_arch (aarch64, x86_64) + -t) run test for target_arch (aarch64, loongarch64, x86_64) -T) test name to run (default: luo_kexec_simple) -w) custom workspace directory (default: creates temp dir) -k) keep workspace directory after successful test -h) display this help + +Environment: + QEMU_EFI LoongArch EFI firmware path + (default: /usr/share/edk2/loongarch64/QEMU_EFI.fd) EOF } @@ -86,6 +96,7 @@ function detect_cross_compile() { local candidate="" case "$target" in aarch64) candidate="aarch64-linux-gnu-" ;; + loongarch64) candidate="loongarch64-linux-gnu-" ;; x86_64) candidate="x86_64-linux-gnu-" ;; *) skip "Auto-detection for target '$target' not supported. Please set CROSS_COMPILE manually." ;; esac @@ -193,6 +204,7 @@ function target_to_arch() { local target=$1 case $target in aarch64) echo "arm64" ;; + loongarch64) echo "loongarch" ;; x86_64) echo "x86" ;; *) skip "architecture $target is not supported" esac -- 2.53.0