From nobody Wed May 7 01:17:49 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1611919063; cv=none;
d=zohomail.com; s=zohoarc;
b=LCfmINaGQ7+5mNhgxw7sf/vqHq+YSjQvNaVirOwV1RrXRo76JH/PHOUI12y4C9CqRdwpCrepuFWkXLZxcNOsoieCQp8y4Xs0zlVGtsMxDO9YqfxxTlCAfq61JH0dMV2jIMvwO5jnro67dH3+G2KWLj/7vfJgjC1Q+BEP1984slk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1611919063;
h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=nplRZ0mA6SSMDFMU5PGJhWszXu30YiUjDAjM91AQhkA=;
b=AgY9oRY23UGy3+HkREf/1YGwLDjJE9ODhcZZMlpt00KH+Qi8Om0c+QsYiB3M5rNE6d5JnHXag/UvLiTJVi1BRDTW5NMBnlpaIx0g/+Jzypc0/JogJ1gnhv9mAYJRU9abcszBQAw+q49cpUQkXJcVrbAJXrXxRgOEW2/S1vLhrNE=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
header.from=<peter.maydell@linaro.org>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1611919063103220.35579170037113;
Fri, 29 Jan 2021 03:17:43 -0800 (PST)
Received: from localhost ([::1]:59494 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1l5RmY-0002aa-0h
for importer@patchew.org; Fri, 29 Jan 2021 06:17:42 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:59924)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1l5RWF-0004qn-Pn
for qemu-devel@nongnu.org; Fri, 29 Jan 2021 06:00:51 -0500
Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:52192)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1l5RW3-00073V-2z
for qemu-devel@nongnu.org; Fri, 29 Jan 2021 06:00:51 -0500
Received: by mail-wm1-x32c.google.com with SMTP id m2so6510838wmm.1
for <qemu-devel@nongnu.org>; Fri, 29 Jan 2021 03:00:38 -0800 (PST)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148])
by smtp.gmail.com with ESMTPSA id w20sm9268761wmm.12.2021.01.29.03.00.36
for <qemu-devel@nongnu.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 29 Jan 2021 03:00:37 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
h=from:to:subject:date:message-id:in-reply-to:references:mime-version
:content-transfer-encoding;
bh=nplRZ0mA6SSMDFMU5PGJhWszXu30YiUjDAjM91AQhkA=;
b=swBOAMvKaFzZos3fbUiUs/muhiKGRDc0CATH0v00uROW8po+LbhPQy139YsBrzoyoe
0RPGQVcCCbne8qsQxdk41tb2YfkFQ5dAtrN5Sz6D9lZ6aFsgcSN72CByJm0S52LpmB/s
5GIoxiHuW4EJGzqOBrMI6jIGjsunek5HEqfUvTxCedEmPmGvmjTPN/Qks7oyl5LFDGl3
ZUU/TXpE8LC0E8Q77BDqV0qGPHwEHoFd/yk67Z5aCO5LLvmLr8oUd5VzA22Xy/kfcNEa
bNDFCrkHZCnGsv6jW7w+IOzcD6edlzDjUKwKTNbX4mi+OcNUPuYhSg+puDBOokFcHq30
7PMA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=nplRZ0mA6SSMDFMU5PGJhWszXu30YiUjDAjM91AQhkA=;
b=fskpE0mCHtLRHH1Tt8J3xCpS+CMlG9z2P8jSdfSziR+LngNFXCzeIw6ieAY2oQJdgD
+R93zVmEqZrrmp286MrbitsMR062pHQ376jRW5yf3Yh3WroL2C3I7uvtBJQWSCfl2r9Y
R21RmTZoIDrSsRj2x3UHpTCVkxYWn9+/2Hqbg/rOlR0ovMmf3H0GCztAo6ZAHXRPSwzp
BmfBdEuT5mzTDoUvIBTC1AxjV+OpMofxOwSzlHLYt8Odqa9nkKxEww3by5MqIcT6E9vJ
XhJin30bUK33gUUV789y7IToFKz6cd+2+vxpwQgu2Av+XWaBmyvo5Ng9PYDtp6t0hHlu
RGEg==
X-Gm-Message-State: AOAM532hzH2RIMTkdJdspBTfi/wCbIRz5JRmTmFPZIrMSIlYoyyle4Od
oHudeAE8BzwwKBVay3mSqW/lVeFdRZonbQ==
X-Google-Smtp-Source:
ABdhPJzAzJPdBH0u9X7awdGmU+cO35G7YPG7JdGAB9tuDvlJwomBf/SIx4dTIgjN0baqokej27ZT2A==
X-Received: by 2002:a1c:7402:: with SMTP id p2mr3203865wmc.43.1611918037753;
Fri, 29 Jan 2021 03:00:37 -0800 (PST)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 25/46] tests: Add a simple test of the CMSDK APB watchdog
Date: Fri, 29 Jan 2021 10:59:51 +0000
Message-Id: <20210129110012.8660-26-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20210129110012.8660-1-peter.maydell@linaro.org>
References: <20210129110012.8660-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::32c;
envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @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>
Tested-by: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
Message-id: 20210128114145.20536-5-peter.maydell@linaro.org
Message-id: 20210121190622.22000-5-peter.maydell@linaro.org
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
---
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 WIT=
HOUT
+ * 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 =3D=3D 1=
2.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), =3D=3D, 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), =3D=3D, 0);
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGVALUE), =3D=3D, 500);
+
+ /* Just past the 1000th tick: timer should have fired */
+ clock_step(500 * 80);
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGRIS), =3D=3D, 1);
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGVALUE), =3D=3D, 0);
+
+ /* VALUE reloads at following tick */
+ clock_step(80);
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGVALUE), =3D=3D, 1000);
+
+ /* Writing any value to WDOGINTCLR clears the interrupt and reloads */
+ clock_step(500 * 80);
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGVALUE), =3D=3D, 500);
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGRIS), =3D=3D, 1);
+ writel(WDOG_BASE + WDOGINTCLR, 0);
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGVALUE), =3D=3D, 1000);
+ g_assert_cmpuint(readl(WDOG_BASE + WDOGRIS), =3D=3D, 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 =3D 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 519a40d5b82..5b10bfbcfb0 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -143,6 +143,7 @@ qtests_npcm7xx =3D \
'npcm7xx_watchdog_timer-test']
qtests_arm =3D \
(config_all_devices.has_key('CONFIG_CMSDK_APB_TIMER') ? ['cmsdk-apb-time=
r-test'] : []) + \
+ (config_all_devices.has_key('CONFIG_CMSDK_APB_WATCHDOG') ? ['cmsdk-apb-w=
atchdog-test'] : []) + \
(config_all_devices.has_key('CONFIG_PFLASH_CFI02') ? ['pflash-cfi02-test=
'] : []) + \
(config_all_devices.has_key('CONFIG_NPCM7XX') ? qtests_npcm7xx : []) + \
['arm-cpu-features',
--=20
2.20.1