ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

timer: a9gtimer: remove loop to auto-increment comparator 

ARM A9MP processor has a peripheral timer with an auto-increment
register, which holds an increment step value. A user could set
this value to zero. When auto-increment control bit is enabled,
it leads to an infinite loop in 'a9_gtimer_update' while
updating comparator value. Remove this loop incrementing the
comparator value.

Reported-by: Li Qiang <liqiang6-s@360.cn>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Message-id: 1476733226-11635-1-git-send-email-ppandit@redhat.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Prasad J Pandit 2016-10-24 16:26:54 +01:00 committed by Peter Maydell
parent e78f122214
commit 6be8f5e262
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/timer/a9gtimer.c
View File

@ -82,15 +82,15 @@ static void a9_gtimer_update(A9GTimerState *s, bool sync)
if ((s->control & R_CONTROL_TIMER_ENABLE) && if ((s->control & R_CONTROL_TIMER_ENABLE) &&
(gtb->control & R_CONTROL_COMP_ENABLE)) { (gtb->control & R_CONTROL_COMP_ENABLE)) {
/* R2p0+, where the compare function is >= */ /* R2p0+, where the compare function is >= */
while (gtb->compare < update.new) { if (gtb->compare < update.new) {
DB_PRINT("Compare event happened for CPU %d\n", i); DB_PRINT("Compare event happened for CPU %d\n", i);
gtb->status = 1; gtb->status = 1;
if (gtb->control & R_CONTROL_AUTO_INCREMENT) { if (gtb->control & R_CONTROL_AUTO_INCREMENT && gtb->inc) {
DB_PRINT("Auto incrementing timer compare by %" PRId32 "\n", uint64_t inc =
gtb->inc); QEMU_ALIGN_UP(update.new - gtb->compare, gtb->inc);
gtb->compare += gtb->inc; DB_PRINT("Auto incrementing timer compare by %"
} else { PRId64 "\n", inc);
break; gtb->compare += inc;
} }
} }
cdiff = (int64_t)gtb->compare - (int64_t)update.new + 1; cdiff = (int64_t)gtb->compare - (int64_t)update.new + 1;