CI: test qemu-riscv64_smode[_acpi]

QEMU comes with its own OpenSBI. For running RISC-V virtual machine using one of qemu-riscv64_smode_defconfig or qemu-riscv64_smode_acpi_defconfig is the natural choice. Add the riscv64 smode configurations to the test scope. Series-to: concept Cover-letter: CI: Tidy up riscv targets There are some smode options for the QEMU builds, along with some associated hooks. This eries pulls these in from upstream, since the previous attempt has broken qemu-riscv64 END Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> (cherry picked from 703efbb1a5) Signed-off-by: Simon Glass <simon.glass@canonical.com>
travis-ci: add qemu-riscv64_smode* test environments
2025-12-27 11:26:54 -07:00 · 2025-12-27 11:09:13 -07:00 · 2025-12-27 10:14:32 -07:00 · 2025-12-27 14:10:59 +00:00 · 2025-12-27 04:51:56 -07:00 · 2025-12-27 03:37:54 +00:00
7 changed files with 41 additions and 22 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -631,6 +631,18 @@ qemu-riscv64_spl test.py:
    TEST_PY_TEST_SPEC: "not sleep"
  <<: *buildman_and_testpy_dfn

+qemu-riscv64_smode test.py:
+  variables:
+    TEST_PY_BD: "qemu-riscv64_smode"
+    TEST_PY_TEST_SPEC: "not sleep"
+  <<: *buildman_and_testpy_dfn
+
+qemu-riscv64_smode_acpi test.py:
+  variables:
+    TEST_PY_BD: "qemu-riscv64_smode_acpi"
+    TEST_PY_TEST_SPEC: "not sleep"
+  <<: *buildman_and_testpy_dfn
+
 qemu-x86 test.py:
  variables:
    TEST_PY_BD: "qemu-x86"
--- a/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_acpi_na
+++ b/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_acpi_na
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: MIT
-# Config for qemu-riscv64 S-mode (requires OpenSBI)
-
-console_impl=qemu
-qemu_machine="virt"
-qemu_binary="qemu-system-riscv64"
-qemu_extra_args="-m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0 -netdev user,id=net1,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net1 -device virtio-rng-device"
-qemu_kernel_args="-bios ${OPENSBI} -kernel ${U_BOOT_BUILD_DIR}/u-boot.bin"
-reset_impl=none
-flash_impl=none
--- a/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_acpi_na
+++ b/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_acpi_na
@@ -0,0 +1 @@
+../travis-ci/conf.qemu-riscv64_smode_acpi_na
--- a/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_na
+++ b/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_na
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: MIT
-# Config for qemu-riscv64 S-mode (requires OpenSBI)
-
-console_impl=qemu
-qemu_machine="virt"
-qemu_binary="qemu-system-riscv64"
-qemu_extra_args="-m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0 -netdev user,id=net1,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net1 -device virtio-rng-device"
-qemu_kernel_args="-bios ${OPENSBI} -kernel ${U_BOOT_BUILD_DIR}/u-boot.bin"
-reset_impl=none
-flash_impl=none
--- a/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_na
+++ b/test/hooks/bin/ellesmere/conf.qemu-riscv64_smode_na
@@ -0,0 +1 @@
+../travis-ci/conf.qemu-riscv64_smode_na
--- a/test/hooks/bin/travis-ci/conf.qemu-riscv64_na
+++ b/test/hooks/bin/travis-ci/conf.qemu-riscv64_na
@@ -1,10 +1,11 @@
 # SPDX-License-Identifier: MIT
-# Config for qemu-riscv64 S-mode (requires OpenSBI)
+#
+# Copyright (c) 2019 Heinrich Schuchardt

 console_impl=qemu
 qemu_machine="virt"
 qemu_binary="qemu-system-riscv64"
 qemu_extra_args="-m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0 -netdev user,id=net1,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net1 -device virtio-rng-device"
-qemu_kernel_args="-bios ${OPENSBI} -kernel ${U_BOOT_BUILD_DIR}/u-boot.bin"
+qemu_kernel_args="-bios ${U_BOOT_BUILD_DIR}/u-boot"
 reset_impl=none
 flash_impl=none
