[v16,13/16] hw/ptimer: Add "no counter round down" policy

Commit Message

Dmitry Osipenko Sept. 7, 2016, 1:22 p.m. UTC

For most of the timers counter starts to decrement after first period
expires. Due to rounding down performed by the ptimer_get_count, it returns
counter - 1 for the running timer, so that for the ptimer user it looks
like counter gets decremented immediately after running the timer. Add "no
counter round down" policy that provides correct behaviour for those timers.

Signed-off-by: Dmitry Osipenko <[e-mail]>
---
 hw/core/ptimer.c    | 9 +++++++--
 include/hw/ptimer.h | 4 ++++
 2 files changed, 11 insertions(+), 2 deletions(-)

Patch

diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c
index f7f5538..88a1fe2 100644
--- a/hw/core/ptimer.c
+++ b/hw/core/ptimer.c
@@ -119,11 +119,14 @@  static void ptimer_tick(void *opaque)
 
 uint64_t ptimer_get_count(ptimer_state *s)
 {
+    bool no_round_down =
+                !!(s->policy_mask & PTIMER_POLICY_NO_COUNTER_ROUND_DOWN);
     uint64_t counter;
 
     if (s->enabled && s->delta != 0) {
         int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
         int64_t next = s->next_event;
+        int64_t last = s->last_event;
         bool expired = (now - next >= 0);
         bool oneshot = (s->enabled == 2);
 
@@ -131,7 +134,9 @@  uint64_t ptimer_get_count(ptimer_state *s)
         if (expired) {
             /* Prevent timer underflowing if it should already have
                triggered.  */
-            counter = 0;
+            counter = no_round_down ? 1 : 0;
+        } else if (now == last && no_round_down) {
+            counter = s->delta;
         } else {
             uint64_t rem;
             uint64_t div;
@@ -174,7 +179,7 @@  uint64_t ptimer_get_count(ptimer_state *s)
                 if ((uint32_t)(period_frac << shift))
                     div += 1;
             }
-            counter = rem / div;
+            counter = rem / div + (no_round_down ? 1 : 0);
 
             if (!oneshot && s->delta == s->limit) {
                 /* Before wrapping around, timer should stay with counter = 0
diff --git a/include/hw/ptimer.h b/include/hw/ptimer.h
index 131fed1..5ce3270 100644
--- a/include/hw/ptimer.h
+++ b/include/hw/ptimer.h
@@ -49,6 +49,10 @@ 
 /* Starting to run with/setting counter = 0 won't re-load counter.  */
 #define PTIMER_POLICY_NO_IMMEDIATE_RELOAD   (1 << 3)
 
+/* Make counter value of the running timer represent the actual value and
+ * not the one less.  */
+#define PTIMER_POLICY_NO_COUNTER_ROUND_DOWN (1 << 4)
+
 /* ptimer.c */
 typedef struct ptimer_state ptimer_state;
 typedef void (*ptimer_cb)(void *opaque);