Check correct register for clock source
PATCH 1/1 Check correct register for clock source
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.
--- hw/watchdog/wdt_aspeed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/watchdog/wdt_aspeed.c +1 -1
@@ -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 :
Signature · 1 line
2.21.0
Quoted 6 lines · Amithash Prasad
When
WDT_RESTARTis written, the data is not the contents of theWDT_CTRLregister. Hence ensure we are looking atWDT_CTRLto check if bitWDT_CTRL_1MHZ_CLKis set or not.Signed-off-by Amithash Prasad <[email protected]>
Thanks for the patch!
Quoted 20 lines
--- hw/watchdog/wdt_aspeed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/watchdog/wdt_aspeed.c +1
-2@@ -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
Quoted 11 lines · Joel Stanley
Quoted 6 lines · Amithash Prasad
When
WDT_RESTARTis written, the data is not the contents of theWDT_CTRLregister. Hence ensure we are looking atWDT_CTRLto check if bitWDT_CTRL_1MHZ_CLKis set or not.Signed-off-by Amithash Prasad <[email protected]>Reviewed-by Joel Stanley <[email protected]>Thanks for the patch!
yes. I have pushed it on the aspeed-4.2 branch but it can go independently as there are no conflicts. I changed the title slightly to reflect the area being changed.
On the clock topic, we should consider looking at the "Clock framework API" from Damien Hedde :
http://patchwork.ozlabs.org/cover/1157671/
Thanks,
C.
Quoted 21 lines
Quoted 21 lines
--- hw/watchdog/wdt_aspeed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/watchdog/wdt_aspeed.c +1
-2@@ -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
Quoted 3 lines
Quoted 3 lines
yes. I have pushed it on the aspeed-4.2 branch but it can go independently
as there are no conflicts. I changed the title slightly to reflect the area being changed.
Thanks! If required, I can change the patch title and resubmit.