mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/timer/xilinx_timer.c: Switch to transaction-based ptimer API

Browse Source 
Switch the xilinx_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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20191017132122.4402-3-peter.maydell@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2019-10-17 14:21:21 +01:00
parent 383a6753b2
commit 8d986979be
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/timer/xilinx_timer.c
View File

@ -28,7 +28,6 @@
#include "hw/ptimer.h" #include "hw/ptimer.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "qemu/main-loop.h"
#include "qemu/module.h" #include "qemu/module.h"
#define D(x) #define D(x)
@ -52,7 +51,6 @@
struct xlx_timer struct xlx_timer
{ {
QEMUBH *bh;
ptimer_state *ptimer; ptimer_state *ptimer;
void *parent; void *parent;
int nr; /* for debug. */ int nr; /* for debug. */
@ -134,6 +132,7 @@ timer_read(void *opaque, hwaddr addr, unsigned int size)
return r; return r;
} }
/* Must be called inside ptimer transaction block */
static void timer_enable(struct xlx_timer *xt) static void timer_enable(struct xlx_timer *xt)
{ {
uint64_t count; uint64_t count;
@ -174,8 +173,11 @@ timer_write(void *opaque, hwaddr addr,
value &= ~TCSR_TINT; value &= ~TCSR_TINT;
xt->regs[addr] = value & 0x7ff; xt->regs[addr] = value & 0x7ff;
if (value & TCSR_ENT) if (value & TCSR_ENT) {
ptimer_transaction_begin(xt->ptimer);
timer_enable(xt); timer_enable(xt);
ptimer_transaction_commit(xt->ptimer);
}
break; break;
default: default:
@ -220,9 +222,10 @@ static void xilinx_timer_realize(DeviceState *dev, Error **errp)
xt->parent = t; xt->parent = t;
xt->nr = i; xt->nr = i;
xt->bh = qemu_bh_new(timer_hit, xt); xt->ptimer = ptimer_init(timer_hit, xt, PTIMER_POLICY_DEFAULT);
xt->ptimer = ptimer_init_with_bh(xt->bh, PTIMER_POLICY_DEFAULT); ptimer_transaction_begin(xt->ptimer);
ptimer_set_freq(xt->ptimer, t->freq_hz); ptimer_set_freq(xt->ptimer, t->freq_hz);
ptimer_transaction_commit(xt->ptimer);
} }
memory_region_init_io(&t->mmio, OBJECT(t), &timer_ops, t, "xlnx.xps-timer", memory_region_init_io(&t->mmio, OBJECT(t), &timer_ops, t, "xlnx.xps-timer",