OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/timer/mss-timerc: Switch to transaction-based ptimer API

Browse Source 
Switch the mss-timer code away from bottom-half based ptimers to
the new transaction-based ptimer API.  This just requires adding
begin/commit calls around the various places that modify the ptimer
state, and using the new ptimer_init() function to create the timer.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20191008171740.9679-20-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2019-10-08 18:17:38 +01:00
parent 1b914994ea
commit 00ee4b0f48
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/timer/mss-timer.c
View File

@ -24,7 +24,6 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/main-loop.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "hw/irq.h" #include "hw/irq.h"
@ -67,6 +66,7 @@ static void timer_update_irq(struct Msf2Timer *st)
qemu_set_irq(st->irq, (ier && isr)); qemu_set_irq(st->irq, (ier && isr));
} }
/* Must be called from within a ptimer_transaction_begin/commit block */
static void timer_update(struct Msf2Timer *st) static void timer_update(struct Msf2Timer *st)
{ {
uint64_t count; uint64_t count;
@ -159,7 +159,9 @@ timer_write(void *opaque, hwaddr offset,
switch (addr) { switch (addr) {
case R_TIM_CTRL: case R_TIM_CTRL:
st->regs[R_TIM_CTRL] = value; st->regs[R_TIM_CTRL] = value;
ptimer_transaction_begin(st->ptimer);
timer_update(st); timer_update(st);
ptimer_transaction_commit(st->ptimer);
break; break;
case R_TIM_RIS: case R_TIM_RIS:
@ -171,7 +173,9 @@ timer_write(void *opaque, hwaddr offset,
case R_TIM_LOADVAL: case R_TIM_LOADVAL:
st->regs[R_TIM_LOADVAL] = value; st->regs[R_TIM_LOADVAL] = value;
if (st->regs[R_TIM_CTRL] & TIMER_CTRL_ENBL) { if (st->regs[R_TIM_CTRL] & TIMER_CTRL_ENBL) {
ptimer_transaction_begin(st->ptimer);
timer_update(st); timer_update(st);
ptimer_transaction_commit(st->ptimer);
} }
break; break;
@ -228,9 +232,10 @@ static void mss_timer_init(Object *obj)
for (i = 0; i < NUM_TIMERS; i++) { for (i = 0; i < NUM_TIMERS; i++) {
struct Msf2Timer *st = &t->timers[i]; struct Msf2Timer *st = &t->timers[i];
st->bh = qemu_bh_new(timer_hit, st); st->ptimer = ptimer_init(timer_hit, st, PTIMER_POLICY_DEFAULT);
st->ptimer = ptimer_init_with_bh(st->bh, PTIMER_POLICY_DEFAULT); ptimer_transaction_begin(st->ptimer);
ptimer_set_freq(st->ptimer, t->freq_hz); ptimer_set_freq(st->ptimer, t->freq_hz);
ptimer_transaction_commit(st->ptimer);
sysbus_init_irq(SYS_BUS_DEVICE(obj), &st->irq); sysbus_init_irq(SYS_BUS_DEVICE(obj), &st->irq);
} }

1
include/hw/timer/mss-timer.h
View File

@ -46,7 +46,6 @@
#define R_TIM1_MAX 6 #define R_TIM1_MAX 6
struct Msf2Timer { struct Msf2Timer {
QEMUBH *bh;
ptimer_state *ptimer; ptimer_state *ptimer;
uint32_t regs[R_TIM1_MAX]; uint32_t regs[R_TIM1_MAX];