diff options
| author | Dmitry Osipenko <digetx@gmail.com> | 2016-06-06 16:59:30 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-06 16:59:30 +0100 |
| commit | 7ef6e3cf8d29022c31d417be12042af33682e2b8 (patch) | |
| tree | 8a78014f6e2753e2675e8528a4e3583c13bca0a4 /hw | |
| parent | 5a50307b48f834d0048fde20aa6c0e24cd9f33be (diff) | |
| download | qemu-7ef6e3cf8d29022c31d417be12042af33682e2b8.tar.gz | |
hw/ptimer: Update .delta on period/freq change
Delta value must be updated on period/freq change, otherwise running timer
would be restarted (counter reloaded with old delta). Only m68k/mcf520x
and arm/arm_timer devices are currently doing freq change correctly, i.e.
stopping the timer. Perform delta update to fix affected devices and
eliminate potential further mistakes.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Message-id: 4987ef5fdc128bb9a744fd794d3f609135c6a39c.1464367869.git.digetx@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/core/ptimer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c index 7e6fc2d2ce..76ebe9b48c 100644 --- a/hw/core/ptimer.c +++ b/hw/core/ptimer.c @@ -190,6 +190,7 @@ void ptimer_stop(ptimer_state *s) /* Set counter increment interval in nanoseconds. */ void ptimer_set_period(ptimer_state *s, int64_t period) { + s->delta = ptimer_get_count(s); s->period = period; s->period_frac = 0; if (s->enabled) { @@ -201,6 +202,7 @@ void ptimer_set_period(ptimer_state *s, int64_t period) /* Set counter frequency in Hz. */ void ptimer_set_freq(ptimer_state *s, uint32_t freq) { + s->delta = ptimer_get_count(s); s->period = 1000000000ll / freq; s->period_frac = (1000000000ll << 32) / freq; if (s->enabled) { |