From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54404) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZC3Bj-0005Xk-Nj for qemu-devel@nongnu.org; Mon, 06 Jul 2015 05:59:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZC3Bh-0003Pv-Go for qemu-devel@nongnu.org; Mon, 06 Jul 2015 05:59:47 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34581) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZC3Bh-0003HN-8y for qemu-devel@nongnu.org; Mon, 06 Jul 2015 05:59:45 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1ZC3BX-0007hO-Vw for qemu-devel@nongnu.org; Mon, 06 Jul 2015 10:59:36 +0100 From: Peter Maydell Date: Mon, 6 Jul 2015 10:59:34 +0100 Message-Id: <1436176775-29545-7-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1436176775-29545-1-git-send-email-peter.maydell@linaro.org> References: <1436176775-29545-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 6/7] arm_mptimer: Fix timer shutdown and mode change List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Dmitry Osipenko The running timer can't be stopped because timer control code just doesn't handle disabling the timer. Fix it by deleting the timer if the enable bit is cleared. The timer won't start periodic ticking if a ONE-SHOT -> PERIODIC mode change happens after a one-shot tick was completed. Fix it by re-starting ticking 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 Reviewed-by: Peter Crosthwaite Signed-off-by: Peter Maydell --- 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. */ -- 1.9.1