aspeed/watchdog: Correct timeout value
PATCH 1/1 aspeed/watchdog: Correct timeout value
The driver was using milliseconds and programming it into a register which takes ticks of the watchdog clock, which runs at 1MHz. This meant we were off by 1000 with the desired value.
When 06985289d452 ("watchdog: Implement generic watchdog_reset() version") was added the aspeed board would leave the watchdog running, causing it to bite before u-boot was done.
Discovered by booting in qemu:
$ qemu-system-arm -M ast2500-evb -drive file=test.img,format=raw,if=mtd -nographic -no-reboot -d cpu_reset
U-Boot 2019.07-rc3-00091-g2253e40caef5 (Jun 06 2019 - 16:53:23 +0930)
Model: Aspeed BMC
DRAM: 496 MiB
WDT: Started with servicing (60s timeout)
MMC:
In: serial at 1e784000 Out: serial at 1e784000 Err: serial at 1e784000
Watchdog timer expired.
--- drivers/watchdog/ast_wdt.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/watchdog/ast_wdt.c +6 -0
@@ -23,6 +23,12 @@ static int ast_wdt_start(struct udevice *dev, u64 timeout, ulong flags)ulong driver_data =dev_get_driver_data (dev);u32 reset_mode =ast_reset_mode_from_flags (flags); +/* 32 bits at 1MHz is 4294967ms */ + timeout =min_t (u64, timeout,4294967 ); + +/* WDT counts in ticks of 1MHz clock. 1ms / 1e3 * 1e6 */ + timeout *=1000 ; +clrsetbits_le32 (&priv->regs->ctrl,WDT_CTRL_RESET_MASK <<WDT_CTRL_RESET_MODE_SHIFT , reset_mode <<WDT_CTRL_RESET_MODE_SHIFT );
Signature · 1 line
2.20.1
PATCH 1/1 aspeed/watchdog: Correct timeout value
Quoted 18 lines · Joel Stanley
The driver was using milliseconds and programming it into a register which takes ticks of the watchdog clock, which runs at 1MHz. This meant we were off by 1000 with the desired value.
When
06985289d452("watchdog: Implement genericwatchdog_reset()version") was added the aspeed board would leave the watchdog running, causing it to bite before u-boot was done.Discovered by booting in qemu:
$ qemu-system-arm -M ast2500-evb -drive file=test.img,format=raw,if=mtd -nographic -no-reboot -d cpu_resetU-Boot 2019.07-rc3-00091-g2253e40caef5 (Jun 06 2019 - 16:53:23 +0930)
Model: Aspeed BMC
DRAM: 496 MiB
WDT: Started with servicing (60s timeout)
MMC:
Quoted 7 lines
In: serial at 1e784000 Out: serial at 1e784000 Err: serial at 1e784000Watchdog timer expired.
Fixes 06985289d452 ("watchdog: Implement generic watchdog_reset() version")Signed-off-by Joel Stanley <[email protected]>
Thanks for finding this. Any chance you could take a look at what we have in .travis.yml today for running QEMU platforms and add this one?
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190607/82f7de5f/attachment.sig>
PATCH 1/1 aspeed/watchdog: Correct timeout value
Quoted 26 lines · Tom Rini
Quoted 23 lines · Joel Stanley
The driver was using milliseconds and programming it into a register which takes ticks of the watchdog clock, which runs at 1MHz. This meant we were off by 1000 with the desired value.
When
06985289d452("watchdog: Implement genericwatchdog_reset()version") was added the aspeed board would leave the watchdog running, causing it to bite before u-boot was done.Discovered by booting in qemu:
$ qemu-system-arm -M ast2500-evb -drive file=test.img,format=raw,if=mtd -nographic -no-reboot -d cpu_resetU-Boot 2019.07-rc3-00091-g2253e40caef5 (Jun 06 2019 - 16:53:23 +0930)
Model: Aspeed BMC
DRAM: 496 MiB
WDT: Started with servicing (60s timeout)
MMC:In: serial at 1e784000 Out: serial at 1e784000 Err: serial at 1e784000Watchdog timer expired.
Quoted 5 lines
Quoted 2 lines
Fixes 06985289d452 ("watchdog: Implement generic watchdog_reset() version")Signed-off-by Joel Stanley <[email protected]>Thanks for finding this. Any chance you could take a look at what we have in .travis.yml today for running QEMU platforms and add this one?
Yes, I'll give it a go.
Can we get this fix merged in the mean time?
Cheers,
Joel
PATCH 1/1 aspeed/watchdog: Correct timeout value
In reply to Joel StanleyQuoted 18 lines · Joel Stanley
The driver was using milliseconds and programming it into a register which takes ticks of the watchdog clock, which runs at 1MHz. This meant we were off by 1000 with the desired value.
When
06985289d452("watchdog: Implement genericwatchdog_reset()version") was added the aspeed board would leave the watchdog running, causing it to bite before u-boot was done.Discovered by booting in qemu:
$ qemu-system-arm -M ast2500-evb -drive file=test.img,format=raw,if=mtd -nographic -no-reboot -d cpu_resetU-Boot 2019.07-rc3-00091-g2253e40caef5 (Jun 06 2019 - 16:53:23 +0930)
Model: Aspeed BMC
DRAM: 496 MiB
WDT: Started with servicing (60s timeout)
MMC:
Quoted 7 lines
In: serial at 1e784000 Out: serial at 1e784000 Err: serial at 1e784000Watchdog timer expired.
Fixes 06985289d452 ("watchdog: Implement generic watchdog_reset() version")Signed-off-by Joel Stanley <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190620/b251e757/attachment.sig>