[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/10] watchdog: aspeed: Fix sequential control writes
From: |
Cédric Le Goater |
Subject: |
[PATCH 03/10] watchdog: aspeed: Fix sequential control writes |
Date: |
Mon, 9 Aug 2021 15:15:49 +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
- [PATCH 00/10] Aspeed: 6.2 queue, Cédric Le Goater, 2021/08/09
- [PATCH 03/10] watchdog: aspeed: Fix sequential control writes,
Cédric Le Goater <=
- [PATCH 02/10] watchdog: aspeed: Sanitize control register values, Cédric Le Goater, 2021/08/09
- [PATCH 01/10] hw: arm: aspeed: Enable eth0 interface for aspeed-ast2600-evb, Cédric Le Goater, 2021/08/09
- [PATCH 04/10] hw: aspeed_gpio: Simplify 1.8V defines, Cédric Le Goater, 2021/08/09
- [PATCH 06/10] misc/pca9552: Fix LED status register indexing in pca955x_get_led(), Cédric Le Goater, 2021/08/09
- [PATCH 09/10] hw/misc: Add Infineon DPS310 sensor model, Cédric Le Goater, 2021/08/09