[v16,09/16] hw/ptimer: Add "no immediate trigger" policy

Commit Message

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

Performing trigger on setting (or starting to run with) counter = 0 could
be a wrong behaviour for some of the timers, provide "no immediate trigger"
policy to maintain correct behaviour for such timers.

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

Patch

diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c
index 97ce8ae..018589d 100644
--- a/hw/core/ptimer.c
+++ b/hw/core/ptimer.c
@@ -41,8 +41,11 @@  static void ptimer_reload(ptimer_state *s, int delta_adjust)
     uint64_t period = s->period;
     uint64_t delta = s->delta;
 
-    if (delta == 0) {
+    if (delta == 0 && !(s->policy_mask & PTIMER_POLICY_NO_IMMEDIATE_TRIGGER)) {
         ptimer_trigger(s);
+    }
+
+    if (delta == 0) {
         delta = s->delta = s->limit;
     }
 
@@ -65,6 +68,10 @@  static void ptimer_reload(ptimer_state *s, int delta_adjust)
         }
     }
 
+    if (delta == 0 && (s->policy_mask & PTIMER_POLICY_NO_IMMEDIATE_TRIGGER)) {
+        delta = 1;
+    }
+
     if (delta == 0) {
         if (!qtest_enabled()) {
             fprintf(stderr, "Timer with delta zero, disabling\n");
diff --git a/include/hw/ptimer.h b/include/hw/ptimer.h
index e2f4c55..4b7c53c 100644
--- a/include/hw/ptimer.h
+++ b/include/hw/ptimer.h
@@ -42,6 +42,10 @@ 
  * re-trigger every period.  */
 #define PTIMER_POLICY_CONTINUOUS_TRIGGER    (1 << 1)
 
+/* Starting to run with/setting counter = 0 won't perform immediate
+ * trigger.  */
+#define PTIMER_POLICY_NO_IMMEDIATE_TRIGGER  (1 << 2)
+
 /* ptimer.c */
 typedef struct ptimer_state ptimer_state;
 typedef void (*ptimer_cb)(void *opaque);