* [Qemu-devel] [PATCH v7] timer: a9gtimer: remove loop to auto-increment comparator
@ 2016-10-17 19:33 P J P
0 siblings, 0 replies; 4+ messages in thread
From: P J P @ 2016-10-17 19:33 UTC (permalink / raw)
To: Qemu Developers; +Cc: Peter Maydell, Li Qiang, qemu-arm
===
>From 632498fa33248bb990b08f246c98f3f318aa631c Mon Sep 17 00:00:00 2001
From: Prasad J Pandit <pjp@fedoraproject.org>
Date: Mon, 17 Oct 2016 23:56:01 +0530
Subject: [PATCH v7] 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>
---
hw/timer/a9gtimer.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
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) &&
(gtb->control & R_CONTROL_COMP_ENABLE)) {
/* 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);
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;
}
}
cdiff = (int64_t)gtb->compare - (int64_t)update.new + 1;
--
2.7.4
===
Sorry about inline text here, git send-email is showing an error about CA path
CA path "'/etc/mail/'" does not exist at /usr/libexec/git-core/git-send-email line 1220
trying to fix it.
Thank you.
--
Prasad J Pandit / Red Hat Product Security Team
47AF CE69 3A90 54AA 9045 1053 DD13 3D32 FE5B 041F
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v7] timer: a9gtimer: remove loop to auto-increment comparator
2016-10-17 19:40 P J P
2016-10-24 5:34 ` P J P
@ 2016-10-24 12:47 ` Peter Maydell
1 sibling, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2016-10-24 12:47 UTC (permalink / raw)
To: P J P; +Cc: Qemu Developers, Li Qiang, qemu-arm, Prasad J Pandit
On 17 October 2016 at 20:40, P J P <ppandit@redhat.com> wrote:
> From: Prasad J Pandit <pjp@fedoraproject.org>
>
> 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>
> ---
> hw/timer/a9gtimer.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> Use QEMU_ALIGN_UP instead of QEMU_ALIGN_DOWN
> -> https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg03788.html
Applied to target-arm.next, thanks.
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v7] timer: a9gtimer: remove loop to auto-increment comparator
2016-10-17 19:40 P J P
@ 2016-10-24 5:34 ` P J P
2016-10-24 12:47 ` Peter Maydell
1 sibling, 0 replies; 4+ messages in thread
From: P J P @ 2016-10-24 5:34 UTC (permalink / raw)
To: Peter Maydell; +Cc: Qemu Developers, qemu-arm, Li Qiang
+-- 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH v7] timer: a9gtimer: remove loop to auto-increment comparator
@ 2016-10-17 19:40 P J P
2016-10-24 5:34 ` P J P
2016-10-24 12:47 ` Peter Maydell
0 siblings, 2 replies; 4+ messages in thread
From: P J P @ 2016-10-17 19:40 UTC (permalink / raw)
To: Qemu Developers; +Cc: Peter Maydell, Li Qiang, qemu-arm, Prasad J Pandit
From: Prasad J Pandit <pjp@fedoraproject.org>
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>
---
hw/timer/a9gtimer.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
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) &&
(gtb->control & R_CONTROL_COMP_ENABLE)) {
/* 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);
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;
}
}
cdiff = (int64_t)gtb->compare - (int64_t)update.new + 1;
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-10-24 12:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-17 19:33 [Qemu-devel] [PATCH v7] timer: a9gtimer: remove loop to auto-increment comparator P J P
2016-10-17 19:40 P J P
2016-10-24 5:34 ` P J P
2016-10-24 12:47 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.