From: "Cédric Le Goater" <clg@kaod.org>
To: Joel Stanley <joel@jms.id.au>,
Peter Maydell <peter.maydell@linaro.org>,
Andrew Jeffery <andrew@aj.id.au>
Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [PATCH 4/4] watchdog/aspeed: Fix AST2600 frequency behaviour
Date: Tue, 12 Nov 2019 08:56:33 +0100 [thread overview]
Message-ID: <87e0a727-bfd5-a485-e986-e26fd4cccfef@kaod.org> (raw)
In-Reply-To: <20191112064058.13275-5-joel@jms.id.au>
On 12/11/2019 07:40, Joel Stanley wrote:
> The AST2600 control register sneakily changed the meaning of bit 4
> without anyone noticing. It no longer controls the 1MHz vs APB clock
> select, and instead always runs at 1MHz.
>
> The AST2500 was always 1MHz too, but it retained bit 4, making it read
> only. We can model both using the same fixed 1MHz calculation.
>
> Fixes: ea29711f467f ("watchdog/aspeed: Fix AST2600 control reg behaviour")
which commit is that ^ ? Did you mean :
Fixes: 6b2b2a703cad ("hw: wdt_aspeed: Add AST2600 support")
> Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
C.
> ---
> hw/watchdog/wdt_aspeed.c | 21 +++++++++++++++++----
> include/hw/watchdog/wdt_aspeed.h | 1 +
> 2 files changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c
> index 5697ed83325a..f43a3bc88976 100644
> --- a/hw/watchdog/wdt_aspeed.c
> +++ b/hw/watchdog/wdt_aspeed.c
> @@ -93,11 +93,11 @@ static uint64_t aspeed_wdt_read(void *opaque, hwaddr offset, unsigned size)
>
> }
>
> -static void aspeed_wdt_reload(AspeedWDTState *s, bool pclk)
> +static void aspeed_wdt_reload(AspeedWDTState *s)
> {
> uint64_t reload;
>
> - if (pclk) {
> + if (!(s->regs[WDT_CTRL] & WDT_CTRL_1MHZ_CLK)) {
> reload = muldiv64(s->regs[WDT_RELOAD_VALUE], NANOSECONDS_PER_SECOND,
> s->pclk_freq);
> } else {
> @@ -109,6 +109,16 @@ static void aspeed_wdt_reload(AspeedWDTState *s, bool pclk)
> }
> }
>
> +static void aspeed_wdt_reload_1mhz(AspeedWDTState *s)
> +{
> + uint64_t reload = s->regs[WDT_RELOAD_VALUE] * 1000ULL;
> +
> + if (aspeed_wdt_is_enabled(s)) {
> + timer_mod(s->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + reload);
> + }
> +}
> +
> +
> static void aspeed_wdt_write(void *opaque, hwaddr offset, uint64_t data,
> unsigned size)
> {
> @@ -130,13 +140,13 @@ static void aspeed_wdt_write(void *opaque, hwaddr offset, uint64_t data,
> case WDT_RESTART:
> if ((data & 0xFFFF) == WDT_RESTART_MAGIC) {
> s->regs[WDT_STATUS] = s->regs[WDT_RELOAD_VALUE];
> - aspeed_wdt_reload(s, !(s->regs[WDT_CTRL] & WDT_CTRL_1MHZ_CLK));
> + awc->wdt_reload(s);
> }
> break;
> case WDT_CTRL:
> if (enable && !aspeed_wdt_is_enabled(s)) {
> s->regs[WDT_CTRL] = data;
> - aspeed_wdt_reload(s, !(data & WDT_CTRL_1MHZ_CLK));
> + awc->wdt_reload(s);
> } else if (!enable && aspeed_wdt_is_enabled(s)) {
> s->regs[WDT_CTRL] = data;
> timer_del(s->timer);
> @@ -283,6 +293,7 @@ static void aspeed_2400_wdt_class_init(ObjectClass *klass, void *data)
> awc->offset = 0x20;
> awc->ext_pulse_width_mask = 0xff;
> awc->reset_ctrl_reg = SCU_RESET_CONTROL1;
> + awc->wdt_reload = aspeed_wdt_reload;
> }
>
> static const TypeInfo aspeed_2400_wdt_info = {
> @@ -317,6 +328,7 @@ static void aspeed_2500_wdt_class_init(ObjectClass *klass, void *data)
> awc->ext_pulse_width_mask = 0xfffff;
> awc->reset_ctrl_reg = SCU_RESET_CONTROL1;
> awc->reset_pulse = aspeed_2500_wdt_reset_pulse;
> + awc->wdt_reload = aspeed_wdt_reload_1mhz;
> }
>
> static const TypeInfo aspeed_2500_wdt_info = {
> @@ -336,6 +348,7 @@ static void aspeed_2600_wdt_class_init(ObjectClass *klass, void *data)
> awc->ext_pulse_width_mask = 0xfffff; /* TODO */
> awc->reset_ctrl_reg = AST2600_SCU_RESET_CONTROL1;
> awc->reset_pulse = aspeed_2500_wdt_reset_pulse;
> + awc->wdt_reload = aspeed_wdt_reload_1mhz;
> }
>
> static const TypeInfo aspeed_2600_wdt_info = {
> diff --git a/include/hw/watchdog/wdt_aspeed.h b/include/hw/watchdog/wdt_aspeed.h
> index dfedd7662dd1..819c22993a6e 100644
> --- a/include/hw/watchdog/wdt_aspeed.h
> +++ b/include/hw/watchdog/wdt_aspeed.h
> @@ -47,6 +47,7 @@ typedef struct AspeedWDTClass {
> uint32_t ext_pulse_width_mask;
> uint32_t reset_ctrl_reg;
> void (*reset_pulse)(AspeedWDTState *s, uint32_t property);
> + void (*wdt_reload)(AspeedWDTState *s);
> } AspeedWDTClass;
>
> #endif /* WDT_ASPEED_H */
>
next prev parent reply other threads:[~2019-11-12 7:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 6:40 [PATCH 0/4] arm/aspeed: Watchdog and SDRAM fixes Joel Stanley
2019-11-12 6:40 ` [PATCH 1/4] aspeed/sdmc: Make ast2600 default 1G Joel Stanley
2019-11-12 7:45 ` Cédric Le Goater
2019-11-12 6:40 ` [PATCH 2/4] aspeed/scu: Fix W1C behavior Joel Stanley
2019-11-12 7:45 ` Cédric Le Goater
2019-11-12 6:40 ` [PATCH 3/4] watchdog/aspeed: Improve watchdog timeout message Joel Stanley
2019-11-12 7:52 ` Cédric Le Goater
2019-11-12 6:40 ` [PATCH 4/4] watchdog/aspeed: Fix AST2600 frequency behaviour Joel Stanley
2019-11-12 7:56 ` Cédric Le Goater [this message]
2019-11-13 0:48 ` Joel Stanley
2019-11-12 15:05 ` [PATCH 0/4] arm/aspeed: Watchdog and SDRAM fixes no-reply
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=87e0a727-bfd5-a485-e986-e26fd4cccfef@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).