diff options
author | Johannes Schlatow <schlatow@ida.ing.tu-bs.de> | 2015-07-06 10:05:44 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-06 10:05:44 +0100 |
commit | a7ffaf5c96e26820edffa94eeac766fe60bfdd31 (patch) | |
tree | 8a7aafc46372276c3273fa095dcb6b101cd10653 | |
parent | 2a6332d968297266dbabf9d33f959e3a5efdd0f9 (diff) | |
download | qemu-a7ffaf5c96e26820edffa94eeac766fe60bfdd31.zip qemu-a7ffaf5c96e26820edffa94eeac766fe60bfdd31.tar.gz qemu-a7ffaf5c96e26820edffa94eeac766fe60bfdd31.tar.bz2 |
Fix interval interrupt of cadence ttc when timer is in decrement mode
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>
Message-id: 20150630135821.51f3b4fd@johanness-latitude
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r-- | hw/timer/cadence_ttc.c | 9 |
1 files 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); } |