@@ -19,8 +19,9 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "hw/ptimer.h"
#include "hw/timer/arm_mptimer.h"
-#include "qemu/timer.h"
+#include "qemu/main-loop.h"
#include "qom/cpu.h"
/* This device implements the per-cpu private timer and watchdog block
@@ -47,28 +48,10 @@ static inline uint32_t timerblock_scale(TimerBlock *tb)
return (((tb->control >> 8) & 0xff) + 1) * 10;
}
-static void timerblock_reload(TimerBlock *tb, int restart)
-{
- if (tb->count == 0) {
- return;
- }
- if (restart) {
- tb->tick = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
- }
- tb->tick += (int64_t)tb->count * timerblock_scale(tb);
- timer_mod(tb->timer, tb->tick);
-}
-
static void timerblock_tick(void *opaque)
{
TimerBlock *tb = (TimerBlock *)opaque;
tb->status = 1;
- if (tb->control & 2) {
- tb->count = tb->load;
- timerblock_reload(tb, 0);
- } else {
- tb->count = 0;
- }
timerblock_update_irq(tb);
}
@@ -76,21 +59,11 @@ static uint64_t timerblock_read(void *opaque, hwaddr addr,
unsigned size)
{
TimerBlock *tb = (TimerBlock *)opaque;
- int64_t val;
switch (addr) {
case 0: /* Load */
return tb->load;
case 4: /* Counter. */
- if (((tb->control & 1) == 0) || (tb->count == 0)) {
- return 0;
- }
- /* Slow and ugly, but hopefully won't happen too often. */
- val = tb->tick - qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
- val /= timerblock_scale(tb);
- if (val < 0) {
- val = 0;
- }
- return val;
+ return ptimer_get_count(tb->timer);
case 8: /* Control. */
return tb->control;
case 12: /* Interrupt status. */
@@ -108,32 +81,39 @@ static void timerblock_write(void *opaque, hwaddr addr,
switch (addr) {
case 0: /* Load */
tb->load = value;
- /* Fall through. */
- case 4: /* Counter. */
- if ((tb->control & 1) && tb->count) {
- /* Cancel the previous timer. */
- timer_del(tb->timer);
+ /* Setting load to 0 for the running timer stops it without
+ * triggering the interrupt. */
+ if (value == 0) {
+ ptimer_stop(tb->timer);
+ }
+ ptimer_set_limit(tb->timer, value, 0);
+ ptimer_set_count(tb->timer, value);
+ if ((tb->control & 1) && (value != 0)) {
+ ptimer_run(tb->timer, !(tb->control & 2));
}
- tb->count = value;
- if (tb->control & 1) {
- timerblock_reload(tb, 1);
+ break;
+ case 4: /* Counter. */
+ /* Setting counter to 0 for the timer running in one-shot mode
+ * stops it without triggering the interrupt. */
+ if (!(tb->control & 2) && (value == 0)) {
+ ptimer_stop(tb->timer);
}
+ /* While in the periodic mode, the running timer should restart
+ * counting without triggering the interrupt. Do it by setting
+ * the counter to the load value. */
+ ptimer_set_count(tb->timer,
+ ((tb->control & 3) == 3) ? tb->load : value);
break;
case 8: /* Control. */
old = tb->control;
tb->control = value;
- if (value & 1) {
- if ((old & 1) && (tb->count != 0)) {
- /* Do nothing if timer is ticking right now. */
- break;
- }
- if (tb->control & 2) {
- tb->count = tb->load;
- }
- timerblock_reload(tb, 1);
- } else if (old & 1) {
- /* Shutdown the timer. */
- timer_del(tb->timer);
+ /* Timer mode switch requires ptimer to be stopped. */
+ if (!(tb->control & 1) || ((old & 2) != (tb->control & 2))) {
+ ptimer_stop(tb->timer);
+ }
+ if ((tb->control & 1) && (tb->load != 0)) {
+ ptimer_set_period(tb->timer, timerblock_scale(tb));
+ ptimer_run(tb->timer, !(tb->control & 2));
}
break;
case 12: /* Interrupt status. */
@@ -184,13 +164,12 @@ static const MemoryRegionOps timerblock_ops = {
static void timerblock_reset(TimerBlock *tb)
{
- tb->count = 0;
tb->load = 0;
tb->control = 0;
tb->status = 0;
- tb->tick = 0;
if (tb->timer) {
- timer_del(tb->timer);
+ ptimer_stop(tb->timer);
+ ptimer_set_count(tb->timer, 0);
}
}
@@ -235,7 +214,8 @@ static void arm_mptimer_realize(DeviceState *dev, Error **errp)
*/
for (i = 0; i < s->num_cpu; i++) {
TimerBlock *tb = &s->timerblock[i];
- tb->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, timerblock_tick, tb);
+ QEMUBH *bh = qemu_bh_new(timerblock_tick, tb);
+ tb->timer = ptimer_init(bh);
sysbus_init_irq(sbd, &tb->irq);
memory_region_init_io(&tb->iomem, OBJECT(s), &timerblock_ops, tb,
"arm_mptimer_timerblock", 0x20);
@@ -245,15 +225,13 @@ static void arm_mptimer_realize(DeviceState *dev, Error **errp)
static const VMStateDescription vmstate_timerblock = {
.name = "arm_mptimer_timerblock",
- .version_id = 2,
- .minimum_version_id = 2,
+ .version_id = 3,
+ .minimum_version_id = 3,
.fields = (VMStateField[]) {
- VMSTATE_UINT32(count, TimerBlock),
VMSTATE_UINT32(load, TimerBlock),
VMSTATE_UINT32(control, TimerBlock),
VMSTATE_UINT32(status, TimerBlock),
- VMSTATE_INT64(tick, TimerBlock),
- VMSTATE_TIMER_PTR(timer, TimerBlock),
+ VMSTATE_PTIMER(timer, TimerBlock),
VMSTATE_END_OF_LIST()
}
};
@@ -27,12 +27,10 @@
/* State of a single timer or watchdog block */
typedef struct {
- uint32_t count;
uint32_t load;
uint32_t control;
uint32_t status;
- int64_t tick;
- QEMUTimer *timer;
+ struct ptimer_state *timer;
qemu_irq irq;
MemoryRegion iomem;
} TimerBlock;
Current ARM MPTimer implementation uses QEMUTimer for the actual timer, this implementation isn't complete and mostly tries to duplicate of what generic ptimer is already doing fine. Conversion to ptimer brings the following benefits and fixes: - Simple timer pausing implementation - Fixes counter value preservation after stopping the timer - Code simplification and reduction Bump timerblock VMSD to version 3, since VMState is changed and is not compatible with the previuos implementation. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> --- hw/timer/arm_mptimer.c | 96 ++++++++++++++++-------------------------- include/hw/timer/arm_mptimer.h | 4 +- 2 files changed, 38 insertions(+), 62 deletions(-)