| Message ID | 20210121190622.22000-4-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Convert CMSDK timer, watchdog, dualtimer to Clock framework | expand |
On 1/21/21 8:06 PM, Peter Maydell wrote: > Add a simple test of the CMSDK APB timer, since we're about to do > some refactoring of how it is clocked. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > tests/qtest/cmsdk-apb-timer-test.c | 76 ++++++++++++++++++++++++++++++ > MAINTAINERS | 1 + > tests/qtest/meson.build | 1 + > 3 files changed, 78 insertions(+) > create mode 100644 tests/qtest/cmsdk-apb-timer-test.c Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
On 19:06 Thu 21 Jan , Peter Maydell wrote: > Add a simple test of the CMSDK APB timer, 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> > --- > tests/qtest/cmsdk-apb-timer-test.c | 76 ++++++++++++++++++++++++++++++ > MAINTAINERS | 1 + > tests/qtest/meson.build | 1 + > 3 files changed, 78 insertions(+) > create mode 100644 tests/qtest/cmsdk-apb-timer-test.c > > diff --git a/tests/qtest/cmsdk-apb-timer-test.c b/tests/qtest/cmsdk-apb-timer-test.c > new file mode 100644 > index 00000000000..085005cce99 > --- /dev/null > +++ b/tests/qtest/cmsdk-apb-timer-test.c > @@ -0,0 +1,76 @@ > +/* > + * QTest testcase for the CMSDK APB timer 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" > + > +/* IoTKit/ARMSSE-200 timer0; driven at 25MHz in mps2-an385, so 40ns per tick */ > +#define TIMER_BASE 0x40000000 > + > +#define CTRL 0 > +#define VALUE 4 > +#define RELOAD 8 > +#define INTSTATUS 0xc > + > +static void test_timer(void) > +{ > + g_assert_true(readl(TIMER_BASE + INTSTATUS) == 0); > + > + /* Start timer: will fire after 40000 ns */ > + writel(TIMER_BASE + RELOAD, 1000); > + writel(TIMER_BASE + CTRL, 9); > + > + /* Step to just past the 500th tick and check VALUE */ > + clock_step(20001); > + g_assert_cmpuint(readl(TIMER_BASE + INTSTATUS), ==, 0); > + g_assert_cmpuint(readl(TIMER_BASE + VALUE), ==, 500); > + > + /* Just past the 1000th tick: timer should have fired */ > + clock_step(20000); > + g_assert_cmpuint(readl(TIMER_BASE + INTSTATUS), ==, 1); > + g_assert_cmpuint(readl(TIMER_BASE + VALUE), ==, 0); > + > + /* VALUE reloads at the following tick */ > + clock_step(40); > + g_assert_cmpuint(readl(TIMER_BASE + VALUE), ==, 1000); > + > + /* Check write-1-to-clear behaviour of INTSTATUS */ > + writel(TIMER_BASE + INTSTATUS, 0); > + g_assert_cmpuint(readl(TIMER_BASE + INTSTATUS), ==, 1); > + writel(TIMER_BASE + INTSTATUS, 1); > + g_assert_cmpuint(readl(TIMER_BASE + INTSTATUS), ==, 0); > + > + /* Turn off the timer */ > + writel(TIMER_BASE + CTRL, 0); > +} > + > +int main(int argc, char **argv) > +{ > + QTestState *s; > + int r; > + > + g_test_init(&argc, &argv, NULL); > + > + s = qtest_start("-machine mps2-an385"); > + > + qtest_add_func("/cmsdk-apb-timer/timer", test_timer); > + > + r = g_test_run(); > + > + qtest_end(); > + > + return r; > +} > diff --git a/MAINTAINERS b/MAINTAINERS > index 3216387521d..010405b0884 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -581,6 +581,7 @@ F: include/hw/rtc/pl031.h > F: include/hw/arm/primecell.h > F: hw/timer/cmsdk-apb-timer.c > F: include/hw/timer/cmsdk-apb-timer.h > +F: tests/qtest/cmsdk-apb-timer-test.c > F: hw/timer/cmsdk-apb-dualtimer.c > F: include/hw/timer/cmsdk-apb-dualtimer.h > F: hw/char/cmsdk-apb-uart.c > diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build > index 16d04625b8b..74addd74868 100644 > --- a/tests/qtest/meson.build > +++ b/tests/qtest/meson.build > @@ -141,6 +141,7 @@ qtests_npcm7xx = \ > 'npcm7xx_timer-test', > '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_PFLASH_CFI02') ? ['pflash-cfi02-test'] : []) + \ > (config_all_devices.has_key('CONFIG_NPCM7XX') ? qtests_npcm7xx : []) + \ > ['arm-cpu-features', > -- > 2.20.1 > --
diff --git a/tests/qtest/cmsdk-apb-timer-test.c b/tests/qtest/cmsdk-apb-timer-test.c new file mode 100644 index 00000000000..085005cce99 --- /dev/null +++ b/tests/qtest/cmsdk-apb-timer-test.c @@ -0,0 +1,76 @@ +/* + * QTest testcase for the CMSDK APB timer 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" + +/* IoTKit/ARMSSE-200 timer0; driven at 25MHz in mps2-an385, so 40ns per tick */ +#define TIMER_BASE 0x40000000 + +#define CTRL 0 +#define VALUE 4 +#define RELOAD 8 +#define INTSTATUS 0xc + +static void test_timer(void) +{ + g_assert_true(readl(TIMER_BASE + INTSTATUS) == 0); + + /* Start timer: will fire after 40000 ns */ + writel(TIMER_BASE + RELOAD, 1000); + writel(TIMER_BASE + CTRL, 9); + + /* Step to just past the 500th tick and check VALUE */ + clock_step(20001); + g_assert_cmpuint(readl(TIMER_BASE + INTSTATUS), ==, 0); + g_assert_cmpuint(readl(TIMER_BASE + VALUE), ==, 500); + + /* Just past the 1000th tick: timer should have fired */ + clock_step(20000); + g_assert_cmpuint(readl(TIMER_BASE + INTSTATUS), ==, 1); + g_assert_cmpuint(readl(TIMER_BASE + VALUE), ==, 0); + + /* VALUE reloads at the following tick */ + clock_step(40); + g_assert_cmpuint(readl(TIMER_BASE + VALUE), ==, 1000); + + /* Check write-1-to-clear behaviour of INTSTATUS */ + writel(TIMER_BASE + INTSTATUS, 0); + g_assert_cmpuint(readl(TIMER_BASE + INTSTATUS), ==, 1); + writel(TIMER_BASE + INTSTATUS, 1); + g_assert_cmpuint(readl(TIMER_BASE + INTSTATUS), ==, 0); + + /* Turn off the timer */ + writel(TIMER_BASE + CTRL, 0); +} + +int main(int argc, char **argv) +{ + QTestState *s; + int r; + + g_test_init(&argc, &argv, NULL); + + s = qtest_start("-machine mps2-an385"); + + qtest_add_func("/cmsdk-apb-timer/timer", test_timer); + + r = g_test_run(); + + qtest_end(); + + return r; +} diff --git a/MAINTAINERS b/MAINTAINERS index 3216387521d..010405b0884 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -581,6 +581,7 @@ F: include/hw/rtc/pl031.h F: include/hw/arm/primecell.h F: hw/timer/cmsdk-apb-timer.c F: include/hw/timer/cmsdk-apb-timer.h +F: tests/qtest/cmsdk-apb-timer-test.c F: hw/timer/cmsdk-apb-dualtimer.c F: include/hw/timer/cmsdk-apb-dualtimer.h F: hw/char/cmsdk-apb-uart.c diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 16d04625b8b..74addd74868 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -141,6 +141,7 @@ qtests_npcm7xx = \ 'npcm7xx_timer-test', '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_PFLASH_CFI02') ? ['pflash-cfi02-test'] : []) + \ (config_all_devices.has_key('CONFIG_NPCM7XX') ? qtests_npcm7xx : []) + \ ['arm-cpu-features',
Add a simple test of the CMSDK APB timer, since we're about to do some refactoring of how it is clocked. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- tests/qtest/cmsdk-apb-timer-test.c | 76 ++++++++++++++++++++++++++++++ MAINTAINERS | 1 + tests/qtest/meson.build | 1 + 3 files changed, 78 insertions(+) create mode 100644 tests/qtest/cmsdk-apb-timer-test.c -- 2.20.1