[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/32] hw/ptimer: Add "no counter round down" policy
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 16/32] hw/ptimer: Add "no counter round down" policy |
Date: |
Mon, 24 Oct 2016 18:25:12 +0100 |
From: Dmitry Osipenko <address@hidden>
For most of the timers counter starts to decrement after first period
expires. Due to rounding down performed by the ptimer_get_count, it returns
counter - 1 for the running timer, so that for the ptimer user it looks
like counter gets decremented immediately after running the timer. Add "no
counter round down" policy that provides correct behaviour for those timers.
Signed-off-by: Dmitry Osipenko <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/core/ptimer.c | 9 +++++++++
include/hw/ptimer.h | 4 ++++
2 files changed, 13 insertions(+)
diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c
index 2a69daf..3af82af 100644
--- a/hw/core/ptimer.c
+++ b/hw/core/ptimer.c
@@ -231,6 +231,15 @@ uint64_t ptimer_get_count(ptimer_state *s)
}
}
}
+
+ if (s->policy_mask & PTIMER_POLICY_NO_COUNTER_ROUND_DOWN) {
+ /* If now == last then delta == limit, i.e. the counter already
+ represents the correct value. It would be rounded down a 1ns
+ later. */
+ if (now != last) {
+ counter += 1;
+ }
+ }
} else {
counter = s->delta;
}
diff --git a/include/hw/ptimer.h b/include/hw/ptimer.h
index 5455340..48cccbd 100644
--- a/include/hw/ptimer.h
+++ b/include/hw/ptimer.h
@@ -51,6 +51,10 @@
* immediately, but after a one period. */
#define PTIMER_POLICY_NO_IMMEDIATE_RELOAD (1 << 3)
+/* Make counter value of the running timer represent the actual value and
+ * not the one less. */
+#define PTIMER_POLICY_NO_COUNTER_ROUND_DOWN (1 << 4)
+
/* ptimer.c */
typedef struct ptimer_state ptimer_state;
typedef void (*ptimer_cb)(void *opaque);
--
2.7.4
- [Qemu-devel] [PULL 00/32] target-arm queue, Peter Maydell, 2016/10/24
- [Qemu-devel] [PULL 01/32] migration: Remove static allocation of xzblre cache buffer, Peter Maydell, 2016/10/24
- [Qemu-devel] [PULL 20/32] arm_mptimer: Convert to use ptimer, Peter Maydell, 2016/10/24
- [Qemu-devel] [PULL 23/32] ARM: Virt: ACPI: Build an IORT table with RC and ITS nodes, Peter Maydell, 2016/10/24
- [Qemu-devel] [PULL 22/32] ACPI: Add IORT Structure definition, Peter Maydell, 2016/10/24
- [Qemu-devel] [PULL 29/32] hw/arm: QOM'ify strongarm.c, Peter Maydell, 2016/10/24
- [Qemu-devel] [PULL 30/32] hw/display: QOM'ify pl110.c, Peter Maydell, 2016/10/24
- [Qemu-devel] [PULL 16/32] hw/ptimer: Add "no counter round down" policy,
Peter Maydell <=
- [Qemu-devel] [PULL 27/32] hw/arm: QOM'ify musicpal.c, Peter Maydell, 2016/10/24
- [Qemu-devel] [PULL 24/32] timer: a9gtimer: remove loop to auto-increment comparator, Peter Maydell, 2016/10/24
- [Qemu-devel] [PULL 12/32] hw/ptimer: Add "no immediate trigger" policy, Peter Maydell, 2016/10/24
- [Qemu-devel] [PULL 14/32] hw/ptimer: Add "no immediate reload" policy, Peter Maydell, 2016/10/24
- [Qemu-devel] [PULL 07/32] hw/arm/virt: Set minimum_page_bits to 12, Peter Maydell, 2016/10/24
- [Qemu-devel] [PULL 11/32] tests: ptimer: Add tests for "continuous trigger" policy, Peter Maydell, 2016/10/24
- [Qemu-devel] [PULL 06/32] target-arm: Make page size a runtime setting, Peter Maydell, 2016/10/24
- [Qemu-devel] [PULL 25/32] i2c: Fix SMBus read transactions to avoid double events, Peter Maydell, 2016/10/24
- [Qemu-devel] [PULL 26/32] timer: stm32f2xx_timer: add check for prescaler value, Peter Maydell, 2016/10/24
- [Qemu-devel] [PULL 31/32] target-arm: Implement new HLT trap for semihosting, Peter Maydell, 2016/10/24