[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/7] arm_mptimer: Fix timer shutdown and mode change
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 6/7] arm_mptimer: Fix timer shutdown and mode change |
Date: |
Mon, 6 Jul 2015 10:59:34 +0100 |
From: Dmitry Osipenko <address@hidden>
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 <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
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
- [Qemu-devel] [PULL 0/7] target-arm queue, Peter Maydell, 2015/07/06
- [Qemu-devel] [PULL 5/7] hw/intc/arm_gic_common.c: Reset all registers, Peter Maydell, 2015/07/06
- [Qemu-devel] [PULL 3/7] target-arm: Split DISAS_YIELD from DISAS_WFE, Peter Maydell, 2015/07/06
- [Qemu-devel] [PULL 1/7] target-arm: fix write helper for TLBI ALLE1IS, Peter Maydell, 2015/07/06
- [Qemu-devel] [PULL 7/7] arm_mptimer: Respect IT bit state, Peter Maydell, 2015/07/06
- [Qemu-devel] [PULL 6/7] arm_mptimer: Fix timer shutdown and mode change,
Peter Maydell <=
- [Qemu-devel] [PULL 4/7] target-arm: Implement YIELD insn to yield in ARM and Thumb translators, Peter Maydell, 2015/07/06
- [Qemu-devel] [PULL 2/7] Fix interval interrupt of cadence ttc when timer is in decrement mode, Peter Maydell, 2015/07/06
- Re: [Qemu-devel] [PULL 0/7] target-arm queue, Peter Maydell, 2015/07/06