Re: [PATCH v7 4/5] tests/qtest: add test for K230 watchdog

[Chao Liu <chao.liu.zevorn@gmail.com>]

On Fri, Jun 12, 2026 at 12:37:03PM +0800, Alistair Francis wrote:
> On Tue, May 12, 2026 at 2:33 AM Chao Liu <chao.liu.zevorn@gmail.com> wrote:
> >
> > From: Chao Liu <chao.liu@zevorn.cn>
> >
> > Testing the Basic Functions of K230 WDT:
> > 1. Reset Function
> > 2. Timeout Check
> > 3. Interrupt Function
> >
> > Signed-off-by: Mig Yang <temashking@foxmail.com>
> > Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
> > Acked-by: Fabiano Rosas <farosas@suse.de>
> > Signed-off-by: Chao Liu <chao.liu.zevorn@gmail.com>
> 
> This fails `make check` for me. I guess the `k230` machine wasn't built?
>
I've tested the case on my local machine and it's running fine.

However, since the patch set is already a month old, maybe need rebase
next branch.

And I found an issue in the first patch while looking through the Milk-V
Duo patches.

https://lore.kernel.org/qemu-devel/agZFchak-jsc2moK@ZEVORN-PC.localdomain/

I'll fix it and send out a V8 version shortly. You can test it again
once that's out.

