Message ID | 20170920064915.30027-1-clg@kaod.org |
---|---|
State | New |
Headers | show |
Series | [v2] watchdog/aspeed: fix variable type to store reload value | expand |
On Wed, 2017-09-20 at 08:49 +0200, Cédric Le Goater wrote: > Initially from Anton D. Kachalov" <mouse@yandex-team.ru> but the SoB was > missing. > > Signed-off-by: Cédric Le Goater <clg@kaod.org> > [clg: change commit log and subject > replace UL suffix by ULL ] > Signed-off-by: Cédric Le Goater <clg@kaod.org> Acked-by: Andrew Jeffery <andrew@aj.id.au> > --- > hw/watchdog/wdt_aspeed.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c > index 22bce364d7b5..95f6ad186d72 100644 > --- a/hw/watchdog/wdt_aspeed.c > +++ b/hw/watchdog/wdt_aspeed.c > @@ -100,13 +100,13 @@ static uint64_t aspeed_wdt_read(void *opaque, hwaddr offset, unsigned size) > > static void aspeed_wdt_reload(AspeedWDTState *s, bool pclk) > { > - uint32_t reload; > + uint64_t reload; > > if (pclk) { > reload = muldiv64(s->regs[WDT_RELOAD_VALUE], NANOSECONDS_PER_SECOND, > s->pclk_freq); > } else { > - reload = s->regs[WDT_RELOAD_VALUE] * 1000; > + reload = s->regs[WDT_RELOAD_VALUE] * 1000ULL; > } > > if (aspeed_wdt_is_enabled(s)) {
On 9 October 2017 at 00:45, Andrew Jeffery <andrew@aj.id.au> wrote: > On Wed, 2017-09-20 at 08:49 +0200, Cédric Le Goater wrote: >> Initially from Anton D. Kachalov" <mouse@yandex-team.ru> but the SoB was >> missing. >> >> Signed-off-by: Cédric Le Goater <clg@kaod.org> >> [clg: change commit log and subject >> replace UL suffix by ULL ] >> Signed-off-by: Cédric Le Goater <clg@kaod.org> > > Acked-by: Andrew Jeffery <andrew@aj.id.au> Applied to target-arm.next, thanks. -- PMM
diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index 22bce364d7b5..95f6ad186d72 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -100,13 +100,13 @@ static uint64_t aspeed_wdt_read(void *opaque, hwaddr offset, unsigned size) static void aspeed_wdt_reload(AspeedWDTState *s, bool pclk) { - uint32_t reload; + uint64_t reload; if (pclk) { reload = muldiv64(s->regs[WDT_RELOAD_VALUE], NANOSECONDS_PER_SECOND, s->pclk_freq); } else { - reload = s->regs[WDT_RELOAD_VALUE] * 1000; + reload = s->regs[WDT_RELOAD_VALUE] * 1000ULL; } if (aspeed_wdt_is_enabled(s)) {