--- a/test/hooks/bin/travis-ci/conf.qemu-riscv64_smode_acpi_na
+++ b/test/hooks/bin/travis-ci/conf.qemu-riscv64_smode_acpi_na
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright (c) 2025 Heinrich Schuchardt
+
+console_impl=qemu
+qemu_machine="virt,acpi=on"
+qemu_binary="qemu-system-riscv64"
+qemu_extra_args="-m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0 -netdev user,id=net1,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net1 -device virtio-rng-device"
+qemu_kernel_args="-kernel ${U_BOOT_BUILD_DIR}/u-boot"
+reset_impl=none
+flash_impl=none
--- a/test/hooks/bin/travis-ci/conf.qemu-riscv64_smode_na
+++ b/test/hooks/bin/travis-ci/conf.qemu-riscv64_smode_na
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright (c) 2025 Heinrich Schuchardt
+
+console_impl=qemu
+qemu_machine="virt,acpi=on"
+qemu_binary="qemu-system-riscv64"
+qemu_extra_args="-m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0 -netdev user,id=net1,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net1 -device virtio-rng-device"
+qemu_kernel_args="-kernel ${U_BOOT_BUILD_DIR}/u-boot"
+reset_impl=none
+flash_impl=none
--- a/tools/patman/commit.py
+++ b/tools/patman/commit.py
@@ -17,6 +17,7 @@ class Commit:
    Variables:
        hash: Commit hash
        subject: Subject line
+        msg: Commit message body (everything after the subject line)
        tags: List of maintainer tag strings
        changes: Dict containing a list of changes (single line strings).
            The dict is indexed by change version (an integer)
@@ -35,6 +36,7 @@ class Commit:
    def __init__(self, hash):
        self.hash = hash
        self.subject = ''
+        self.msg = ''
        self.tags = []
        self.changes = {}
        self.cc_list = []
Author	SHA1	Message	Date
Heinrich Schuchardt	39a8134605	CI: test qemu-riscv64_smode[_acpi] QEMU comes with its own OpenSBI. For running RISC-V virtual machine using one of qemu-riscv64_smode_defconfig or qemu-riscv64_smode_acpi_defconfig is the natural choice. Add the riscv64 smode configurations to the test scope. Series-to: concept Cover-letter: CI: Tidy up riscv targets There are some smode options for the QEMU builds, along with some associated hooks. This eries pulls these in from upstream, since the previous attempt has broken qemu-riscv64 END Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> (cherry picked from `703efbb1a5`) Signed-off-by: Simon Glass <simon.glass@canonical.com>	2025-12-27 11:26:54 -07:00
Simon Glass	545acab06c	travis-ci: add qemu-riscv64_smode* test environments Provide test environments for running qemu-riscv64_smode and qemu-riscv64_smode_acpi. These use the OpenSBI implementation provided by QEMU and pass main u-boot as -kernel parameter. ACPI is enabled for both boards. We still expect the boards to use QEMU's device-tree as control device-tree. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> (cherry picked from d94ebdd2c823ce8776723184cda960dcd2954711) Remove the rva23s64 CPU since we don't have that in our QEMU: Signed-off-by: Simon Glass <simon.glass@canonical.com>	2025-12-27 11:09:13 -07:00
Simon Glass	073cddf846	Revert "test: hooks: Update qemu-riscv64 config for S-mode with OpenSBI" This reverts commit `5f66188fd5`.	2025-12-27 10:14:32 -07:00
Simon Glass	63578a8298	Merge branch 'cif' into 'master' patman: Update Commit to include the message See merge request u-boot/u-boot!349	2025-12-27 14:10:59 +00:00
Simon Glass	39a4396362	patman: Update Commit to include the message There is in fact a 'msg' member for Commit, set up by the Patchstream._close_commit() function. Declare it in the docs and set it to empty when the Commit is created. Signed-off-by: Simon Glass <simon.glass@canonical.com>	2025-12-27 04:51:56 -07:00
Simon Glass	58667e0511	Merge branch 'cie' into 'master' test: pytest and hook improvements See merge request u-boot/u-boot!348	2025-12-27 03:37:54 +00:00
				`@@ -0,0 +1 @@`
				`../travis-ci/conf.qemu-riscv64_smode_acpi_na`