[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v13 7/8] hw/ptimer: Fix counter - 1 returned by ptimer
From: |
Dmitry Osipenko |
Subject: |
[Qemu-arm] [PATCH v13 7/8] hw/ptimer: Fix counter - 1 returned by ptimer_get_count for the active timer |
Date: |
Fri, 27 May 2016 20:03:35 +0300 |
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 <address@hidden>
---
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 9bc70f5..c9f2604 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.8.3
- [Qemu-arm] [PATCH v13 0/8] PTimer fixes/features and ARM MPTimer conversion, Dmitry Osipenko, 2016/05/27
- [Qemu-arm] [PATCH v13 5/8] hw/ptimer: Introduce ptimer_get_limit, Dmitry Osipenko, 2016/05/27
- [Qemu-arm] [PATCH v13 4/8] hw/ptimer: Support "on the fly" timer mode switch, Dmitry Osipenko, 2016/05/27
- [Qemu-arm] [PATCH v13 7/8] hw/ptimer: Fix counter - 1 returned by ptimer_get_count for the active timer,
Dmitry Osipenko <=
- [Qemu-arm] [PATCH v13 8/8] arm_mptimer: Convert to use ptimer, Dmitry Osipenko, 2016/05/27
- [Qemu-arm] [PATCH v13 6/8] hw/ptimer: Support running with counter = 0 by introducing new policy feature, Dmitry Osipenko, 2016/05/27
- [Qemu-arm] [PATCH v13 1/8] hw/ptimer: Fix issues caused by the adjusted timer limit value, Dmitry Osipenko, 2016/05/27
- [Qemu-arm] [PATCH v13 2/8] hw/ptimer: Perform counter wrap around if timer already expired, Dmitry Osipenko, 2016/05/27
- [Qemu-arm] [PATCH v13 3/8] hw/ptimer: Update .delta on period/freq change, Dmitry Osipenko, 2016/05/27