From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDtev-0003AV-MS for qemu-devel@nongnu.org; Fri, 17 Jun 2016 09:18:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDtel-0002qP-IS for qemu-devel@nongnu.org; Fri, 17 Jun 2016 09:18:04 -0400 From: Dmitry Osipenko Date: Fri, 17 Jun 2016 16:17:27 +0300 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH v14 2/3] hw/ptimer: Fix counter - 1 returned by ptimer_get_count for the active timer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers , qemu-arm@nongnu.org Cc: Peter Crosthwaite , Peter Maydell Due to rounding down performed by ptimer_get_count, it returns counter - 1 for the active timer. That's incorrect because counter should decrement only after period been expired, not before. I.e. if running timer has been loaded with value X, then timer counter should stay with X until period expired and decrement after. Fix this by adding 1 to the counter value for the active and unexpired timer. Signed-off-by: Dmitry Osipenko --- hw/core/ptimer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c index 289e23e..7f89001 100644 --- a/hw/core/ptimer.c +++ b/hw/core/ptimer.c @@ -89,10 +89,10 @@ static void ptimer_tick(void *opaque) uint64_t ptimer_get_count(ptimer_state *s) { + int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); uint64_t counter; - if (s->enabled && s->delta != 0) { - int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + if (s->enabled && s->delta != 0 && now != s->last_event) { int64_t next = s->next_event; bool expired = (now - next >= 0); bool oneshot = (s->enabled == 2); @@ -144,7 +144,7 @@ uint64_t ptimer_get_count(ptimer_state *s) if ((uint32_t)(period_frac << shift)) div += 1; } - counter = rem / div; + counter = rem / div + (expired ? 0 : 1); if (expired && counter != 0) { /* Wrap around periodic counter. */ -- 2.9.0