From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org, qemu-devel@nongnu.org
Cc: "Luc Michel" <luc@lmichel.fr>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PATCH v2 04/25] tests: Add a simple test of the CMSDK APB watchdog
Date: Thu, 28 Jan 2021 11:41:24 +0000 [thread overview]
Message-ID: <20210128114145.20536-5-peter.maydell@linaro.org> (raw)
In-Reply-To: <20210128114145.20536-1-peter.maydell@linaro.org>
Add a simple test of the CMSDK watchdog, since we're about to do some
refactoring of how it is clocked.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Luc Michel <luc@lmichel.fr>
Message-id: 20210121190622.22000-5-peter.maydell@linaro.org
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
v1->v2 changes:
- remove set-but-not-used QTestState *s variable
---
tests/qtest/cmsdk-apb-watchdog-test.c | 79 +++++++++++++++++++++++++++
MAINTAINERS | 1 +
tests/qtest/meson.build | 1 +
3 files changed, 81 insertions(+)
create mode 100644 tests/qtest/cmsdk-apb-watchdog-test.c
diff --git a/tests/qtest/cmsdk-apb-watchdog-test.c b/tests/qtest/cmsdk-apb-watchdog-test.c
new file mode 100644
index 00000000000..950f64c527b
--- /dev/null
+++ b/tests/qtest/cmsdk-apb-watchdog-test.c
@@ -0,0 +1,79 @@
+/*
+ * QTest testcase for the CMSDK APB watchdog device
+ *
+ * Copyright (c) 2021 Linaro Limited
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "qemu/osdep.h"
+#include "libqtest-single.h"
+
+/*
+ * lm3s811evb watchdog; at board startup this runs at 200MHz / 16 == 12.5MHz,
+ * which is 80ns per tick.
+ */
+#define WDOG_BASE 0x40000000
+
+#define WDOGLOAD 0
+#define WDOGVALUE 4
+#define WDOGCONTROL 8
+#define WDOGINTCLR 0xc
+#define WDOGRIS 0x10
+#define WDOGMIS 0x14
+#define WDOGLOCK 0xc00
+
+static void test_watchdog(void)
+{
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGRIS), ==, 0);
+
+ writel(WDOG_BASE + WDOGCONTROL, 1);
+ writel(WDOG_BASE + WDOGLOAD, 1000);
+
+ /* Step to just past the 500th tick */
+ clock_step(500 * 80 + 1);
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGRIS), ==, 0);
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGVALUE), ==, 500);
+
+ /* Just past the 1000th tick: timer should have fired */
+ clock_step(500 * 80);
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGRIS), ==, 1);
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGVALUE), ==, 0);
+
+ /* VALUE reloads at following tick */
+ clock_step(80);
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGVALUE), ==, 1000);
+
+ /* Writing any value to WDOGINTCLR clears the interrupt and reloads */
+ clock_step(500 * 80);
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGVALUE), ==, 500);
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGRIS), ==, 1);
+ writel(WDOG_BASE + WDOGINTCLR, 0);
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGVALUE), ==, 1000);
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGRIS), ==, 0);
+}
+
+int main(int argc, char **argv)
+{
+ int r;
+
+ g_test_init(&argc, &argv, NULL);
+
+ qtest_start("-machine lm3s811evb");
+
+ qtest_add_func("/cmsdk-apb-watchdog/watchdog", test_watchdog);
+
+ r = g_test_run();
+
+ qtest_end();
+
+ return r;
+}
diff --git a/MAINTAINERS b/MAINTAINERS
index 6c15f7db317..3729b89f359 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -588,6 +588,7 @@ F: hw/char/cmsdk-apb-uart.c
F: include/hw/char/cmsdk-apb-uart.h
F: hw/watchdog/cmsdk-apb-watchdog.c
F: include/hw/watchdog/cmsdk-apb-watchdog.h
+F: tests/qtest/cmsdk-apb-watchdog-test.c
F: hw/misc/tz-ppc.c
F: include/hw/misc/tz-ppc.h
F: hw/misc/tz-mpc.c
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 74addd74868..9e2ebc47041 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -142,6 +142,7 @@ qtests_npcm7xx = \
'npcm7xx_watchdog_timer-test']
qtests_arm = \
(config_all_devices.has_key('CONFIG_CMSDK_APB_TIMER') ? ['cmsdk-apb-timer-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_CMSDK_APB_WATCHDOG') ? ['cmsdk-apb-watchdog-test'] : []) + \
(config_all_devices.has_key('CONFIG_PFLASH_CFI02') ? ['pflash-cfi02-test'] : []) + \
(config_all_devices.has_key('CONFIG_NPCM7XX') ? qtests_npcm7xx : []) + \
['arm-cpu-features',
--
2.20.1
next prev parent reply other threads:[~2021-01-28 11:51 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-28 11:41 [PATCH v2 00/25] Convert CMSDK timer, watchdog, dualtimer to Clock framework Peter Maydell
2021-01-28 11:41 ` [PATCH v2 01/25] ptimer: Add new ptimer_set_period_from_clock() function Peter Maydell
2021-01-28 14:38 ` Philippe Mathieu-Daudé
2021-01-28 11:41 ` [PATCH v2 02/25] clock: Add new clock_has_source() function Peter Maydell
2021-01-28 11:41 ` [PATCH v2 03/25] tests: Add a simple test of the CMSDK APB timer Peter Maydell
2021-01-28 11:41 ` Peter Maydell [this message]
2021-01-28 11:41 ` [PATCH v2 05/25] tests: Add a simple test of the CMSDK APB dual timer Peter Maydell
2021-01-28 13:38 ` Philippe Mathieu-Daudé
2021-01-28 18:57 ` Luc Michel
2021-01-28 11:41 ` [PATCH v2 06/25] hw/timer/cmsdk-apb-timer: Rename CMSDKAPBTIMER struct to CMSDKAPBTimer Peter Maydell
2021-01-28 11:41 ` [PATCH v2 07/25] hw/timer/cmsdk-apb-timer: Add Clock input Peter Maydell
2021-01-28 11:41 ` [PATCH v2 08/25] hw/timer/cmsdk-apb-dualtimer: " Peter Maydell
2021-01-28 11:41 ` [PATCH v2 09/25] hw/watchdog/cmsdk-apb-watchdog: " Peter Maydell
2021-01-28 11:41 ` [PATCH v2 10/25] hw/arm/armsse: Rename "MAINCLK" property to "MAINCLK_FRQ" Peter Maydell
2021-01-28 11:41 ` [PATCH v2 11/25] hw/arm/armsse: Wire up clocks Peter Maydell
2021-01-28 11:41 ` [PATCH v2 12/25] hw/arm/mps2: Inline CMSDK_APB_TIMER creation Peter Maydell
2021-01-28 11:41 ` [PATCH v2 13/25] hw/arm/mps2: Create and connect SYSCLK Clock Peter Maydell
2021-01-28 11:41 ` [PATCH v2 14/25] hw/arm/mps2-tz: Create and connect ARMSSE Clocks Peter Maydell
2021-01-28 11:41 ` [PATCH v2 15/25] hw/arm/musca: " Peter Maydell
2021-01-28 11:41 ` [PATCH v2 16/25] hw/arm/stellaris: Convert SSYS to QOM device Peter Maydell
2021-01-28 11:41 ` [PATCH v2 17/25] hw/arm/stellaris: Create Clock input for watchdog Peter Maydell
2021-01-28 11:41 ` [PATCH v2 18/25] hw/timer/cmsdk-apb-timer: Convert to use Clock input Peter Maydell
2021-01-28 11:41 ` [PATCH v2 19/25] hw/timer/cmsdk-apb-dualtimer: " Peter Maydell
2021-01-28 11:41 ` [PATCH v2 20/25] hw/watchdog/cmsdk-apb-watchdog: " Peter Maydell
2021-01-28 11:41 ` [PATCH v2 21/25] tests/qtest/cmsdk-apb-watchdog-test: Test clock changes Peter Maydell
2021-01-28 11:41 ` [PATCH v2 22/25] hw/arm/armsse: Use Clock to set system_clock_scale Peter Maydell
2021-01-28 18:57 ` Luc Michel
2021-01-28 11:41 ` [PATCH v2 23/25] arm: Don't set freq properties on CMSDK timer, dualtimer, watchdog, ARMSSE Peter Maydell
2021-01-28 11:41 ` [PATCH v2 24/25] arm: Remove frq " Peter Maydell
2021-01-28 11:41 ` [PATCH v2 25/25] hw/arm/stellaris: Remove board-creation reset of STELLARIS_SYS Peter Maydell
2021-01-28 13:39 ` [PATCH v2 00/25] Convert CMSDK timer, watchdog, dualtimer to Clock framework Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210128114145.20536-5-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=f4bug@amsat.org \
--cc=luc@lmichel.fr \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).