Message ID | 20150630135821.51f3b4fd@johanness-latitude |
---|---|
State | New |
Headers | show |
On Tue, Jun 30, 2015 at 4:58 AM, Johannes Schlatow <schlatow@ida.ing.tu-bs.de> wrote: > The interval interrupt is not set if the timer is in decrement mode. > This is because x >=0 and x < interval after leaving the while-loop. > > Signed-off-by: Johannes Schlatow <schlatow@ida.ing.tu-bs.de> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Can this go via target-arm for 2.4 (as a bugfix)? Regards, Peter > --- > hw/timer/cadence_ttc.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c > index d46db3c..35bc880 100644 > --- a/hw/timer/cadence_ttc.c > +++ b/hw/timer/cadence_ttc.c > @@ -208,15 +208,14 @@ static void cadence_timer_sync(CadenceTimerState *s) > s->reg_intr |= (2 << i); > } > } > + if ((x < 0) || (x >= interval)) { > + s->reg_intr |= (s->reg_count & COUNTER_CTRL_INT) ? > + COUNTER_INTR_IV : COUNTER_INTR_OV; > + } > while (x < 0) { > x += interval; > } > s->reg_value = (uint32_t)(x % interval); > - > - if (s->reg_value != x) { > - s->reg_intr |= (s->reg_count & COUNTER_CTRL_INT) ? > - COUNTER_INTR_IV : COUNTER_INTR_OV; > - } > cadence_timer_update(s); > } > > -- > 2.4.5 > >
On 30 June 2015 at 18:38, Peter Crosthwaite <peter.crosthwaite@xilinx.com> wrote: > On Tue, Jun 30, 2015 at 4:58 AM, Johannes Schlatow > <schlatow@ida.ing.tu-bs.de> wrote: >> The interval interrupt is not set if the timer is in decrement mode. >> This is because x >=0 and x < interval after leaving the while-loop. >> >> Signed-off-by: Johannes Schlatow <schlatow@ida.ing.tu-bs.de> > > Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> > > Can this go via target-arm for 2.4 (as a bugfix)? Sure, applied to target-arm.next. -- PMM
diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c index d46db3c..35bc880 100644 --- a/hw/timer/cadence_ttc.c +++ b/hw/timer/cadence_ttc.c @@ -208,15 +208,14 @@ static void cadence_timer_sync(CadenceTimerState *s) s->reg_intr |= (2 << i); } } + if ((x < 0) || (x >= interval)) { + s->reg_intr |= (s->reg_count & COUNTER_CTRL_INT) ? + COUNTER_INTR_IV : COUNTER_INTR_OV; + } while (x < 0) { x += interval; } s->reg_value = (uint32_t)(x % interval); - - if (s->reg_value != x) { - s->reg_intr |= (s->reg_count & COUNTER_CTRL_INT) ? - COUNTER_INTR_IV : COUNTER_INTR_OV; - } cadence_timer_update(s); }
The interval interrupt is not set if the timer is in decrement mode. This is because x >=0 and x < interval after leaving the while-loop. Signed-off-by: Johannes Schlatow <schlatow@ida.ing.tu-bs.de> --- hw/timer/cadence_ttc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)