From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQF1c-00034N-3m for qemu-devel@nongnu.org; Thu, 21 Jul 2016 10:32:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQF1a-0003mG-MW for qemu-devel@nongnu.org; Thu, 21 Jul 2016 10:32:32 -0400 From: Dmitry Osipenko Date: Thu, 21 Jul 2016 17:31:21 +0300 Message-Id: <4f59caa4ce3786410b7d1afee30d480a8ff33aac.1469110137.git.digetx@gmail.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH v15 10/15] hw/ptimer: Add "no immediate trigger" policy List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers , qemu-arm@nongnu.org Cc: Peter Crosthwaite , Peter Maydell 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 --- hw/core/ptimer.c | 9 ++++++++- include/hw/ptimer.h | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c index 8578861..d37e8ab 100644 --- a/hw/core/ptimer.c +++ b/hw/core/ptimer.c @@ -40,8 +40,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; } @@ -62,6 +65,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) { fprintf(stderr, "Timer with delta zero, disabling\n"); timer_del(s->timer); diff --git a/include/hw/ptimer.h b/include/hw/ptimer.h index c97f02e..ec76183 100644 --- a/include/hw/ptimer.h +++ b/include/hw/ptimer.h @@ -19,6 +19,9 @@ /* Periodic timer that has load = 0 would continuously 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; -- 2.9.2