[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/14] watchdog: aspeed: Fix sequential control writes
From: |
Cédric Le Goater |
Subject: |
[PULL 04/14] watchdog: aspeed: Fix sequential control writes |
Date: |
Mon, 13 Sep 2021 18:12:54 +0200 |
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
- [PULL 08/14] arm/aspeed: rainier: Add i2c eeproms and muxes, (continued)
[PULL 00/14] aspeed queue, Cédric Le Goater, 2021/09/13
- [PULL 04/14] watchdog: aspeed: Fix sequential control writes,
Cédric Le Goater <=
- [PULL 13/14] hw/arm/aspeed: Allow machine to set UART default, Cédric Le Goater, 2021/09/13
- [PULL 07/14] misc/pca9552: Fix LED status register indexing in pca955x_get_led(), Cédric Le Goater, 2021/09/13
- [PULL 08/14] arm/aspeed: rainier: Add i2c eeproms and muxes, Cédric Le Goater, 2021/09/13
- [PULL 09/14] aspeed: Emulate the AST2600A3, Cédric Le Goater, 2021/09/13
- [PULL 14/14] hw/arm/aspeed: Add Fuji machine type, Cédric Le Goater, 2021/09/13
- Re: [PULL 14/14] hw/arm/aspeed: Add Fuji machine type, Cédric Le Goater, 2021/09/14
- Re: [PULL 14/14] hw/arm/aspeed: Add Fuji machine type, Peter Delevoryas, 2021/09/14
- Re: [PULL 14/14] hw/arm/aspeed: Add Fuji machine type, Joel Stanley, 2021/09/14
- Re: [PULL 14/14] hw/arm/aspeed: Add Fuji machine type, Peter Maydell, 2021/09/14
- Re: [PULL 14/14] hw/arm/aspeed: Add Fuji machine type, Richard Henderson, 2021/09/14