xilinx_timer: Fixed deadlock issue
authorPeter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
Sat, 16 Jun 2012 05:20:59 +0000 (15:20 +1000)
committerEdgar E. Iglesias <edgar.iglesias@gmail.com>
Thu, 21 Jun 2012 13:19:16 +0000 (15:19 +0200)
The timer was deadlocking when the interval was set too low. It would cause a
flood of timer events and the CPU would halt indefinately. This is a known issue
and theres a generic workaround in place in ptimer on ptimer_set_limit(),
however the Xilinx timer uses ptimer_set_count() instead of set_limit. Changed
the call to set_count() to an equivalent call of set_limit() instead, which
brings the workaround into play.

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
hw/xilinx_timer.c

index e8b7a59..b562bd0 100644 (file)
@@ -136,7 +136,7 @@ static void timer_enable(struct xlx_timer *xt)
         count = xt->regs[R_TLR];
     else
         count = ~0 - xt->regs[R_TLR];
-    ptimer_set_count(xt->ptimer, count);
+    ptimer_set_limit(xt->ptimer, count, 1);
     ptimer_run(xt->ptimer, 1);
 }