From: Luc Michel <luc@lmichel.fr>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: "Damien Hedde" <damien.hedde@greensocs.com>,
qemu-arm@nongnu.org, qemu-devel@nongnu.org,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: Re: [PATCH 23/25] arm: Don't set freq properties on CMSDK timer, dualtimer, watchdog, ARMSSE
Date: Sat, 23 Jan 2021 21:32:28 +0100 [thread overview]
Message-ID: <20210123203228.nt3l7wvon3lub5bi@sekoia-pc.home.lmichel.fr> (raw)
In-Reply-To: <20210121190622.22000-24-peter.maydell@linaro.org>
On 19:06 Thu 21 Jan , Peter Maydell wrote:
> Remove all the code that sets frequency properties on the CMSDK
> timer, dualtimer and watchdog devices and on the ARMSSE SoC device:
> these properties are unused now that the devices rely on their Clock
> inputs instead.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Luc Michel <luc@lmichel.fr>
> ---
> hw/arm/armsse.c | 7 -------
> hw/arm/mps2-tz.c | 1 -
> hw/arm/mps2.c | 3 ---
> hw/arm/musca.c | 1 -
> hw/arm/stellaris.c | 3 ---
> 5 files changed, 15 deletions(-)
>
> diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c
> index 1da0c1be4c7..7494afc630e 100644
> --- a/hw/arm/armsse.c
> +++ b/hw/arm/armsse.c
> @@ -726,7 +726,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)
> * it to the appropriate PPC port; then we can realize the PPC and
> * map its upstream ends to the right place in the container.
> */
> - qdev_prop_set_uint32(DEVICE(&s->timer0), "pclk-frq", s->mainclk_frq);
> qdev_connect_clock_in(DEVICE(&s->timer0), "pclk", s->mainclk);
> if (!sysbus_realize(SYS_BUS_DEVICE(&s->timer0), errp)) {
> return;
> @@ -737,7 +736,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)
> object_property_set_link(OBJECT(&s->apb_ppc0), "port[0]", OBJECT(mr),
> &error_abort);
>
> - qdev_prop_set_uint32(DEVICE(&s->timer1), "pclk-frq", s->mainclk_frq);
> qdev_connect_clock_in(DEVICE(&s->timer1), "pclk", s->mainclk);
> if (!sysbus_realize(SYS_BUS_DEVICE(&s->timer1), errp)) {
> return;
> @@ -748,7 +746,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)
> object_property_set_link(OBJECT(&s->apb_ppc0), "port[1]", OBJECT(mr),
> &error_abort);
>
> - qdev_prop_set_uint32(DEVICE(&s->dualtimer), "pclk-frq", s->mainclk_frq);
> qdev_connect_clock_in(DEVICE(&s->dualtimer), "TIMCLK", s->mainclk);
> if (!sysbus_realize(SYS_BUS_DEVICE(&s->dualtimer), errp)) {
> return;
> @@ -907,7 +904,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)
> /* Devices behind APB PPC1:
> * 0x4002f000: S32K timer
> */
> - qdev_prop_set_uint32(DEVICE(&s->s32ktimer), "pclk-frq", S32KCLK);
> qdev_connect_clock_in(DEVICE(&s->s32ktimer), "pclk", s->s32kclk);
> if (!sysbus_realize(SYS_BUS_DEVICE(&s->s32ktimer), errp)) {
> return;
> @@ -1001,7 +997,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)
> qdev_connect_gpio_out(DEVICE(&s->nmi_orgate), 0,
> qdev_get_gpio_in_named(DEVICE(&s->armv7m), "NMI", 0));
>
> - qdev_prop_set_uint32(DEVICE(&s->s32kwatchdog), "wdogclk-frq", S32KCLK);
> qdev_connect_clock_in(DEVICE(&s->s32kwatchdog), "WDOGCLK", s->s32kclk);
> if (!sysbus_realize(SYS_BUS_DEVICE(&s->s32kwatchdog), errp)) {
> return;
> @@ -1012,7 +1007,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)
>
> /* 0x40080000 .. 0x4008ffff : ARMSSE second Base peripheral region */
>
> - qdev_prop_set_uint32(DEVICE(&s->nswatchdog), "wdogclk-frq", s->mainclk_frq);
> qdev_connect_clock_in(DEVICE(&s->nswatchdog), "WDOGCLK", s->mainclk);
> if (!sysbus_realize(SYS_BUS_DEVICE(&s->nswatchdog), errp)) {
> return;
> @@ -1021,7 +1015,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)
> armsse_get_common_irq_in(s, 1));
> sysbus_mmio_map(SYS_BUS_DEVICE(&s->nswatchdog), 0, 0x40081000);
>
> - qdev_prop_set_uint32(DEVICE(&s->swatchdog), "wdogclk-frq", s->mainclk_frq);
> qdev_connect_clock_in(DEVICE(&s->swatchdog), "WDOGCLK", s->mainclk);
> if (!sysbus_realize(SYS_BUS_DEVICE(&s->swatchdog), errp)) {
> return;
> diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
> index 7acdf490f28..90caa914934 100644
> --- a/hw/arm/mps2-tz.c
> +++ b/hw/arm/mps2-tz.c
> @@ -413,7 +413,6 @@ static void mps2tz_common_init(MachineState *machine)
> object_property_set_link(OBJECT(&mms->iotkit), "memory",
> OBJECT(system_memory), &error_abort);
> qdev_prop_set_uint32(iotkitdev, "EXP_NUMIRQ", MPS2TZ_NUMIRQ);
> - qdev_prop_set_uint32(iotkitdev, "MAINCLK_FRQ", SYSCLK_FRQ);
> qdev_connect_clock_in(iotkitdev, "MAINCLK", mms->sysclk);
> qdev_connect_clock_in(iotkitdev, "S32KCLK", mms->s32kclk);
> sysbus_realize(SYS_BUS_DEVICE(&mms->iotkit), &error_fatal);
> diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
> index cd1c215f941..39add416db5 100644
> --- a/hw/arm/mps2.c
> +++ b/hw/arm/mps2.c
> @@ -346,7 +346,6 @@ static void mps2_common_init(MachineState *machine)
> object_initialize_child(OBJECT(mms), name, &mms->timer[i],
> TYPE_CMSDK_APB_TIMER);
> sbd = SYS_BUS_DEVICE(&mms->timer[i]);
> - qdev_prop_set_uint32(DEVICE(&mms->timer[i]), "pclk-frq", SYSCLK_FRQ);
> qdev_connect_clock_in(DEVICE(&mms->timer[i]), "pclk", mms->sysclk);
> sysbus_realize_and_unref(sbd, &error_fatal);
> sysbus_mmio_map(sbd, 0, base);
> @@ -355,7 +354,6 @@ static void mps2_common_init(MachineState *machine)
>
> object_initialize_child(OBJECT(mms), "dualtimer", &mms->dualtimer,
> TYPE_CMSDK_APB_DUALTIMER);
> - qdev_prop_set_uint32(DEVICE(&mms->dualtimer), "pclk-frq", SYSCLK_FRQ);
> qdev_connect_clock_in(DEVICE(&mms->dualtimer), "TIMCLK", mms->sysclk);
> sysbus_realize(SYS_BUS_DEVICE(&mms->dualtimer), &error_fatal);
> sysbus_connect_irq(SYS_BUS_DEVICE(&mms->dualtimer), 0,
> @@ -363,7 +361,6 @@ static void mps2_common_init(MachineState *machine)
> sysbus_mmio_map(SYS_BUS_DEVICE(&mms->dualtimer), 0, 0x40002000);
> object_initialize_child(OBJECT(mms), "watchdog", &mms->watchdog,
> TYPE_CMSDK_APB_WATCHDOG);
> - qdev_prop_set_uint32(DEVICE(&mms->watchdog), "wdogclk-frq", SYSCLK_FRQ);
> qdev_connect_clock_in(DEVICE(&mms->watchdog), "WDOGCLK", mms->sysclk);
> sysbus_realize(SYS_BUS_DEVICE(&mms->watchdog), &error_fatal);
> sysbus_connect_irq(SYS_BUS_DEVICE(&mms->watchdog), 0,
> diff --git a/hw/arm/musca.c b/hw/arm/musca.c
> index a9292482a06..945643c3cd7 100644
> --- a/hw/arm/musca.c
> +++ b/hw/arm/musca.c
> @@ -385,7 +385,6 @@ static void musca_init(MachineState *machine)
> qdev_prop_set_uint32(ssedev, "EXP_NUMIRQ", mmc->num_irqs);
> qdev_prop_set_uint32(ssedev, "init-svtor", mmc->init_svtor);
> qdev_prop_set_uint32(ssedev, "SRAM_ADDR_WIDTH", mmc->sram_addr_width);
> - qdev_prop_set_uint32(ssedev, "MAINCLK_FRQ", SYSCLK_FRQ);
> qdev_connect_clock_in(ssedev, "MAINCLK", mms->sysclk);
> qdev_connect_clock_in(ssedev, "S32KCLK", mms->s32kclk);
> /*
> diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
> index 9b67c739ef2..5acb043a07e 100644
> --- a/hw/arm/stellaris.c
> +++ b/hw/arm/stellaris.c
> @@ -1415,9 +1415,6 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board)
> if (board->dc1 & (1 << 3)) { /* watchdog present */
> dev = qdev_new(TYPE_LUMINARY_WATCHDOG);
>
> - /* system_clock_scale is valid now */
> - uint32_t mainclk = NANOSECONDS_PER_SECOND / system_clock_scale;
> - qdev_prop_set_uint32(dev, "wdogclk-frq", mainclk);
> qdev_connect_clock_in(dev, "WDOGCLK",
> qdev_get_clock_out(ssys_dev, "SYSCLK"));
>
> --
> 2.20.1
>
--
next prev parent reply other threads:[~2021-01-23 20: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 ` [PATCH 20/25] hw/watchdog/cmsdk-apb-watchdog: " Peter Maydell
2021-01-21 22:01 ` 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 [this message]
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=20210123203228.nt3l7wvon3lub5bi@sekoia-pc.home.lmichel.fr \
--to=luc@lmichel.fr \
--cc=damien.hedde@greensocs.com \
--cc=f4bug@amsat.org \
--cc=peter.maydell@linaro.org \
--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).