From: Rabin Vincent <rabin@rab.in>
Date: Sun, 2 May 2010 09:50:52 +0000 (+0530)
Subject: arm_timer: fix oneshot mode
X-Git-Tag: v0.13.0-rc0~489
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9cf98d939c4f6539fad7e7d812ea16d96ba3dc9;p=thirdparty%2Fqemu.git

arm_timer: fix oneshot mode

In oneshot mode, the delta needs to come from the TimerLoad register,
not the maximum limit.

Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/hw/arm_timer.c b/hw/arm_timer.c
index 5b6947a1668..9073ffc0077 100644
--- a/hw/arm_timer.c
+++ b/hw/arm_timer.c
@@ -71,7 +71,7 @@ static void arm_timer_recalibrate(arm_timer_state *s, int reload)
 {
     uint32_t limit;
 
-    if ((s->control & TIMER_CTRL_PERIODIC) == 0) {
+    if ((s->control & (TIMER_CTRL_PERIODIC | TIMER_CTRL_ONESHOT)) == 0) {
         /* Free running.  */
         if (s->control & TIMER_CTRL_32BIT)
             limit = 0xffffffff;