Thanks,
Chao
> 541/542 qemu:qtest+qtest-aarch64 / qtest-aarch64/bios-tables-test
>                OK              91.02s   15 subtests passed
> ▶ 542/542 /riscv64/k230-wdt/register_read_write -
> ERROR:../tests/qtest/libqtest.c:558:qtest_connect: assertion failed:
> (s->fd >= 0 && s->qmp_fd >= 0) FAIL
> ▶ 542/542
>                ERROR
> 542/542 qemu:qtest+qtest-riscv64 / qtest-riscv64/k230-wdt-test
>                ERROR           51.60s   killed by signal 6 SIGABRT
> >>> PYTHON=/var/mnt/scratch/alistair/software/qemu/build/pyvenv/bin/python3 MSAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1 QTEST_QEMU_VNC_BINARY=./tools/qemu-vnc/qemu-vnc UBSAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1 MESON_TEST_ITERATION=1 QTEST_QEMU_IMG=./qemu-img RUST_BACKTRACE=1 G_TEST_DBUS_DAEMON=/var/mnt/scratch/alistair/software/qemu/tests/dbus-daemon.sh MALLOC_PERTURB_=94 QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon ASAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1 QTEST_QEMU_BINARY=./qemu-system-riscv64 /var/mnt/scratch/alistair/software/qemu/build/tests/qtest/k230-wdt-test --tap -k
> ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――
> ✀  ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――
> stderr:
> qemu-system-riscv64: unsupported machine type: "k230"
> Use -machine help to list supported machines
> socket_accept failed: Resource temporarily unavailable
> **
> ERROR:../tests/qtest/libqtest.c:558:qtest_connect: assertion failed:
> (s->fd >= 0 && s->qmp_fd >= 0)
> ../tests/qtest/libqtest.c:201: kill_qemu() tried to terminate QEMU
> process but encountered exit status 1 (expected 0)
> 
> (test program exited with status code -6)
> ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――
> 
> 
> Summary of Failures:
> 
> 542/542 qemu:qtest+qtest-riscv64 / qtest-riscv64/k230-wdt-test
>       ERROR           51.60s   killed by signal 6 SIGABRT
> 
> Ok:                 510
> Expected Fail:      0
> Fail:               1
> Unexpected Pass:    0
> Skipped:            31
> Timeout:            0
> 
> Alistair
> 
> > ---
> >  MAINTAINERS                 |   1 +
> >  tests/qtest/k230-wdt-test.c | 189 ++++++++++++++++++++++++++++++++++++
> >  tests/qtest/meson.build     |   3 +-
> >  3 files changed, 192 insertions(+), 1 deletion(-)
> >  create mode 100644 tests/qtest/k230-wdt-test.c
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index e5ec6367ca..e7e3ed0c5c 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -1788,6 +1788,7 @@ F: hw/riscv/k230.c
> >  F: hw/watchdog/k230_wdt.c
> >  F: include/hw/riscv/k230.h
> >  F: include/hw/watchdog/k230_wdt.h
> > +F: tests/qtest/k230-wdt-test.c
> >
> >  RX Machines
> >  -----------
> > diff --git a/tests/qtest/k230-wdt-test.c b/tests/qtest/k230-wdt-test.c
> > new file mode 100644
> > index 0000000000..c8eaeaf1ae
> > --- /dev/null
> > +++ b/tests/qtest/k230-wdt-test.c
> > @@ -0,0 +1,189 @@
> > +/*
> > + * QTest testcase for K230 Watchdog
> > + *
> > + * Copyright (c) 2025 Mig Yang <temashking@foxmail.com>
> > + *
> > + * SPDX-License-Identifier: GPL-2.0-or-later
> > + *
> > + * Provides a board compatible with the kendryte K230 SDK
> > + *
> > + * K230 Technical Reference Manual V0.3.1 (2024-11-18):
> > + * https://github.com/revyos/external-docs/blob/master/K230/en-us/K230_Technical_Reference_Manual_V0.3.1_20241118.pdf
> > + *
> > + * For more information, see <https://www.kendryte.com/en/proDetail/230>
> > + */
> > +
> > +#include "qemu/osdep.h"
> > +#include "qemu/timer.h"
> > +#include "qemu/bitops.h"
> > +#include "libqtest.h"
> > +#include "hw/watchdog/k230_wdt.h"
> > +
> > +/* K230 WDT0 base address */
> > +#define K230_WDT0_BASE 0x91106000
> > +#define K230_WDT1_BASE 0x91106800
> > +
> > +/* Test WDT0 by default */
> > +#define WDT_BASE K230_WDT0_BASE
> > +
> > +static void test_register_read_write(void)
> > +{
> > +    QTestState *qts = qtest_init("-machine k230");
> > +
> > +    /* Test Control Register (CR) read/write */
> > +    qtest_writel(qts, WDT_BASE + K230_WDT_CR, 0xFFFFFFFF);
> > +    g_assert_cmphex(qtest_readl(qts, WDT_BASE + K230_WDT_CR), ==,
> > +                    (K230_WDT_CR_RPL_MASK << K230_WDT_CR_RPL_SHIFT) |
> > +                    K230_WDT_CR_RMOD | K230_WDT_CR_WDT_EN);
> > +
> > +    /* Test Timeout Range Register (TORR) read/write */
> > +    qtest_writel(qts, WDT_BASE + K230_WDT_TORR, 0xFFFFFFFF);
> > +    g_assert_cmphex(qtest_readl(qts, WDT_BASE + K230_WDT_TORR), ==,
> > +                    K230_WDT_TORR_TOP_MASK);
> > +
> > +    /* Test Protection Level Register read/write */
> > +    qtest_writel(qts, WDT_BASE + K230_WDT_PROT_LEVEL, 0xFFFFFFFF);
> > +    g_assert_cmphex(qtest_readl(qts, WDT_BASE + K230_WDT_PROT_LEVEL), ==, 0x7);
> > +
> > +    qtest_quit(qts);
> > +}
> > +
> > +static void test_counter_restart(void)
> > +{
> > +    QTestState *qts = qtest_init("-machine k230");
> > +
> > +    /* Enable watchdog and set timeout */
> > +    qtest_writel(qts, WDT_BASE + K230_WDT_CR, K230_WDT_CR_WDT_EN);
> > +    qtest_writel(qts, WDT_BASE + K230_WDT_TORR, 0x5); /* TOP = 5 */
> > +
> > +    /* Read current counter value */
> > +    uint32_t initial_count = qtest_readl(qts, WDT_BASE + K230_WDT_CCVR);
> > +    g_assert_cmpuint(initial_count, >, 0);
> > +
> > +    /* Restart counter with magic value */
> > +    qtest_writel(qts, WDT_BASE + K230_WDT_CRR, K230_WDT_CRR_RESTART);
> > +
> > +    /* Wait for time */
> > +    qtest_clock_step(qts, NANOSECONDS_PER_SECOND * 2);
> > +
> > +    /* Counter should be reset to timeout value */
> > +    uint32_t new_count = qtest_readl(qts, WDT_BASE + K230_WDT_CCVR);
> > +    g_assert_cmpuint(new_count, >, 0);
> > +    g_assert_cmpuint(new_count, !=, initial_count);
> > +
> > +    qtest_quit(qts);
> > +}
> > +
> > +static void test_interrupt_mode(void)
> > +{
> > +    QTestState *qts = qtest_init("-machine k230 --trace k230_*,file=k230.log");
> > +
> > +    /* Set interrupt mode and enable watchdog */
> > +    qtest_writel(qts, WDT_BASE + K230_WDT_CR,
> > +                 K230_WDT_CR_RMOD | K230_WDT_CR_WDT_EN);
> > +    qtest_writel(qts, WDT_BASE + K230_WDT_TORR, 0x1); /* Short timeout */
> > +
> > +    /* Wait for timeout to trigger interrupt */
> > +    qtest_clock_step(qts, NANOSECONDS_PER_SECOND * 10);
> > +
> > +    /* Check interrupt status */
> > +    uint32_t stat = qtest_readl(qts, WDT_BASE + K230_WDT_STAT);
> > +    g_assert_cmphex(stat & K230_WDT_STAT_INT, ==, K230_WDT_STAT_INT);
> > +
> > +    /* Clear interrupt */
> > +    qtest_writel(qts, WDT_BASE + K230_WDT_EOI, 0x1);
> > +    stat = qtest_readl(qts, WDT_BASE + K230_WDT_STAT);
> > +    g_assert_cmphex(stat & K230_WDT_STAT_INT, ==, 0);
> > +
> > +    qtest_quit(qts);
> > +}
> > +
> > +static void test_reset_mode(void)
> > +{
> > +    QTestState *qts = qtest_init("-machine k230 -no-reboot");
> > +
> > +    /* Set reset mode and enable watchdog */
> > +    qtest_writel(qts, WDT_BASE + K230_WDT_CR, K230_WDT_CR_WDT_EN);
> > +    qtest_writel(qts, WDT_BASE + K230_WDT_TORR, 0x1); /* Short timeout */
> > +
> > +    /* Wait for timeout to trigger reset */
> > +    qtest_clock_step(qts, NANOSECONDS_PER_SECOND * 2);
> > +
> > +    /* In reset mode, the system should reset */
> > +    /* This test verifies that reset mode is properly configured */
> > +
> > +    qtest_quit(qts);
> > +}
> > +
> > +static void test_timeout_calculation(void)
> > +{
> > +    QTestState *qts = qtest_init("-machine k230");
> > +
> > +    /* Test different timeout values */
> > +    for (uint32_t top = 0; top <= 15; top++) {
> > +        qtest_writel(qts, WDT_BASE + K230_WDT_TORR, top);
> > +        qtest_writel(qts, WDT_BASE + K230_WDT_CR, K230_WDT_CR_WDT_EN);
> > +
> > +        /* Read current counter value */
> > +        uint32_t count = qtest_readl(qts, WDT_BASE + K230_WDT_CCVR);
> > +        g_assert_cmpuint(count, >, 0);
> > +
> > +        /* Disable watchdog for next iteration */
> > +        qtest_writel(qts, WDT_BASE + K230_WDT_CR, 0);
> > +    }
> > +
> > +    qtest_quit(qts);
> > +}
> > +
> > +static void test_wdt1_registers(void)
> > +{
> > +    QTestState *qts = qtest_init("-machine k230");
> > +
> > +    /* Test WDT1 registers (second watchdog) */
> > +    qtest_writel(qts, K230_WDT1_BASE + K230_WDT_CR, 0xFFFFFFFF);
> > +    g_assert_cmphex(qtest_readl(qts, K230_WDT1_BASE + K230_WDT_CR), ==,
> > +                    (K230_WDT_CR_RPL_MASK << K230_WDT_CR_RPL_SHIFT) |
> > +                    K230_WDT_CR_RMOD | K230_WDT_CR_WDT_EN);
> > +
> > +    qtest_writel(qts, K230_WDT1_BASE + K230_WDT_TORR, 0xFFFFFFFF);
> > +    g_assert_cmphex(qtest_readl(qts, K230_WDT1_BASE + K230_WDT_TORR), ==,
> > +                    K230_WDT_TORR_TOP_MASK);
> > +
> > +    qtest_quit(qts);
> > +}
> > +
> > +static void test_enable_disable(void)
> > +{
> > +    QTestState *qts = qtest_init("-machine k230");
> > +
> > +    /* Initially disabled */
> > +    uint32_t cr = qtest_readl(qts, WDT_BASE + K230_WDT_CR);
> > +    g_assert_cmphex(cr & K230_WDT_CR_WDT_EN, ==, 0);
> > +
> > +    /* Enable watchdog */
> > +    qtest_writel(qts, WDT_BASE + K230_WDT_CR, K230_WDT_CR_WDT_EN);
> > +    cr = qtest_readl(qts, WDT_BASE + K230_WDT_CR);
> > +    g_assert_cmphex(cr & K230_WDT_CR_WDT_EN, ==, K230_WDT_CR_WDT_EN);
> > +
> > +    /* Disable watchdog */
> > +    qtest_writel(qts, WDT_BASE + K230_WDT_CR, 0);
> > +    cr = qtest_readl(qts, WDT_BASE + K230_WDT_CR);
> > +    g_assert_cmphex(cr & K230_WDT_CR_WDT_EN, ==, 0);
> > +
> > +    qtest_quit(qts);
> > +}
> > +
> > +int main(int argc, char *argv[])
> > +{
> > +    g_test_init(&argc, &argv, NULL);
> > +
> > +    qtest_add_func("/k230-wdt/register_read_write", test_register_read_write);
> > +    qtest_add_func("/k230-wdt/counter_restart", test_counter_restart);
> > +    qtest_add_func("/k230-wdt/interrupt_mode", test_interrupt_mode);
> > +    qtest_add_func("/k230-wdt/reset_mode", test_reset_mode);
> > +    qtest_add_func("/k230-wdt/timeout_calculation", test_timeout_calculation);
> > +    qtest_add_func("/k230-wdt/wdt1_registers", test_wdt1_registers);
> > +    qtest_add_func("/k230-wdt/enable_disable", test_enable_disable);
> > +
> > +    return g_test_run();
> > +}
> > diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> > index 43f83ffd3a..45c4898454 100644
> > --- a/tests/qtest/meson.build
> > +++ b/tests/qtest/meson.build
> > @@ -290,7 +290,8 @@ qtests_riscv64 = ['riscv-csr-test'] + \
> >    (unpack_edk2_blobs ? ['bios-tables-test'] : []) + \
> >    (config_all_devices.has_key('CONFIG_IOMMU_TESTDEV') and
> >     config_all_devices.has_key('CONFIG_RISCV_IOMMU') ?
> > -   ['iommu-riscv-test'] : [])
> > +   ['iommu-riscv-test'] : []) + \
> > +  (config_all_devices.has_key('CONFIG_K230') ? ['k230-wdt-test'] : [])
> >
> >  qos_test_ss = ss.source_set()
> >  qos_test_ss.add(
> >