From: "Cédric Le Goater" <clg@kaod.org>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: "Andrew Jeffery" <andrew@aj.id.au>,
"Cédric Le Goater" <clg@kaod.org>,
qemu-arm@nongnu.org, "Joel Stanley" <joel@jms.id.au>,
qemu-devel@nongnu.org
Subject: [PATCH 03/10] watchdog: aspeed: Fix sequential control writes
Date: Mon, 9 Aug 2021 15:15:49 +0200 [thread overview]
Message-ID: <20210809131556.686260-4-clg@kaod.org> (raw)
In-Reply-To: <20210809131556.686260-1-clg@kaod.org>
From: Andrew Jeffery <andrew@aj.id.au>
The logic in the handling for the control register required toggling the
enable state for writes to stick. Rework the condition chain to allow
sequential writes that do not update the enable state.
Fixes: 854123bf8d4b ("wdt: Add Aspeed watchdog device model")
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20210709053107.1829304-3-andrew@aj.id.au>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/watchdog/wdt_aspeed.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c
index faa3d35fdf21..69c37af9a6e9 100644
--- a/hw/watchdog/wdt_aspeed.c
+++ b/hw/watchdog/wdt_aspeed.c
@@ -166,6 +166,8 @@ static void aspeed_wdt_write(void *opaque, hwaddr offset, uint64_t data,
} else if (!enable && aspeed_wdt_is_enabled(s)) {
s->regs[WDT_CTRL] = data;
timer_del(s->timer);
+ } else {
+ s->regs[WDT_CTRL] = data;
}
break;
case WDT_RESET_WIDTH:
--
2.31.1
next prev parent reply other threads:[~2021-08-09 13:23 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-09 13:15 [PATCH 00/10] Aspeed: 6.2 queue Cédric Le Goater
2021-08-09 13:15 ` [PATCH 01/10] hw: arm: aspeed: Enable eth0 interface for aspeed-ast2600-evb Cédric Le Goater
2021-08-09 13:15 ` [PATCH 02/10] watchdog: aspeed: Sanitize control register values Cédric Le Goater
2021-08-09 13:15 ` Cédric Le Goater [this message]
2021-08-09 15:48 ` [PATCH 03/10] watchdog: aspeed: Fix sequential control writes Philippe Mathieu-Daudé
2021-08-09 13:15 ` [PATCH 04/10] hw: aspeed_gpio: Simplify 1.8V defines Cédric Le Goater
2021-08-09 13:15 ` [PATCH 05/10] hw: aspeed_gpio: Clarify GPIO controller name Cédric Le Goater
2021-08-09 13:15 ` [PATCH 06/10] misc/pca9552: Fix LED status register indexing in pca955x_get_led() Cédric Le Goater
2021-08-09 13:15 ` [PATCH 07/10] arm/aspeed: rainier: Add i2c eeproms and muxes Cédric Le Goater
2021-08-09 13:15 ` [PATCH 08/10] aspeed: Emulate the AST2600A3 Cédric Le Goater
2021-08-09 15:55 ` Philippe Mathieu-Daudé
2021-08-11 8:09 ` Cédric Le Goater
2021-08-09 13:15 ` [PATCH 09/10] hw/misc: Add Infineon DPS310 sensor model Cédric Le Goater
2021-08-09 15:59 ` Philippe Mathieu-Daudé
2021-08-10 14:37 ` Cédric Le Goater
2021-08-10 23:37 ` Corey Minyard
2021-08-11 1:25 ` Joel Stanley
2021-08-12 15:15 ` Cédric Le Goater
2021-08-09 13:15 ` [PATCH 10/10] arm/aspeed: Add DPS310 to Witherspoon and Rainier Cédric Le Goater
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=20210809131556.686260-4-clg@kaod.org \
--to=clg@kaod.org \
--cc=andrew@aj.id.au \
--cc=joel@jms.id.au \
--cc=peter.maydell@linaro.org \
--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).