All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
To: u-boot@lists.denx.de
Cc: Stefan Roese <sr@denx.de>, Tom Rini <trini@konsulko.com>,
	Simon Glass <sjg@chromium.org>,
	Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Subject: [PATCH v2 10/10] sandbox: add test of wdt-uclass' watchdog_reset()
Date: Fri, 28 May 2021 00:00:17 +0200	[thread overview]
Message-ID: <20210527220017.1266765-11-rasmus.villemoes@prevas.dk> (raw)
In-Reply-To: <20210527220017.1266765-1-rasmus.villemoes@prevas.dk>

Check that the watchdog_reset() implementation in wdt-uclass behaves
as expected:

- resets all activated watchdog devices
- leaves unactivated/stopped devices alone
- that the rate-limiting works, with a per-device threshold

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
---
 arch/sandbox/dts/test.dts |  2 ++
 test/dm/wdt.c             | 54 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index cee5b14ecb..1853b5f29a 100644
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -758,6 +758,7 @@
 	gpio-wdt {
 		gpios = <&gpio_a 7 0>;
 		compatible = "linux,wdt-gpio";
+		hw_margin_ms = <100>;
 		always-running;
 	};
 
@@ -1239,6 +1240,7 @@
 
 	wdt0: wdt@0 {
 		compatible = "sandbox,wdt";
+		hw_margin_ms = <200>;
 	};
 
 	axi: axi@0 {
diff --git a/test/dm/wdt.c b/test/dm/wdt.c
index abff853a02..8997aaebc8 100644
--- a/test/dm/wdt.c
+++ b/test/dm/wdt.c
@@ -12,6 +12,8 @@
 #include <dm/test.h>
 #include <test/test.h>
 #include <test/ut.h>
+#include <linux/delay.h>
+#include <watchdog.h>
 
 /* Test that watchdog driver functions are called */
 static int dm_test_wdt_base(struct unit_test_state *uts)
@@ -73,3 +75,55 @@ static int dm_test_wdt_gpio(struct unit_test_state *uts)
 	return 0;
 }
 DM_TEST(dm_test_wdt_gpio, UT_TESTF_SCAN_FDT);
+
+static int dm_test_wdt_watchdog_reset(struct unit_test_state *uts)
+{
+	struct sandbox_state *state = state_get_current();
+	struct udevice *gpio_wdt, *sandbox_wdt;
+	struct udevice *gpio;
+	const u64 timeout = 42;
+	const int offset = 7;
+	uint reset_count;
+	int val;
+
+	ut_assertok(uclass_get_device_by_driver(UCLASS_WDT,
+						DM_DRIVER_GET(wdt_gpio), &gpio_wdt));
+	ut_assertnonnull(gpio_wdt);
+	ut_assertok(uclass_get_device_by_driver(UCLASS_WDT,
+						DM_DRIVER_GET(wdt_sandbox), &sandbox_wdt));
+	ut_assertnonnull(sandbox_wdt);
+	ut_assertok(uclass_get_device_by_name(UCLASS_GPIO, "base-gpios", &gpio));
+	ut_assertnonnull(gpio);
+
+	/* Neither device should be "started", so watchdog_reset() should be a no-op. */
+	reset_count = state->wdt.reset_count;
+	val = sandbox_gpio_get_value(gpio, offset);
+	watchdog_reset();
+	ut_asserteq(reset_count, state->wdt.reset_count);
+	ut_asserteq(val, sandbox_gpio_get_value(gpio, offset));
+
+	/* Start both devices. */
+	ut_assertok(wdt_start(gpio_wdt, timeout, 0));
+	ut_assertok(wdt_start(sandbox_wdt, timeout, 0));
+
+	/* Make sure both devices have just been pinged. */
+	mdelay(100);
+	watchdog_reset();
+	reset_count = state->wdt.reset_count;
+	val = sandbox_gpio_get_value(gpio, offset);
+
+	/* The gpio watchdog should be pinged, the sandbox one not. */
+	mdelay(30);
+	watchdog_reset();
+	ut_asserteq(reset_count, state->wdt.reset_count);
+	ut_asserteq(!val, sandbox_gpio_get_value(gpio, offset));
+
+	/* After another ~30ms, both devices should get pinged. */
+	mdelay(30);
+	watchdog_reset();
+	ut_asserteq(reset_count + 1, state->wdt.reset_count);
+	ut_asserteq(val, sandbox_gpio_get_value(gpio, offset));
+
+	return 0;
+}
+DM_TEST(dm_test_wdt_watchdog_reset, UT_TESTF_SCAN_FDT);
-- 
2.31.1


  parent reply	other threads:[~2021-05-27 22:02 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-27 22:00 [PATCH v2 00/10] handling all DM watchdogs in watchdog_reset() Rasmus Villemoes
2021-05-27 22:00 ` [PATCH v2 01/10] watchdog: wdt-uclass.c: use wdt_start() in wdt_expire_now() Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-29  5:54   ` Stefan Roese
2021-05-27 22:00 ` [PATCH v2 02/10] watchdog: wdt-uclass.c: introduce struct wdt_priv Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-29  5:56   ` Stefan Roese
2021-05-27 22:00 ` [PATCH v2 03/10] watchdog: wdt-uclass.c: neaten UCLASS_DRIVER definition Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-29  5:57   ` Stefan Roese
2021-05-27 22:00 ` [PATCH v2 04/10] watchdog: wdt-uclass.c: refactor initr_watchdog() Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-29  5:59   ` Stefan Roese
2021-05-27 22:00 ` [PATCH v2 05/10] watchdog: wdt-uclass.c: keep track of each device's running state Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-29  6:04   ` Stefan Roese
2021-05-27 22:00 ` [PATCH v2 06/10] sandbox: disable CONFIG_WATCHDOG_AUTOSTART Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-29  6:05   ` Stefan Roese
2021-05-27 22:00 ` [PATCH v2 07/10] watchdog: wdt-uclass.c: handle all DM watchdogs in watchdog_reset() Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-22 20:28     ` Rasmus Villemoes
2021-06-23  5:53       ` Stefan Roese
2021-06-26 18:32       ` Simon Glass
2021-06-28  7:44         ` Rasmus Villemoes
2021-06-29  6:11           ` Stefan Roese
2021-07-05 15:29           ` Simon Glass
2021-05-27 22:00 ` [PATCH v2 08/10] watchdog: add gpio watchdog driver Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-29  6:07   ` Stefan Roese
2021-05-27 22:00 ` [PATCH v2 09/10] sandbox: add test of wdt_gpio driver Rasmus Villemoes
2021-06-22 13:31   ` Simon Glass
2021-06-29  6:08   ` Stefan Roese
2021-05-27 22:00 ` Rasmus Villemoes [this message]
2021-06-22 13:31   ` [PATCH v2 10/10] sandbox: add test of wdt-uclass' watchdog_reset() Simon Glass
2021-06-22 20:29     ` Rasmus Villemoes
2021-06-26 18:32       ` Simon Glass
2021-06-29  6:08   ` Stefan Roese
2021-06-08 22:41 ` [PATCH v2 00/10] handling all DM watchdogs in watchdog_reset() Rasmus Villemoes
2021-06-10  5:28   ` Stefan Roese

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=20210527220017.1266765-11-rasmus.villemoes@prevas.dk \
    --to=rasmus.villemoes@prevas.dk \
    --cc=sjg@chromium.org \
    --cc=sr@denx.de \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.