From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37540) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBm16-0002TW-1h for qemu-devel@nongnu.org; Sun, 05 Jul 2015 11:39:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZBm15-0006lb-6K for qemu-devel@nongnu.org; Sun, 05 Jul 2015 11:39:40 -0400 Received: from mail-la0-x22f.google.com ([2a00:1450:4010:c03::22f]:33928) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBm14-0006lN-UC for qemu-devel@nongnu.org; Sun, 05 Jul 2015 11:39:39 -0400 Received: by lagx9 with SMTP id x9so129043649lag.1 for ; Sun, 05 Jul 2015 08:39:38 -0700 (PDT) From: Dmitry Osipenko Date: Sun, 5 Jul 2015 18:39:01 +0300 Message-Id: <1436110742-6190-2-git-send-email-digetx@gmail.com> In-Reply-To: <1436110742-6190-1-git-send-email-digetx@gmail.com> References: <1435877531-24983-1-git-send-email-digetx@gmail.com> <1436110742-6190-1-git-send-email-digetx@gmail.com> Subject: [Qemu-devel] [PATCH 1/2] arm_mptimer: Fix timer shutdown and mode change List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Crosthwaite , Peter Maydell Cc: Paolo Bonzini , QEMU Developers Timer, running in periodic mode, can't be stopped or coming one-shot tick won't be canceled because timer control code just doesn't handle timer disabling. Fix it by deleting the timer if enable bit isn't set. Timer won't start periodic ticking if ONE-SHOT -> PERIODIC mode change happened after one-shot tick was completed. Fix it by starting ticking only if the timer isn't ticking right now. To avoid code churning, these two fixes are squashed in one commit. Signed-off-by: Dmitry Osipenko --- Commits are squashed as per Peter Crosthwaite suggestion. hw/timer/arm_mptimer.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index 8b93b3c..0e132b1 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -122,11 +122,18 @@ static void timerblock_write(void *opaque, hwaddr addr, case 8: /* Control. */ old = tb->control; tb->control = value; - if (((old & 1) == 0) && (value & 1)) { - if (tb->count == 0 && (tb->control & 2)) { + if (value & 1) { + if ((old & 1) && (tb->count != 0)) { + /* Do nothing if timer is ticking right now. */ + break; + } + if (tb->control & 2) { tb->count = tb->load; } timerblock_reload(tb, 1); + } else if (old & 1) { + /* Shutdown the timer. */ + timer_del(tb->timer); } break; case 12: /* Interrupt status. */ -- 2.4.4