Skip to content

Commit

Permalink
i6300esb: fix timer overflow
Browse files Browse the repository at this point in the history
We use muldiv64() to compute the time to wait:

    timeout = muldiv64(get_ticks_per_sec(), timeout, 33000000);

but get_ticks_per_sec() is 10^9 (30 bit value) and timeout
is a 35 bit value.

Whereas muldiv64 is:

    uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c)

So we loose 3 bits of timeout.

Swapping get_ticks_per_sec() and timeout fixes it.

We can also replace it by a multiplication by 30 ns,
but this changes PCI clock frequency from 33MHz to 33.333333MHz
and we need to do this on all the QEMU PCI devices (later...)

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
  • Loading branch information
vivier authored and Michael Tokarev committed Sep 11, 2015
1 parent 6883de6 commit fee562e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion hw/watchdog/wdt_i6300esb.c
Expand Up @@ -136,7 +136,7 @@ static void i6300esb_restart_timer(I6300State *d, int stage)
* multiply here can exceed 64-bits, before we divide by 33MHz, so
* we use a higher-precision intermediate result.
*/
timeout = muldiv64(get_ticks_per_sec(), timeout, 33000000);
timeout = muldiv64(timeout, get_ticks_per_sec(), 33000000);

i6300esb_debug("stage %d, timeout %" PRIi64 "\n", d->stage, timeout);

Expand Down

0 comments on commit fee562e

Please sign in to comment.