mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-19 16:12:40 -06:00
hw/watchdog/cmsdk-apb-watchdog.c: Switch to transaction-based ptimer API
Switch the cmsdk-apb-watchdog 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-21-peter.maydell@linaro.org
This commit is contained in:
parent
00ee4b0f48
commit
8c9dbc6236
1 changed files with 9 additions and 4 deletions
|
@ -24,7 +24,6 @@
|
||||||
#include "qemu/log.h"
|
#include "qemu/log.h"
|
||||||
#include "trace.h"
|
#include "trace.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "qemu/main-loop.h"
|
|
||||||
#include "qemu/module.h"
|
#include "qemu/module.h"
|
||||||
#include "sysemu/watchdog.h"
|
#include "sysemu/watchdog.h"
|
||||||
#include "hw/sysbus.h"
|
#include "hw/sysbus.h"
|
||||||
|
@ -200,8 +199,10 @@ static void cmsdk_apb_watchdog_write(void *opaque, hwaddr offset,
|
||||||
* Reset the load value and the current count, and make sure
|
* Reset the load value and the current count, and make sure
|
||||||
* we're counting.
|
* we're counting.
|
||||||
*/
|
*/
|
||||||
|
ptimer_transaction_begin(s->timer);
|
||||||
ptimer_set_limit(s->timer, value, 1);
|
ptimer_set_limit(s->timer, value, 1);
|
||||||
ptimer_run(s->timer, 0);
|
ptimer_run(s->timer, 0);
|
||||||
|
ptimer_transaction_commit(s->timer);
|
||||||
break;
|
break;
|
||||||
case A_WDOGCONTROL:
|
case A_WDOGCONTROL:
|
||||||
if (s->is_luminary && 0 != (R_WDOGCONTROL_INTEN_MASK & s->control)) {
|
if (s->is_luminary && 0 != (R_WDOGCONTROL_INTEN_MASK & s->control)) {
|
||||||
|
@ -217,7 +218,9 @@ static void cmsdk_apb_watchdog_write(void *opaque, hwaddr offset,
|
||||||
break;
|
break;
|
||||||
case A_WDOGINTCLR:
|
case A_WDOGINTCLR:
|
||||||
s->intstatus = 0;
|
s->intstatus = 0;
|
||||||
|
ptimer_transaction_begin(s->timer);
|
||||||
ptimer_set_count(s->timer, ptimer_get_limit(s->timer));
|
ptimer_set_count(s->timer, ptimer_get_limit(s->timer));
|
||||||
|
ptimer_transaction_commit(s->timer);
|
||||||
cmsdk_apb_watchdog_update(s);
|
cmsdk_apb_watchdog_update(s);
|
||||||
break;
|
break;
|
||||||
case A_WDOGLOCK:
|
case A_WDOGLOCK:
|
||||||
|
@ -299,8 +302,10 @@ static void cmsdk_apb_watchdog_reset(DeviceState *dev)
|
||||||
s->itop = 0;
|
s->itop = 0;
|
||||||
s->resetstatus = 0;
|
s->resetstatus = 0;
|
||||||
/* Set the limit and the count */
|
/* Set the limit and the count */
|
||||||
|
ptimer_transaction_begin(s->timer);
|
||||||
ptimer_set_limit(s->timer, 0xffffffff, 1);
|
ptimer_set_limit(s->timer, 0xffffffff, 1);
|
||||||
ptimer_run(s->timer, 0);
|
ptimer_run(s->timer, 0);
|
||||||
|
ptimer_transaction_commit(s->timer);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void cmsdk_apb_watchdog_init(Object *obj)
|
static void cmsdk_apb_watchdog_init(Object *obj)
|
||||||
|
@ -320,7 +325,6 @@ static void cmsdk_apb_watchdog_init(Object *obj)
|
||||||
static void cmsdk_apb_watchdog_realize(DeviceState *dev, Error **errp)
|
static void cmsdk_apb_watchdog_realize(DeviceState *dev, Error **errp)
|
||||||
{
|
{
|
||||||
CMSDKAPBWatchdog *s = CMSDK_APB_WATCHDOG(dev);
|
CMSDKAPBWatchdog *s = CMSDK_APB_WATCHDOG(dev);
|
||||||
QEMUBH *bh;
|
|
||||||
|
|
||||||
if (s->wdogclk_frq == 0) {
|
if (s->wdogclk_frq == 0) {
|
||||||
error_setg(errp,
|
error_setg(errp,
|
||||||
|
@ -328,14 +332,15 @@ static void cmsdk_apb_watchdog_realize(DeviceState *dev, Error **errp)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
bh = qemu_bh_new(cmsdk_apb_watchdog_tick, s);
|
s->timer = ptimer_init(cmsdk_apb_watchdog_tick, s,
|
||||||
s->timer = ptimer_init_with_bh(bh,
|
|
||||||
PTIMER_POLICY_WRAP_AFTER_ONE_PERIOD |
|
PTIMER_POLICY_WRAP_AFTER_ONE_PERIOD |
|
||||||
PTIMER_POLICY_TRIGGER_ONLY_ON_DECREMENT |
|
PTIMER_POLICY_TRIGGER_ONLY_ON_DECREMENT |
|
||||||
PTIMER_POLICY_NO_IMMEDIATE_RELOAD |
|
PTIMER_POLICY_NO_IMMEDIATE_RELOAD |
|
||||||
PTIMER_POLICY_NO_COUNTER_ROUND_DOWN);
|
PTIMER_POLICY_NO_COUNTER_ROUND_DOWN);
|
||||||
|
|
||||||
|
ptimer_transaction_begin(s->timer);
|
||||||
ptimer_set_freq(s->timer, s->wdogclk_frq);
|
ptimer_set_freq(s->timer, s->wdogclk_frq);
|
||||||
|
ptimer_transaction_commit(s->timer);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const VMStateDescription cmsdk_apb_watchdog_vmstate = {
|
static const VMStateDescription cmsdk_apb_watchdog_vmstate = {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue