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 10/25] hw/arm/armsse: Rename "MAINCLK" property to "MAINCLK_FRQ"
Date: Fri, 22 Jan 2021 16:22:47 +0100 [thread overview]
Message-ID: <20210122152247.pjqnmrccj2i3wc2n@sekoia-pc.home.lmichel.fr> (raw)
In-Reply-To: <20210121190622.22000-11-peter.maydell@linaro.org>
On 19:06 Thu 21 Jan , Peter Maydell wrote:
> While we transition the ARMSSE code from integer properties
> specifying clock frequencies to Clock objects, we want to have the
> device provide both at once. We want the final name of the main
> input Clock to be "MAINCLK", following the hardware name.
> Unfortunately creating an input Clock with a name X creates an
> under-the-hood QOM property X; for "MAINCLK" this clashes with the
> existing UINT32 property of that name.
>
> Rename the UINT32 property to MAINCLK_FRQ so it can coexist with the
> MAINCLK Clock; once the transition is complete MAINCLK_FRQ will be
> deleted.
>
> Commit created with:
> perl -p -i -e 's/MAINCLK/MAINCLK_FRQ/g' hw/arm/{armsse,mps2-tz,musca}.c include/hw/arm/armsse.h
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Luc Michel <luc@lmichel.fr>
> ---
> include/hw/arm/armsse.h | 2 +-
> hw/arm/armsse.c | 6 +++---
> hw/arm/mps2-tz.c | 2 +-
> hw/arm/musca.c | 2 +-
> 4 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/include/hw/arm/armsse.h b/include/hw/arm/armsse.h
> index 83f5e28c16e..4860a793f4b 100644
> --- a/include/hw/arm/armsse.h
> +++ b/include/hw/arm/armsse.h
> @@ -39,7 +39,7 @@
> * QEMU interface:
> * + QOM property "memory" is a MemoryRegion containing the devices provided
> * by the board model.
> - * + QOM property "MAINCLK" is the frequency of the main system clock
> + * + QOM property "MAINCLK_FRQ" is the frequency of the main system clock
> * + QOM property "EXP_NUMIRQ" sets the number of expansion interrupts.
> * (In hardware, the SSE-200 permits the number of expansion interrupts
> * for the two CPUs to be configured separately, but we restrict it to
> diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c
> index baac027659d..d2ba0459c44 100644
> --- a/hw/arm/armsse.c
> +++ b/hw/arm/armsse.c
> @@ -47,7 +47,7 @@ static Property iotkit_properties[] = {
> DEFINE_PROP_LINK("memory", ARMSSE, board_memory, TYPE_MEMORY_REGION,
> MemoryRegion *),
> DEFINE_PROP_UINT32("EXP_NUMIRQ", ARMSSE, exp_numirq, 64),
> - DEFINE_PROP_UINT32("MAINCLK", ARMSSE, mainclk_frq, 0),
> + DEFINE_PROP_UINT32("MAINCLK_FRQ", ARMSSE, mainclk_frq, 0),
> DEFINE_PROP_UINT32("SRAM_ADDR_WIDTH", ARMSSE, sram_addr_width, 15),
> DEFINE_PROP_UINT32("init-svtor", ARMSSE, init_svtor, 0x10000000),
> DEFINE_PROP_BOOL("CPU0_FPU", ARMSSE, cpu_fpu[0], true),
> @@ -59,7 +59,7 @@ static Property armsse_properties[] = {
> DEFINE_PROP_LINK("memory", ARMSSE, board_memory, TYPE_MEMORY_REGION,
> MemoryRegion *),
> DEFINE_PROP_UINT32("EXP_NUMIRQ", ARMSSE, exp_numirq, 64),
> - DEFINE_PROP_UINT32("MAINCLK", ARMSSE, mainclk_frq, 0),
> + DEFINE_PROP_UINT32("MAINCLK_FRQ", ARMSSE, mainclk_frq, 0),
> DEFINE_PROP_UINT32("SRAM_ADDR_WIDTH", ARMSSE, sram_addr_width, 15),
> DEFINE_PROP_UINT32("init-svtor", ARMSSE, init_svtor, 0x10000000),
> DEFINE_PROP_BOOL("CPU0_FPU", ARMSSE, cpu_fpu[0], false),
> @@ -448,7 +448,7 @@ static void armsse_realize(DeviceState *dev, Error **errp)
> }
>
> if (!s->mainclk_frq) {
> - error_setg(errp, "MAINCLK property was not set");
> + error_setg(errp, "MAINCLK_FRQ property was not set");
> return;
> }
>
> diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
> index 3707876d6d4..6a9eed9022a 100644
> --- a/hw/arm/mps2-tz.c
> +++ b/hw/arm/mps2-tz.c
> @@ -402,7 +402,7 @@ 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", SYSCLK_FRQ);
> + qdev_prop_set_uint32(iotkitdev, "MAINCLK_FRQ", SYSCLK_FRQ);
> sysbus_realize(SYS_BUS_DEVICE(&mms->iotkit), &error_fatal);
>
> /*
> diff --git a/hw/arm/musca.c b/hw/arm/musca.c
> index b50157f63a6..d82bef11cf2 100644
> --- a/hw/arm/musca.c
> +++ b/hw/arm/musca.c
> @@ -375,7 +375,7 @@ 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", SYSCLK_FRQ);
> + qdev_prop_set_uint32(ssedev, "MAINCLK_FRQ", SYSCLK_FRQ);
> /*
> * Musca-A takes the default SSE-200 FPU/DSP settings (ie no for
> * CPU0 and yes for CPU1); Musca-B1 explicitly enables them for CPU0.
> --
> 2.20.1
>
--
next prev parent reply other threads:[~2021-01-22 15:23 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 [this message]
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
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=20210122152247.pjqnmrccj2i3wc2n@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).