All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org, qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH v2 20/21] hw/watchdog/cmsdk-apb-watchdog.c: Switch to transaction-based ptimer API
Date: Tue,  8 Oct 2019 18:17:39 +0100	[thread overview]
Message-ID: <20191008171740.9679-21-peter.maydell@linaro.org> (raw)
In-Reply-To: <20191008171740.9679-1-peter.maydell@linaro.org>

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>
---
 hw/watchdog/cmsdk-apb-watchdog.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c
index e42c3ebd29d..e6f3b93c44e 100644
--- a/hw/watchdog/cmsdk-apb-watchdog.c
+++ b/hw/watchdog/cmsdk-apb-watchdog.c
@@ -24,7 +24,6 @@
 #include "qemu/log.h"
 #include "trace.h"
 #include "qapi/error.h"
-#include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "sysemu/watchdog.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
          * we're counting.
          */
+        ptimer_transaction_begin(s->timer);
         ptimer_set_limit(s->timer, value, 1);
         ptimer_run(s->timer, 0);
+        ptimer_transaction_commit(s->timer);
         break;
     case A_WDOGCONTROL:
         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;
     case A_WDOGINTCLR:
         s->intstatus = 0;
+        ptimer_transaction_begin(s->timer);
         ptimer_set_count(s->timer, ptimer_get_limit(s->timer));
+        ptimer_transaction_commit(s->timer);
         cmsdk_apb_watchdog_update(s);
         break;
     case A_WDOGLOCK:
@@ -299,8 +302,10 @@ static void cmsdk_apb_watchdog_reset(DeviceState *dev)
     s->itop = 0;
     s->resetstatus = 0;
     /* Set the limit and the count */
+    ptimer_transaction_begin(s->timer);
     ptimer_set_limit(s->timer, 0xffffffff, 1);
     ptimer_run(s->timer, 0);
+    ptimer_transaction_commit(s->timer);
 }
 
 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)
 {
     CMSDKAPBWatchdog *s = CMSDK_APB_WATCHDOG(dev);
-    QEMUBH *bh;
 
     if (s->wdogclk_frq == 0) {
         error_setg(errp,
@@ -328,14 +332,15 @@ static void cmsdk_apb_watchdog_realize(DeviceState *dev, Error **errp)
         return;
     }
 
-    bh = qemu_bh_new(cmsdk_apb_watchdog_tick, s);
-    s->timer = ptimer_init_with_bh(bh,
+    s->timer = ptimer_init(cmsdk_apb_watchdog_tick, s,
                            PTIMER_POLICY_WRAP_AFTER_ONE_PERIOD |
                            PTIMER_POLICY_TRIGGER_ONLY_ON_DECREMENT |
                            PTIMER_POLICY_NO_IMMEDIATE_RELOAD |
                            PTIMER_POLICY_NO_COUNTER_ROUND_DOWN);
 
+    ptimer_transaction_begin(s->timer);
     ptimer_set_freq(s->timer, s->wdogclk_frq);
+    ptimer_transaction_commit(s->timer);
 }
 
 static const VMStateDescription cmsdk_apb_watchdog_vmstate = {
-- 
2.20.1



  parent reply	other threads:[~2019-10-08 17:49 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-08 17:17 [PATCH v2 00/21] transaction-based ptimer API Peter Maydell
2019-10-08 17:17 ` [PATCH v2 01/21] ptimer: Rename ptimer_init() to ptimer_init_with_bh() Peter Maydell
2019-10-08 17:17 ` [PATCH v2 02/21] ptimer: Provide new transaction-based API Peter Maydell
2019-10-09  1:44   ` Richard Henderson
2019-10-08 17:17 ` [PATCH v2 03/21] tests/ptimer-test: Switch to transaction-based ptimer API Peter Maydell
2019-10-09  1:46   ` Richard Henderson
2019-10-08 17:17 ` [PATCH v2 04/21] hw/timer/arm_timer.c: " Peter Maydell
2019-10-09  1:47   ` Richard Henderson
2019-10-08 17:17 ` [PATCH v2 05/21] hw/arm/musicpal.c: " Peter Maydell
2019-10-09  1:48   ` Richard Henderson
2019-10-08 17:17 ` [PATCH v2 06/21] hw/timer/allwinner-a10-pit.c: " Peter Maydell
2019-10-09  1:49   ` Richard Henderson
2019-10-08 17:17 ` [PATCH v2 07/21] hw/timer/arm_mptimer.c: " Peter Maydell
2019-10-09  1:50   ` Richard Henderson
2019-10-08 17:17 ` [PATCH v2 08/21] hw/timer/cmsdk-apb-dualtimer.c: " Peter Maydell
2019-10-09  1:51   ` Richard Henderson
2019-10-08 17:17 ` [PATCH v2 09/21] hw/timer/cmsdk-apb-timer.c: " Peter Maydell
2019-10-09  1:52   ` Richard Henderson
2019-10-08 17:17 ` [PATCH v2 10/21] hw/timer/digic-timer.c: " Peter Maydell
2019-10-09  1:53   ` Richard Henderson
2019-10-08 17:17 ` [PATCH v2 11/21] hw/timer/exynos4210_mct.c: Switch GFRC " Peter Maydell
2019-10-09  1:56   ` Richard Henderson
2019-10-09  1:58     ` Richard Henderson
2019-10-09 13:49       ` Peter Maydell
2019-10-09  1:58   ` Richard Henderson
2019-10-08 17:17 ` [PATCH v2 12/21] hw/timer/exynos4210_mct.c: Switch LFRC " Peter Maydell
2019-10-09  1:58   ` Richard Henderson
2019-10-08 17:17 ` [PATCH v2 13/21] hw/timer/exynos4210_mct.c: Switch ltick " Peter Maydell
2019-10-09  1:59   ` Richard Henderson
2019-10-08 17:17 ` [PATCH v2 14/21] hw/timer/exynos4210_pwm.c: Switch " Peter Maydell
2019-10-09  2:00   ` Richard Henderson
2019-10-08 17:17 ` [PATCH v2 15/21] hw/timer/exynos4210_rtc.c: Switch 1Hz ptimer to transaction-based API Peter Maydell
2019-10-09  2:01   ` Richard Henderson
2019-10-08 17:17 ` [PATCH v2 16/21] hw/timer/exynos4210_rtc.c: Switch main " Peter Maydell
2019-10-09  2:02   ` Richard Henderson
2019-10-08 17:17 ` [PATCH v2 17/21] hw/timer/imx_epit.c: Switch to transaction-based ptimer API Peter Maydell
2019-10-09  2:03   ` Richard Henderson
2019-10-08 17:17 ` [PATCH v2 18/21] hw/timer/imx_gpt.c: " Peter Maydell
2019-10-09  2:04   ` Richard Henderson
2019-10-08 17:17 ` [PATCH v2 19/21] hw/timer/mss-timerc: " Peter Maydell
2019-10-09  2:05   ` Richard Henderson
2019-10-08 17:17 ` Peter Maydell [this message]
2019-10-09  2:06   ` [PATCH v2 20/21] hw/watchdog/cmsdk-apb-watchdog.c: " Richard Henderson
2019-10-08 17:17 ` [PATCH v2 21/21] hw/net/lan9118.c: " Peter Maydell
2019-10-09  2:07   ` Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191008171740.9679-21-peter.maydell@linaro.org \
    --to=peter.maydell@linaro.org \
    --cc=pbonzini@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.