From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org, qemu-devel@nongnu.org
Cc: "Damien Hedde" <damien.hedde@greensocs.com>,
"Luc Michel" <luc@lmichel.fr>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PATCH 20/25] hw/watchdog/cmsdk-apb-watchdog: Convert to use Clock input
Date: Thu, 21 Jan 2021 19:06:17 +0000 [thread overview]
Message-ID: <20210121190622.22000-21-peter.maydell@linaro.org> (raw)
In-Reply-To: <20210121190622.22000-1-peter.maydell@linaro.org>
Switch the CMSDK APB watchdog device over to using its Clock input;
the wdogclk_frq property is now ignored.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/watchdog/cmsdk-apb-watchdog.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c
index b03bcb73628..9cad0c67da4 100644
--- a/hw/watchdog/cmsdk-apb-watchdog.c
+++ b/hw/watchdog/cmsdk-apb-watchdog.c
@@ -310,6 +310,15 @@ static void cmsdk_apb_watchdog_reset(DeviceState *dev)
ptimer_transaction_commit(s->timer);
}
+static void cmsdk_apb_watchdog_clk_update(void *opaque)
+{
+ CMSDKAPBWatchdog *s = CMSDK_APB_WATCHDOG(opaque);
+
+ ptimer_transaction_begin(s->timer);
+ ptimer_set_period_from_clock(s->timer, s->wdogclk, 1);
+ ptimer_transaction_commit(s->timer);
+}
+
static void cmsdk_apb_watchdog_init(Object *obj)
{
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
@@ -319,7 +328,8 @@ static void cmsdk_apb_watchdog_init(Object *obj)
s, "cmsdk-apb-watchdog", 0x1000);
sysbus_init_mmio(sbd, &s->iomem);
sysbus_init_irq(sbd, &s->wdogint);
- s->wdogclk = qdev_init_clock_in(DEVICE(s), "WDOGCLK", NULL, NULL);
+ s->wdogclk = qdev_init_clock_in(DEVICE(s), "WDOGCLK",
+ cmsdk_apb_watchdog_clk_update, s);
s->is_luminary = false;
s->id = cmsdk_apb_watchdog_id;
@@ -329,9 +339,9 @@ static void cmsdk_apb_watchdog_realize(DeviceState *dev, Error **errp)
{
CMSDKAPBWatchdog *s = CMSDK_APB_WATCHDOG(dev);
- if (s->wdogclk_frq == 0) {
+ if (!clock_has_source(s->wdogclk)) {
error_setg(errp,
- "CMSDK APB watchdog: wdogclk-frq property must be set");
+ "CMSDK APB watchdog: WDOGCLK clock must be connected");
return;
}
@@ -342,7 +352,7 @@ static void cmsdk_apb_watchdog_realize(DeviceState *dev, Error **errp)
PTIMER_POLICY_NO_COUNTER_ROUND_DOWN);
ptimer_transaction_begin(s->timer);
- ptimer_set_freq(s->timer, s->wdogclk_frq);
+ ptimer_set_period_from_clock(s->timer, s->wdogclk, 1);
ptimer_transaction_commit(s->timer);
}
--
2.20.1
next prev parent reply other threads:[~2021-01-21 19:33 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 19:05 [PATCH 00/25] Convert CMSDK timer, watchdog, dualtimer to Clock framework Peter Maydell
2021-01-21 19:05 ` [PATCH 01/25] ptimer: Add new ptimer_set_period_from_clock() function Peter Maydell
2021-01-22 14:08 ` Luc Michel
2021-01-21 19:05 ` [PATCH 02/25] clock: Add new clock_has_source() function Peter Maydell
2021-01-22 14:15 ` Luc Michel
2021-01-27 21:56 ` Philippe Mathieu-Daudé
2021-01-21 19:06 ` [PATCH 03/25] tests: Add a simple test of the CMSDK APB timer Peter Maydell
2021-01-21 19:56 ` Philippe Mathieu-Daudé
2021-01-24 12:50 ` Luc Michel
2021-01-21 19:06 ` [PATCH 04/25] tests: Add a simple test of the CMSDK APB watchdog Peter Maydell
2021-01-24 13:10 ` Luc Michel
2021-01-27 21:54 ` Philippe Mathieu-Daudé
2021-01-21 19:06 ` [PATCH 05/25] tests: Add a simple test of the CMSDK APB dual timer Peter Maydell
2021-01-24 13:24 ` Luc Michel
2021-01-21 19:06 ` [PATCH 06/25] hw/timer/cmsdk-apb-timer: Rename CMSDKAPBTIMER struct to CMSDKAPBTimer Peter Maydell
2021-01-21 20:21 ` Philippe Mathieu-Daudé
2021-01-22 14:22 ` Luc Michel
2021-01-21 19:06 ` [PATCH 07/25] hw/timer/cmsdk-apb-timer: Add Clock input Peter Maydell
2021-01-21 20:22 ` Philippe Mathieu-Daudé
2021-01-22 15:11 ` Luc Michel
2021-01-21 19:06 ` [PATCH 08/25] hw/timer/cmsdk-apb-dualtimer: " Peter Maydell
2021-01-21 21:49 ` Philippe Mathieu-Daudé
2021-01-22 15:17 ` Luc Michel
2021-01-21 19:06 ` [PATCH 09/25] hw/watchdog/cmsdk-apb-watchdog: " Peter Maydell
2021-01-21 20:27 ` Philippe Mathieu-Daudé
2021-01-22 15:18 ` Luc Michel
2021-01-21 19:06 ` [PATCH 10/25] hw/arm/armsse: Rename "MAINCLK" property to "MAINCLK_FRQ" Peter Maydell
2021-01-21 20:28 ` Philippe Mathieu-Daudé
2021-01-22 15:22 ` Luc Michel
2021-01-21 19:06 ` [PATCH 11/25] hw/arm/armsse: Wire up clocks Peter Maydell
2021-01-21 20:30 ` Philippe Mathieu-Daudé
2021-01-22 15:34 ` Luc Michel
2021-01-21 19:06 ` [PATCH 12/25] hw/arm/mps2: Inline CMSDK_APB_TIMER creation Peter Maydell
2021-01-21 22:14 ` Philippe Mathieu-Daudé
2021-01-22 15:33 ` Luc Michel
2021-01-21 19:06 ` [PATCH 13/25] hw/arm/mps2: Create and connect SYSCLK Clock Peter Maydell
2021-01-21 21:24 ` Philippe Mathieu-Daudé
2021-01-22 19:52 ` Luc Michel
2021-01-21 19:06 ` [PATCH 14/25] hw/arm/mps2-tz: Create and connect ARMSSE Clocks Peter Maydell
2021-01-21 21:30 ` Philippe Mathieu-Daudé
2021-01-22 19:52 ` Luc Michel
2021-01-21 19:06 ` [PATCH 15/25] hw/arm/musca: " Peter Maydell
2021-01-21 21:30 ` Philippe Mathieu-Daudé
2021-01-22 20:01 ` Luc Michel
2021-01-21 19:06 ` [PATCH 16/25] hw/arm/stellaris: Convert SSYS to QOM device Peter Maydell
2021-01-21 22:13 ` Philippe Mathieu-Daudé
2021-01-25 11:48 ` Peter Maydell
2021-01-27 22:10 ` Philippe Mathieu-Daudé
2021-01-22 20:26 ` Luc Michel
2021-01-21 19:06 ` [PATCH 17/25] hw/arm/stellaris: Create Clock input for watchdog Peter Maydell
2021-01-21 21:59 ` Philippe Mathieu-Daudé
2021-01-27 22:16 ` Philippe Mathieu-Daudé
2021-01-22 20:30 ` Luc Michel
2021-01-21 19:06 ` [PATCH 18/25] hw/timer/cmsdk-apb-timer: Convert to use Clock input Peter Maydell
2021-01-21 22:01 ` Philippe Mathieu-Daudé
2021-01-22 20:33 ` Luc Michel
2021-01-21 19:06 ` [PATCH 19/25] hw/timer/cmsdk-apb-dualtimer: " Peter Maydell
2021-01-22 20:49 ` Luc Michel
2021-01-22 21:41 ` Peter Maydell
2021-01-23 19:58 ` Luc Michel
2021-01-27 22:00 ` Philippe Mathieu-Daudé
2021-01-21 19:06 ` Peter Maydell [this message]
2021-01-21 22:01 ` [PATCH 20/25] hw/watchdog/cmsdk-apb-watchdog: " Philippe Mathieu-Daudé
2021-01-22 20:51 ` Luc Michel
2021-01-21 19:06 ` [PATCH 21/25] tests/qtest/cmsdk-apb-watchdog-test: Test clock changes Peter Maydell
2021-01-21 22:04 ` Philippe Mathieu-Daudé
2021-01-24 13:35 ` Luc Michel
2021-01-21 19:06 ` [PATCH 22/25] hw/arm/armsse: Use Clock to set system_clock_scale Peter Maydell
2021-01-21 22:05 ` Philippe Mathieu-Daudé
2021-01-23 20:31 ` Luc Michel
2021-01-23 22:33 ` Peter Maydell
2021-01-21 19:06 ` [PATCH 23/25] arm: Don't set freq properties on CMSDK timer, dualtimer, watchdog, ARMSSE Peter Maydell
2021-01-21 22:06 ` Philippe Mathieu-Daudé
2021-01-23 20:32 ` Luc Michel
2021-01-21 19:06 ` [PATCH 24/25] arm: Remove frq " Peter Maydell
2021-01-21 22:09 ` Philippe Mathieu-Daudé
2021-01-23 20:33 ` Luc Michel
2021-01-21 19:06 ` [PATCH 25/25] hw/arm/stellaris: Remove board-creation reset of STELLARIS_SYS Peter Maydell
2021-01-23 20:33 ` Luc Michel
2021-01-27 22:10 ` Philippe Mathieu-Daudé
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=20210121190622.22000-21-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=damien.hedde@greensocs.com \
--cc=f4bug@amsat.org \
--cc=luc@lmichel.fr \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).