From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: berrange@redhat.com, ehabkost@redhat.com,
Sagar Karandikar <sagark@eecs.berkeley.edu>,
Bastian Koppelmann <kbastian@mail.uni-paderborn.de>,
Alistair Francis <Alistair.Francis@wdc.com>,
qemu-riscv@nongnu.org, pbonzini@redhat.com,
Palmer Dabbelt <palmer@dabbelt.com>
Subject: [PATCH 19/24] riscv: Fix to put "riscv.hart_array" devices on sysbus
Date: Mon, 18 May 2020 07:04:03 +0200 [thread overview]
Message-ID: <20200518050408.4579-20-armbru@redhat.com> (raw)
In-Reply-To: <20200518050408.4579-1-armbru@redhat.com>
riscv_sifive_e_soc_init(), riscv_sifive_u_soc_init(),
spike_board_init(), spike_v1_10_0_board_init(),
spike_v1_09_1_board_init(), and riscv_virt_board_init() create
"riscv-hart_array" sysbus devices in a way that leaves them unplugged.
Create them the common way that puts them into the main system bus.
Affects machines sifive_e, sifive_u, spike, spike_v1.10, spike_v1.9.1,
and virt. Visible in "info qtree", here's the change for sifive_e:
bus: main-system-bus
type System
+ dev: riscv.hart_array, id ""
+ num-harts = 1 (0x1)
+ hartid-base = 0 (0x0)
+ cpu-type = "sifive-e31-riscv-cpu"
dev: sifive_soc.gpio, id ""
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Alistair Francis <Alistair.Francis@wdc.com>
Cc: Sagar Karandikar <sagark@eecs.berkeley.edu>
Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Cc: qemu-riscv@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/riscv/sifive_e.c | 5 ++---
hw/riscv/sifive_u.c | 14 ++++++--------
hw/riscv/spike.c | 12 ++++++------
hw/riscv/virt.c | 4 ++--
4 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
index b53109521e..8831e6728e 100644
--- a/hw/riscv/sifive_e.c
+++ b/hw/riscv/sifive_e.c
@@ -120,9 +120,8 @@ static void riscv_sifive_e_soc_init(Object *obj)
MachineState *ms = MACHINE(qdev_get_machine());
SiFiveESoCState *s = RISCV_E_SOC(obj);
- object_initialize_child(obj, "cpus", &s->cpus,
- sizeof(s->cpus), TYPE_RISCV_HART_ARRAY,
- &error_abort, NULL);
+ sysbus_init_child_obj(obj, "cpus", &s->cpus,
+ sizeof(s->cpus), TYPE_RISCV_HART_ARRAY);
object_property_set_int(OBJECT(&s->cpus), ms->smp.cpus, "num-harts",
&error_abort);
sysbus_init_child_obj(obj, "riscv.sifive.e.gpio0",
diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index 4299bdf480..bb69fd8e48 100644
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -491,10 +491,9 @@ static void riscv_sifive_u_soc_init(Object *obj)
&error_abort, NULL);
qdev_prop_set_uint32(DEVICE(&s->e_cluster), "cluster-id", 0);
- object_initialize_child(OBJECT(&s->e_cluster), "e-cpus",
- &s->e_cpus, sizeof(s->e_cpus),
- TYPE_RISCV_HART_ARRAY, &error_abort,
- NULL);
+ sysbus_init_child_obj(OBJECT(&s->e_cluster), "e-cpus",
+ &s->e_cpus, sizeof(s->e_cpus),
+ TYPE_RISCV_HART_ARRAY);
qdev_prop_set_uint32(DEVICE(&s->e_cpus), "num-harts", 1);
qdev_prop_set_uint32(DEVICE(&s->e_cpus), "hartid-base", 0);
qdev_prop_set_string(DEVICE(&s->e_cpus), "cpu-type", SIFIVE_E_CPU);
@@ -504,10 +503,9 @@ static void riscv_sifive_u_soc_init(Object *obj)
&error_abort, NULL);
qdev_prop_set_uint32(DEVICE(&s->u_cluster), "cluster-id", 1);
- object_initialize_child(OBJECT(&s->u_cluster), "u-cpus",
- &s->u_cpus, sizeof(s->u_cpus),
- TYPE_RISCV_HART_ARRAY, &error_abort,
- NULL);
+ sysbus_init_child_obj(OBJECT(&s->u_cluster), "u-cpus",
+ &s->u_cpus, sizeof(s->u_cpus),
+ TYPE_RISCV_HART_ARRAY);
qdev_prop_set_uint32(DEVICE(&s->u_cpus), "num-harts", ms->smp.cpus - 1);
qdev_prop_set_uint32(DEVICE(&s->u_cpus), "hartid-base", 1);
qdev_prop_set_string(DEVICE(&s->u_cpus), "cpu-type", SIFIVE_U_CPU);
diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
index d0c4843712..01d52e758e 100644
--- a/hw/riscv/spike.c
+++ b/hw/riscv/spike.c
@@ -169,8 +169,8 @@ static void spike_board_init(MachineState *machine)
unsigned int smp_cpus = machine->smp.cpus;
/* Initialize SOC */
- object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
- TYPE_RISCV_HART_ARRAY, &error_abort, NULL);
+ sysbus_init_child_obj(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
+ TYPE_RISCV_HART_ARRAY);
object_property_set_str(OBJECT(&s->soc), machine->cpu_type, "cpu-type",
&error_abort);
object_property_set_int(OBJECT(&s->soc), smp_cpus, "num-harts",
@@ -275,8 +275,8 @@ static void spike_v1_10_0_board_init(MachineState *machine)
}
/* Initialize SOC */
- object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
- TYPE_RISCV_HART_ARRAY, &error_abort, NULL);
+ sysbus_init_child_obj(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
+ TYPE_RISCV_HART_ARRAY);
object_property_set_str(OBJECT(&s->soc), SPIKE_V1_10_0_CPU, "cpu-type",
&error_abort);
object_property_set_int(OBJECT(&s->soc), smp_cpus, "num-harts",
@@ -365,8 +365,8 @@ static void spike_v1_09_1_board_init(MachineState *machine)
}
/* Initialize SOC */
- object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
- TYPE_RISCV_HART_ARRAY, &error_abort, NULL);
+ sysbus_init_child_obj(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
+ TYPE_RISCV_HART_ARRAY);
object_property_set_str(OBJECT(&s->soc), SPIKE_V1_09_1_CPU, "cpu-type",
&error_abort);
object_property_set_int(OBJECT(&s->soc), smp_cpus, "num-harts",
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index c695a44979..0f93e0d9c8 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -485,8 +485,8 @@ static void riscv_virt_board_init(MachineState *machine)
unsigned int smp_cpus = machine->smp.cpus;
/* Initialize SOC */
- object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
- TYPE_RISCV_HART_ARRAY, &error_abort, NULL);
+ sysbus_init_child_obj(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
+ TYPE_RISCV_HART_ARRAY);
object_property_set_str(OBJECT(&s->soc), machine->cpu_type, "cpu-type",
&error_abort);
object_property_set_int(OBJECT(&s->soc), smp_cpus, "num-harts",
--
2.21.1
next prev parent reply other threads:[~2020-05-18 5:16 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-18 5:03 [PATCH 00/24] Fixes around device realization Markus Armbruster
2020-05-18 5:03 ` [PATCH 01/24] arm/stm32f405: Fix realization of "stm32f2xx-adc" devices Markus Armbruster
2020-05-18 16:48 ` Alistair Francis
2020-05-19 5:08 ` Markus Armbruster
2020-05-19 22:20 ` Alistair Francis
2020-05-27 9:27 ` Markus Armbruster
2020-05-27 11:24 ` Philippe Mathieu-Daudé
2020-05-18 5:03 ` [PATCH 02/24] display/xlnx_dp: Fix to realize "i2c-ddc" and "aux-to-i2c-bridge" Markus Armbruster
2020-05-18 8:19 ` Fred Konrad
2020-05-19 5:09 ` Markus Armbruster
2020-05-19 9:48 ` Peter Maydell
2020-05-19 12:07 ` Markus Armbruster
2020-05-18 9:59 ` Edgar E. Iglesias
2020-05-18 10:30 ` Peter Maydell
2020-05-18 11:13 ` Philippe Mathieu-Daudé
2020-05-19 5:13 ` Markus Armbruster
2020-05-18 16:56 ` Alistair Francis
2020-05-18 5:03 ` [PATCH 03/24] sd/pxa2xx_mmci: Fix to realize "pxa2xx-mmci" device Markus Armbruster
2020-05-21 16:20 ` Peter Maydell
2020-05-18 5:03 ` [PATCH 04/24] aspeed: Don't create unwanted "ftgmac100", "aspeed-mmi" devices Markus Armbruster
2020-05-18 12:19 ` Cédric Le Goater
2020-05-19 0:20 ` Andrew Jeffery
2020-05-19 5:45 ` Markus Armbruster
2020-05-19 11:42 ` Philippe Mathieu-Daudé
2020-05-19 12:44 ` Cédric Le Goater
2020-05-19 0:38 ` Joel Stanley
2020-05-19 5:35 ` Markus Armbruster
2020-05-18 5:03 ` [PATCH 05/24] aspeed: Don't create unwanted "cortex-a7-arm-cpu" devices Markus Armbruster
2020-05-18 12:24 ` Cédric Le Goater
2020-05-19 0:40 ` Joel Stanley
2020-05-19 5:46 ` Markus Armbruster
2020-05-19 9:35 ` Cédric Le Goater
2020-05-18 5:03 ` [PATCH 06/24] armv7m: Bury unwanted "ARM,bitband-memory" devices Markus Armbruster
2020-05-21 16:17 ` Peter Maydell
2020-05-25 5:50 ` Markus Armbruster
2020-05-25 12:32 ` Paolo Bonzini
2020-05-25 12:49 ` Peter Maydell
2020-05-26 5:19 ` Markus Armbruster
2020-05-18 5:03 ` [PATCH 07/24] auxbus: Fix aux-to-i2c-bridge to be a subtype of aux-slave Markus Armbruster
2020-05-18 8:53 ` Philippe Mathieu-Daudé
2020-05-18 5:03 ` [PATCH 08/24] mac_via: Fix to realize "mos6522-q800-via*" devices Markus Armbruster
2020-05-18 20:25 ` Mark Cave-Ayland
2020-05-18 5:03 ` [PATCH 09/24] macio: Fix to realize "mos6522-cuda" and "mos6522-pmu" devices Markus Armbruster
2020-05-21 16:26 ` Peter Maydell
2020-05-25 6:25 ` Markus Armbruster
2020-05-27 14:12 ` Markus Armbruster
2020-05-27 15:05 ` Peter Maydell
2020-05-27 15:12 ` Paolo Bonzini
2020-05-28 6:57 ` Markus Armbruster
2020-05-27 16:08 ` Markus Armbruster
2020-05-18 5:03 ` [PATCH 10/24] macio: Bury unwanted "macio-gpio" devices Markus Armbruster
2020-05-18 20:35 ` Mark Cave-Ayland
2020-05-19 6:06 ` Markus Armbruster
2020-05-18 5:03 ` [PATCH 11/24] pnv/phb4: Bury unwanted "pnv-phb4-pec-stack" devices Markus Armbruster
2020-05-18 8:49 ` Greg Kurz
2020-05-18 13:24 ` Cédric Le Goater
2020-05-19 8:16 ` Cédric Le Goater
2020-05-19 11:50 ` Markus Armbruster
2020-05-18 5:03 ` [PATCH 12/24] MAINTAINERS: Make section PowerNV cover pci-host/pnv* as well Markus Armbruster
2020-05-18 6:41 ` David Gibson
2020-05-18 5:03 ` [PATCH 13/24] ppc4xx: Drop redundant device realization Markus Armbruster
2020-05-18 8:54 ` Philippe Mathieu-Daudé
2020-05-18 10:27 ` BALATON Zoltan
2020-05-19 6:07 ` Markus Armbruster
2020-05-18 16:41 ` Thomas Huth
2020-05-18 5:03 ` [PATCH 14/24] macio: Put "macio-nvram" device on the macio bus Markus Armbruster
2020-05-18 20:37 ` Mark Cave-Ayland
2020-05-18 5:03 ` [PATCH 15/24] macio: Fix macio-bus to be a subtype of System bus Markus Armbruster
2020-05-18 8:55 ` Philippe Mathieu-Daudé
2020-05-18 20:39 ` Mark Cave-Ayland
2020-05-19 6:09 ` Markus Armbruster
2020-05-18 5:04 ` [PATCH 16/24] ppc/pnv: Put "*-pnv-chip" and "pnv-xive" on the main system bus Markus Armbruster
2020-05-18 16:34 ` Cédric Le Goater
2020-05-19 6:28 ` Markus Armbruster
2020-05-19 13:05 ` Cédric Le Goater
2020-05-18 5:04 ` [PATCH 17/24] pnv/psi: Correct the pnv-psi* devices not to be sysbus devices Markus Armbruster
2020-05-18 16:27 ` Cédric Le Goater
2020-05-19 6:30 ` Markus Armbruster
2020-05-19 13:04 ` Cédric Le Goater
2020-05-18 5:04 ` [PATCH 18/24] display/sm501 display/ati: Fix to realize "i2c-ddc" Markus Armbruster
2020-05-18 10:32 ` BALATON Zoltan
2020-05-19 6:30 ` Markus Armbruster
2020-05-18 10:39 ` BALATON Zoltan
2020-05-18 10:45 ` Philippe Mathieu-Daudé
2020-05-19 6:35 ` Markus Armbruster
2020-05-18 5:04 ` Markus Armbruster [this message]
2020-05-18 17:03 ` [PATCH 19/24] riscv: Fix to put "riscv.hart_array" devices on sysbus Alistair Francis
2020-05-18 5:04 ` [PATCH 20/24] riscv: Fix type of SiFive[EU]SocState, member parent_obj Markus Armbruster
2020-05-18 8:58 ` Philippe Mathieu-Daudé
2020-05-18 16:57 ` Alistair Francis
2020-05-18 5:04 ` [PATCH 21/24] sparc/leon3: Fix to put grlib,* devices on sysbus Markus Armbruster
2020-05-18 8:09 ` Fred Konrad
2020-05-18 8:59 ` Philippe Mathieu-Daudé
2020-05-18 5:04 ` [PATCH 22/24] qdev: Assert devices are plugged into a bus that can take them Markus Armbruster
2020-05-18 15:03 ` Markus Armbruster
2020-05-18 20:42 ` Mark Cave-Ayland
2020-05-18 5:04 ` [PATCH 23/24] sd: Hide the qdev-but-not-quite thing created by sd_init() Markus Armbruster
2020-05-18 5:04 ` [PATCH 24/24] qdev: Assert onboard devices all get realized properly Markus Armbruster
2020-05-18 9: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=20200518050408.4579-20-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=Alistair.Francis@wdc.com \
--cc=berrange@redhat.com \
--cc=ehabkost@redhat.com \
--cc=kbastian@mail.uni-paderborn.de \
--cc=palmer@dabbelt.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=sagark@eecs.berkeley.edu \
/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).