From: Alistair Francis <alistair.francis@opensource.wdc.com>
To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org
Cc: Palmer Dabbelt <palmer@dabbelt.com>,
Alistair Francis <alistair@alistair23.me>,
alistair23@gmail.com, Bin Meng <bin.meng@windriver.com>,
Alistair Francis <alistair.francis@wdc.com>,
qemu-arm@nongnu.org, Peter Maydell <peter.maydell@linaro.org>,
bmeng.cn@gmail.com,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Subject: [PATCH v4 4/6] hw/riscv: virt: Add support for generating platform FDT entries
Date: Wed, 20 Apr 2022 15:52:46 +1000 [thread overview]
Message-ID: <20220420055248.960491-5-alistair.francis@opensource.wdc.com> (raw)
In-Reply-To: <20220420055248.960491-1-alistair.francis@opensource.wdc.com>
From: Alistair Francis <alistair.francis@wdc.com>
Similar to the ARM virt machine add support for adding device tree
entries for dynamically created devices.
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@amd.com>
---
hw/riscv/virt.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index 169da70350..e4a5c6c28b 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -28,6 +28,7 @@
#include "hw/qdev-properties.h"
#include "hw/char/serial.h"
#include "target/riscv/cpu.h"
+#include "hw/core/sysbus-fdt.h"
#include "hw/riscv/riscv_hart.h"
#include "hw/riscv/virt.h"
#include "hw/riscv/boot.h"
@@ -411,6 +412,12 @@ static void create_fdt_socket_aclint(RISCVVirtState *s,
qemu_fdt_setprop(mc->fdt, name, "interrupt-controller", NULL, 0);
qemu_fdt_setprop_cell(mc->fdt, name, "#interrupt-cells", 0);
riscv_socket_fdt_write_id(mc, mc->fdt, name, socket);
+
+ platform_bus_add_all_fdt_nodes(mc->fdt, name,
+ memmap[VIRT_PLATFORM_BUS].base,
+ memmap[VIRT_PLATFORM_BUS].size,
+ VIRT_PLATFORM_BUS_IRQ);
+
g_free(name);
}
@@ -469,6 +476,12 @@ static void create_fdt_socket_plic(RISCVVirtState *s,
riscv_socket_fdt_write_id(mc, mc->fdt, plic_name, socket);
qemu_fdt_setprop_cell(mc->fdt, plic_name, "phandle",
plic_phandles[socket]);
+
+ platform_bus_add_all_fdt_nodes(mc->fdt, plic_name,
+ memmap[VIRT_PLATFORM_BUS].base,
+ memmap[VIRT_PLATFORM_BUS].size,
+ VIRT_PLATFORM_BUS_IRQ);
+
g_free(plic_name);
g_free(plic_cells);
@@ -546,6 +559,12 @@ static void create_fdt_imsic(RISCVVirtState *s, const MemMapEntry *memmap,
IMSIC_MMIO_GROUP_MIN_SHIFT);
}
qemu_fdt_setprop_cell(mc->fdt, imsic_name, "phandle", *msi_m_phandle);
+
+ platform_bus_add_all_fdt_nodes(mc->fdt, imsic_name,
+ memmap[VIRT_PLATFORM_BUS].base,
+ memmap[VIRT_PLATFORM_BUS].size,
+ VIRT_PLATFORM_BUS_IRQ);
+
g_free(imsic_name);
/* S-level IMSIC node */
@@ -683,6 +702,12 @@ static void create_fdt_socket_aplic(RISCVVirtState *s,
VIRT_IRQCHIP_NUM_SOURCES);
riscv_socket_fdt_write_id(mc, mc->fdt, aplic_name, socket);
qemu_fdt_setprop_cell(mc->fdt, aplic_name, "phandle", aplic_s_phandle);
+
+ platform_bus_add_all_fdt_nodes(mc->fdt, aplic_name,
+ memmap[VIRT_PLATFORM_BUS].base,
+ memmap[VIRT_PLATFORM_BUS].size,
+ VIRT_PLATFORM_BUS_IRQ);
+
g_free(aplic_name);
g_free(aplic_cells);
--
2.35.1
next prev parent reply other threads:[~2022-04-20 6:00 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-20 5:52 [PATCH v4 0/6] hw/riscv: Add TPM support to the virt board Alistair Francis
2022-04-20 5:52 ` [PATCH v4 1/6] hw/riscv: virt: Add a machine done notifier Alistair Francis
2022-04-21 8:33 ` Bin Meng
2022-04-20 5:52 ` [PATCH v4 2/6] hw/core: Move the ARM sysbus-fdt to core Alistair Francis
2022-04-21 8:39 ` Bin Meng
2022-04-20 5:52 ` [PATCH v4 3/6] hw/riscv: virt: Create a platform bus Alistair Francis
2022-04-22 1:42 ` Bin Meng
2022-04-20 5:52 ` Alistair Francis [this message]
2022-04-22 1:50 ` [PATCH v4 4/6] hw/riscv: virt: Add support for generating platform FDT entries Bin Meng
2022-04-20 5:52 ` [PATCH v4 5/6] hw/riscv: virt: Add device plug support Alistair Francis
2022-04-22 2:07 ` Bin Meng
2022-04-20 5:52 ` [PATCH v4 6/6] hw/riscv: Enable TPM backends Alistair Francis
2022-04-22 2:13 ` Bin Meng
2023-06-19 20:32 ` Guenter Roeck
2023-06-21 6:34 ` Guenter Roeck
2023-07-03 3:10 ` Alistair Francis
2022-04-21 2:19 ` [PATCH v4 0/6] hw/riscv: Add TPM support to the virt board Bin Meng
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=20220420055248.960491-5-alistair.francis@opensource.wdc.com \
--to=alistair.francis@opensource.wdc.com \
--cc=alistair.francis@wdc.com \
--cc=alistair23@gmail.com \
--cc=alistair@alistair23.me \
--cc=bin.meng@windriver.com \
--cc=bmeng.cn@gmail.com \
--cc=edgar.iglesias@gmail.com \
--cc=palmer@dabbelt.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@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).