On Thu, 19 Sep 2019 at 05:50, Cédric Le Goater <c...@kaod.org> wrote:
>
> From: Amithash Prasad <amith...@fb.com>
>
> When WDT_RESTART is written, the data is not the contents
> of the WDT_CTRL register. Hence ensure we are looking at
> WDT_CTRL to check if bit WDT_CTRL_1MHZ_CLK is set or not.
>
> Signed-off-by: Amithash Prasad <amith...@fb.com>
> [clg: improved Suject prefix ]
> Signed-off-by: Cédric Le Goater <c...@kaod.org>
A patch from the Open Source Firmware Conference! Thanks Amithash.
Reviewed-by: Joel Stanley <j...@jms.id.au>
> ---
> hw/watchdog/wdt_aspeed.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c
> index 9b932134172c..f710036535da 100644
> --- a/hw/watchdog/wdt_aspeed.c
> +++ b/hw/watchdog/wdt_aspeed.c
> @@ -140,7 +140,7 @@ 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, !(data & WDT_CTRL_1MHZ_CLK));
> + aspeed_wdt_reload(s, !(s->regs[WDT_CTRL] & WDT_CTRL_1MHZ_CLK));
> }
> break;
> case WDT_CTRL:
> --
> 2.21.0
>
