[U-Boot] [PATCH] aspeed/watchdog: Correct timeout value

[Joel Stanley]

On Fri, 7 Jun 2019 at 14:57, Tom Rini <trini at konsulko.com> wrote:
>
> On Thu, Jun 06, 2019 at 05:08:45PM +0930, Joel Stanley wrote:
>
> > 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.
> >
> > Fixes: 06985289d452 ("watchdog: Implement generic watchdog_reset() version")
> > Signed-off-by: Joel Stanley <joel at jms.id.au>
>
> 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