From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 31/46] hw/arm/armsse: Rename "MAINCLK" property to "MAINCLK_FRQ"
Date: Fri, 29 Jan 2021 10:59:57 +0000 [thread overview]
Message-ID: <20210129110012.8660-32-peter.maydell@linaro.org> (raw)
In-Reply-To: <20210129110012.8660-1-peter.maydell@linaro.org>
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: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Luc Michel <luc@lmichel.fr>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20210128114145.20536-11-peter.maydell@linaro.org
Message-id: 20210121190622.22000-11-peter.maydell@linaro.org
---
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-29 11:13 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-29 10:59 [PULL 00/46] target-arm queue Peter Maydell
2021-01-29 10:59 ` [PULL 01/46] target/arm: Implement ID_PFR2 Peter Maydell
2021-01-29 10:59 ` [PULL 02/46] target/arm: Conditionalize DBGDIDR Peter Maydell
2021-01-29 10:59 ` [PULL 03/46] arm: rename xlnx-zcu102.canbusN properties Peter Maydell
2021-01-29 10:59 ` [PULL 04/46] hw: gpio: implement gpio-pwr driver for qemu reset/poweroff Peter Maydell
2021-01-29 10:59 ` [PULL 05/46] arm-virt: refactor gpios creation Peter Maydell
2021-01-29 10:59 ` [PULL 06/46] arm-virt: add secure pl061 for reset/power down Peter Maydell
2021-01-29 10:59 ` [PULL 07/46] hw/misc: Fix arith overflow in NPCM7XX PWM module Peter Maydell
2021-01-29 10:59 ` [PULL 08/46] target/arm: Replace magic value by MMU_DATA_LOAD definition Peter Maydell
2021-01-29 10:59 ` [PULL 09/46] configure: Move preadv check to meson.build Peter Maydell
2021-01-29 10:59 ` [PULL 10/46] configure: cross-compiling with empty cross_prefix Peter Maydell
2021-01-29 10:59 ` [PULL 11/46] osdep: build with non-working system() function Peter Maydell
2021-01-29 10:59 ` [PULL 12/46] darwin: remove redundant dependency declaration Peter Maydell
2021-01-29 10:59 ` [PULL 13/46] darwin: fix cross-compiling for Darwin Peter Maydell
2021-01-29 10:59 ` [PULL 14/46] configure: cross compile should use x86_64 cpu_family Peter Maydell
2021-01-29 10:59 ` [PULL 15/46] darwin: detect CoreAudio for build Peter Maydell
2021-01-29 10:59 ` [PULL 16/46] darwin: remove 64-bit build detection on 32-bit OS Peter Maydell
2021-01-29 10:59 ` [PULL 17/46] hvf: Add hypervisor entitlement to output binaries Peter Maydell
2021-01-29 10:59 ` [PULL 18/46] hw/misc/pvpanic: split-out generic and bus dependent code Peter Maydell
2021-01-29 10:59 ` [PULL 19/46] hw/misc/pvpanic: add PCI interface support Peter Maydell
2021-01-29 10:59 ` [PULL 20/46] pvpanic : update pvpanic spec document Peter Maydell
2021-01-29 10:59 ` [PULL 21/46] tests/qtest: add a test case for pvpanic-pci Peter Maydell
2021-01-29 15:57 ` Peter Maydell
2021-01-29 17:00 ` Mihai Carabas
2021-01-29 10:59 ` [PULL 22/46] ptimer: Add new ptimer_set_period_from_clock() function Peter Maydell
2021-01-29 10:59 ` [PULL 23/46] clock: Add new clock_has_source() function Peter Maydell
2021-01-29 10:59 ` [PULL 24/46] tests: Add a simple test of the CMSDK APB timer Peter Maydell
2021-01-29 10:59 ` [PULL 25/46] tests: Add a simple test of the CMSDK APB watchdog Peter Maydell
2021-01-29 10:59 ` [PULL 26/46] tests: Add a simple test of the CMSDK APB dual timer Peter Maydell
2021-01-29 10:59 ` [PULL 27/46] hw/timer/cmsdk-apb-timer: Rename CMSDKAPBTIMER struct to CMSDKAPBTimer Peter Maydell
2021-01-29 10:59 ` [PULL 28/46] hw/timer/cmsdk-apb-timer: Add Clock input Peter Maydell
2021-01-29 10:59 ` [PULL 29/46] hw/timer/cmsdk-apb-dualtimer: " Peter Maydell
2021-01-29 10:59 ` [PULL 30/46] hw/watchdog/cmsdk-apb-watchdog: " Peter Maydell
2021-01-29 10:59 ` Peter Maydell [this message]
2021-01-29 10:59 ` [PULL 32/46] hw/arm/armsse: Wire up clocks Peter Maydell
2021-01-29 10:59 ` [PULL 33/46] hw/arm/mps2: Inline CMSDK_APB_TIMER creation Peter Maydell
2021-01-29 11:00 ` [PULL 34/46] hw/arm/mps2: Create and connect SYSCLK Clock Peter Maydell
2021-01-29 11:00 ` [PULL 35/46] hw/arm/mps2-tz: Create and connect ARMSSE Clocks Peter Maydell
2021-01-29 11:00 ` [PULL 36/46] hw/arm/musca: " Peter Maydell
2021-01-29 11:00 ` [PULL 37/46] hw/arm/stellaris: Convert SSYS to QOM device Peter Maydell
2021-01-29 11:00 ` [PULL 38/46] hw/arm/stellaris: Create Clock input for watchdog Peter Maydell
2021-01-29 11:00 ` [PULL 39/46] hw/timer/cmsdk-apb-timer: Convert to use Clock input Peter Maydell
2021-01-29 11:00 ` [PULL 40/46] hw/timer/cmsdk-apb-dualtimer: " Peter Maydell
2021-01-29 11:00 ` [PULL 41/46] hw/watchdog/cmsdk-apb-watchdog: " Peter Maydell
2021-01-29 11:00 ` [PULL 42/46] tests/qtest/cmsdk-apb-watchdog-test: Test clock changes Peter Maydell
2021-01-29 11:00 ` [PULL 43/46] hw/arm/armsse: Use Clock to set system_clock_scale Peter Maydell
2021-01-29 11:00 ` [PULL 44/46] arm: Don't set freq properties on CMSDK timer, dualtimer, watchdog, ARMSSE Peter Maydell
2021-01-29 11:00 ` [PULL 45/46] arm: Remove frq " Peter Maydell
2021-01-29 11:00 ` [PULL 46/46] hw/arm/stellaris: Remove board-creation reset of STELLARIS_SYS Peter Maydell
2021-01-29 11:42 ` [PULL 00/46] target-arm queue no-reply
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=20210129110012.8660-32-peter.maydell@linaro.org \
--to=peter.maydell@linaro.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).