[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: |
Fri, 3 Sep 2021 21:40:58 +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 02/14] hw: arm: aspeed: Enable mac0/1 instead of mac1/2 for g220a, (continued)
- [PULL 02/14] hw: arm: aspeed: Enable mac0/1 instead of mac1/2 for g220a, Cédric Le Goater, 2021/09/03
- [PULL 12/14] hw/arm/aspeed: Initialize AST2600 UART clock selection registers, Cédric Le Goater, 2021/09/03
- [PULL 05/14] hw: aspeed_gpio: Simplify 1.8V defines, Cédric Le Goater, 2021/09/03
- [PULL 03/14] watchdog: aspeed: Sanitize control register values, Cédric Le Goater, 2021/09/03
- [PULL 09/14] aspeed: Emulate the AST2600A3, Cédric Le Goater, 2021/09/03
- [PULL 06/14] hw: aspeed_gpio: Clarify GPIO controller name, Cédric Le Goater, 2021/09/03
- [PULL 10/14] hw/misc: Add Infineon DPS310 sensor model, Cédric Le Goater, 2021/09/03
- [PULL 01/14] hw: arm: aspeed: Enable eth0 interface for aspeed-ast2600-evb, Cédric Le Goater, 2021/09/03
- [PULL 07/14] misc/pca9552: Fix LED status register indexing in pca955x_get_led(), Cédric Le Goater, 2021/09/03
- [PULL 08/14] arm/aspeed: rainier: Add i2c eeproms and muxes, Cédric Le Goater, 2021/09/03
- [PULL 04/14] watchdog: aspeed: Fix sequential control writes,
Cédric Le Goater <=
- [PULL 11/14] arm/aspeed: Add DPS310 to Witherspoon and Rainier, Cédric Le Goater, 2021/09/03
- Re: [PULL 00/14] aspeed queue, Philippe Mathieu-Daudé, 2021/09/03
[PULL 00/14] aspeed queue, Cédric Le Goater, 2021/09/13