From: Bin Meng <bmeng.cn@gmail.com>
To: Alistair Francis <Alistair.Francis@wdc.com>,
Bastian Koppelmann <kbastian@mail.uni-paderborn.de>,
Palmer Dabbelt <palmer@sifive.com>,
Sagar Karandikar <sagark@eecs.berkeley.edu>,
qemu-devel@nongnu.org, qemu-riscv@nongnu.org
Subject: [Qemu-devel] [PATCH 16/28] riscv: sifive_u: Add PRCI block to the SoC
Date: Mon, 5 Aug 2019 09:00:11 -0700 [thread overview]
Message-ID: <1565020823-24223-17-git-send-email-bmeng.cn@gmail.com> (raw)
In-Reply-To: <1565020823-24223-1-git-send-email-bmeng.cn@gmail.com>
Add PRCI mmio base address and size mappings to sifive_u machine,
and generate the corresponding device tree node.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---
hw/riscv/sifive_u.c | 21 ++++++++++++++++++++-
include/hw/riscv/sifive_u.h | 1 +
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index f619ca6..20dee52 100644
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -9,6 +9,7 @@
* 0) UART
* 1) CLINT (Core Level Interruptor)
* 2) PLIC (Platform Level Interrupt Controller)
+ * 3) PRCI (Power, Reset, Clock, Interrupt)
*
* This board currently uses a hardcoded devicetree that indicates five harts.
*
@@ -41,6 +42,7 @@
#include "hw/riscv/sifive_clint.h"
#include "hw/riscv/sifive_uart.h"
#include "hw/riscv/sifive_u.h"
+#include "hw/riscv/sifive_u_prci.h"
#include "hw/riscv/boot.h"
#include "chardev/char.h"
#include "sysemu/arch_init.h"
@@ -59,6 +61,7 @@ static const struct MemmapEntry {
[SIFIVE_U_MROM] = { 0x1000, 0x11000 },
[SIFIVE_U_CLINT] = { 0x2000000, 0x10000 },
[SIFIVE_U_PLIC] = { 0xc000000, 0x4000000 },
+ [SIFIVE_U_PRCI] = { 0x10000000, 0x1000 },
[SIFIVE_U_UART0] = { 0x10010000, 0x1000 },
[SIFIVE_U_UART1] = { 0x10011000, 0x1000 },
[SIFIVE_U_DRAM] = { 0x80000000, 0x0 },
@@ -75,7 +78,7 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,
uint32_t *cells;
char *nodename;
char ethclk_names[] = "pclk\0hclk\0tx_clk";
- uint32_t plic_phandle, ethclk_phandle, phandle = 1;
+ uint32_t plic_phandle, prci_phandle, ethclk_phandle, phandle = 1;
uint32_t hfclk_phandle, rtcclk_phandle;
fdt = s->fdt = create_device_tree(&s->fdt_size);
@@ -182,6 +185,21 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,
g_free(cells);
g_free(nodename);
+ prci_phandle = phandle++;
+ nodename = g_strdup_printf("/soc/clock-controller@%lx",
+ (long)memmap[SIFIVE_U_PRCI].base);
+ qemu_fdt_add_subnode(fdt, nodename);
+ qemu_fdt_setprop_cell(fdt, nodename, "phandle", prci_phandle);
+ qemu_fdt_setprop_cell(fdt, nodename, "#clock-cells", 0x1);
+ qemu_fdt_setprop_cells(fdt, nodename, "clocks",
+ hfclk_phandle, rtcclk_phandle);
+ qemu_fdt_setprop_cells(fdt, nodename, "reg",
+ 0x0, memmap[SIFIVE_U_PRCI].base,
+ 0x0, memmap[SIFIVE_U_PRCI].size);
+ qemu_fdt_setprop_string(fdt, nodename, "compatible",
+ "sifive,fu540-c000-prci");
+ g_free(nodename);
+
plic_phandle = phandle++;
cells = g_new0(uint32_t, s->soc.cpus.num_harts * 4 - 2);
for (cpu = 0; cpu < s->soc.cpus.num_harts; cpu++) {
@@ -421,6 +439,7 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp)
sifive_clint_create(memmap[SIFIVE_U_CLINT].base,
memmap[SIFIVE_U_CLINT].size, ms->smp.cpus,
SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE, SIFIVE_TIME_BASE);
+ sifive_u_prci_create(memmap[SIFIVE_U_PRCI].base);
for (i = 0; i < SIFIVE_U_PLIC_NUM_SOURCES; i++) {
plic_gpios[i] = qdev_get_gpio_in(DEVICE(s->plic), i);
diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h
index bacd60f..19d5a6f 100644
--- a/include/hw/riscv/sifive_u.h
+++ b/include/hw/riscv/sifive_u.h
@@ -51,6 +51,7 @@ enum {
SIFIVE_U_MROM,
SIFIVE_U_CLINT,
SIFIVE_U_PLIC,
+ SIFIVE_U_PRCI,
SIFIVE_U_UART0,
SIFIVE_U_UART1,
SIFIVE_U_DRAM,
--
2.7.4
next prev parent reply other threads:[~2019-08-05 16:08 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-05 15:59 [Qemu-devel] [PATCH 00/28] riscv: sifive_u: Improve the emulation fidelity of sifive_u machine Bin Meng
2019-08-05 15:59 ` [Qemu-devel] [PATCH 01/28] riscv: hw: Remove superfluous "linux, phandle" property Bin Meng
2019-08-06 0:11 ` Alistair Francis
2019-08-05 15:59 ` [Qemu-devel] [PATCH 02/28] riscv: hw: Use qemu_fdt_setprop_cell() for property with only 1 cell Bin Meng
2019-08-06 0:13 ` Alistair Francis
2019-08-05 15:59 ` [Qemu-devel] [PATCH 03/28] riscv: Add a sifive_cpu.h to include both E and U cpu type defines Bin Meng
2019-08-06 0:14 ` Alistair Francis
2019-08-05 15:59 ` [Qemu-devel] [PATCH 04/28] riscv: hart: Extract hart realize to a separate routine Bin Meng
2019-08-05 16:00 ` [Qemu-devel] [PATCH 05/28] riscv: hart: Support heterogeneous harts population Bin Meng
2019-08-05 16:00 ` [Qemu-devel] [PATCH 06/28] riscv: sifive_u: Update hart configuration to reflect the real FU540 SoC Bin Meng
2019-08-05 16:00 ` [Qemu-devel] [PATCH 07/28] riscv: sifive_u: Set the minimum number of cpus to 2 Bin Meng
2019-08-05 16:41 ` [Qemu-devel] [Qemu-riscv] " Jonathan Behrens
2019-08-06 0:16 ` Alistair Francis
2019-08-05 16:00 ` [Qemu-devel] [PATCH 08/28] riscv: sifive_u: Update PLIC hart topology configuration string Bin Meng
2019-08-06 0:17 ` Alistair Francis
2019-08-05 16:00 ` [Qemu-devel] [PATCH 09/28] riscv: sifive_u: Update UART base addresses Bin Meng
2019-08-05 16:44 ` [Qemu-devel] [Qemu-riscv] " Jonathan Behrens
2019-08-06 0:19 ` [Qemu-devel] " Alistair Francis
2019-08-05 16:00 ` [Qemu-devel] [PATCH 10/28] riscv: sifive_u: Remove the unnecessary include of prci header Bin Meng
2019-08-06 0:18 ` Alistair Francis
2019-08-05 16:00 ` [Qemu-devel] [PATCH 11/28] riscv: sifive: Rename sifive_prci.{c, h} to sifive_e_prci.{c, h} Bin Meng
2019-08-05 16:00 ` [Qemu-devel] [PATCH 12/28] riscv: sifive_e: prci: Fix a typo of hfxosccfg register programming Bin Meng
2019-08-06 0:18 ` Alistair Francis
2019-08-05 16:00 ` [Qemu-devel] [PATCH 13/28] riscv: sifive_e: prci: Update the PRCI register block size Bin Meng
2019-08-05 16:00 ` [Qemu-devel] [PATCH 14/28] riscv: sifive: Implement PRCI model for FU540 Bin Meng
2019-08-05 16:00 ` [Qemu-devel] [PATCH 15/28] riscv: sifive_u: Generate hfclk and rtcclk nodes Bin Meng
2019-08-05 16:00 ` Bin Meng [this message]
2019-08-05 16:00 ` [Qemu-devel] [PATCH 17/28] riscv: sifive_u: Change UART node name in device tree Bin Meng
2019-08-06 0:20 ` Alistair Francis
2019-08-05 16:00 ` [Qemu-devel] [PATCH 18/28] riscv: hw: Implement a model for SiFive FU540 OTP Bin Meng
2019-08-05 16:00 ` [Qemu-devel] [PATCH 21/28] riscv: sifive_u: Update UART and ethernet node clock properties Bin Meng
2019-08-05 16:00 ` [Qemu-devel] [PATCH 22/28] riscv: sifive_u: Generate an aliases node in the device tree Bin Meng
2019-08-05 16:00 ` [Qemu-devel] [PATCH 23/28] riscv: sifive: Move sifive_mmio_emulate() to a common place Bin Meng
2019-08-06 0:25 ` Alistair Francis
2019-08-05 16:00 ` [Qemu-devel] [PATCH 24/28] riscv: sifive_u: Fix broken GEM support Bin Meng
2019-08-05 16:00 ` [Qemu-devel] [PATCH 25/28] riscv: sifive_u: Support loading initramfs Bin Meng
2019-08-05 16:00 ` [Qemu-devel] [PATCH 26/28] riscv: hw: Update PLIC device tree Bin Meng
2019-08-05 17:00 ` [Qemu-devel] [Qemu-riscv] " Jonathan Behrens
2019-08-05 16:00 ` [Qemu-devel] [PATCH 27/28] riscv: virt: Change create_fdt() to return void Bin Meng
2019-08-05 16:00 ` [Qemu-devel] [PATCH 28/28] riscv: sifive_u: Update model and compatible strings in device tree Bin Meng
2019-08-06 0:22 ` Alistair Francis
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=1565020823-24223-17-git-send-email-bmeng.cn@gmail.com \
--to=bmeng.cn@gmail.com \
--cc=Alistair.Francis@wdc.com \
--cc=kbastian@mail.uni-paderborn.de \
--cc=palmer@sifive.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).