From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9vv1-0005hK-BA for qemu-devel@nongnu.org; Mon, 06 Jun 2016 10:54:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9vuz-0001pd-Cw for qemu-devel@nongnu.org; Mon, 06 Jun 2016 10:54:18 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:57510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9vuz-0001pW-5L for qemu-devel@nongnu.org; Mon, 06 Jun 2016 10:54:17 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1b9voo-0008Ev-Gu for qemu-devel@nongnu.org; Mon, 06 Jun 2016 15:47:54 +0100 From: Peter Maydell Date: Mon, 6 Jun 2016 15:47:35 +0100 Message-Id: <1465224465-21998-19-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1465224465-21998-1-git-send-email-peter.maydell@linaro.org> References: <1465224465-21998-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 18/28] hw/ptimer: Update .delta on period/freq change List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Dmitry Osipenko 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 Reviewed-by: Peter Crosthwaite Message-id: 4987ef5fdc128bb9a744fd794d3f609135c6a39c.1464367869.git.digetx@gmail.com Signed-off-by: Peter Maydell --- hw/core/ptimer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c index 7e6fc2d..76ebe9b 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) { -- 1.9.1