Re: [Qemu-arm] [Qemu-devel] [PATCH v7] timer: a9gtimer: remove loop to auto-increment comparator

[P J P]

+-- On Tue, 18 Oct 2016, P J P wrote --+
| Use QEMU_ALIGN_UP instead of QEMU_ALIGN_DOWN
|   -> https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg03788.html
| 
| diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c
| index 772f85f..ce1dc63 100644
| --- a/hw/timer/a9gtimer.c
| +++ b/hw/timer/a9gtimer.c
| @@ -82,15 +82,15 @@ static void a9_gtimer_update(A9GTimerState *s, bool sync)
|          if ((s->control & R_CONTROL_TIMER_ENABLE) &&
| -            while (gtb->compare < update.new) {
| +            if (gtb->compare < update.new) {
|                  DB_PRINT("Compare event happened for CPU %d\n", i);
|                  gtb->status = 1;
| -                if (gtb->control & R_CONTROL_AUTO_INCREMENT) {
| -                    DB_PRINT("Auto incrementing timer compare by %" PRId32 
"\n",
| -                             gtb->inc);
| -                    gtb->compare += gtb->inc;
| -                } else {
| -                    break;
| +                if (gtb->control & R_CONTROL_AUTO_INCREMENT && gtb->inc) {
| +                    uint64_t inc =
| +                        QEMU_ALIGN_UP(update.new - gtb->compare, gtb->inc);
| +                    DB_PRINT("Auto incrementing timer compare by %"
| +                                                        PRId64 "\n", inc);
| +                    gtb->compare += inc;
|                  }
|              }

Ping..!
--
Prasad J Pandit / Red Hat Product Security Team
47AF CE69 3A90 54AA 9045 1053 DD13 3D32 FE5B 041F