From: Alistair Francis <alistair23@gmail.com> To: Bin Meng <bmeng.cn@gmail.com> Cc: "open list:RISC-V" <qemu-riscv@nongnu.org>, Palmer Dabbelt <palmer@sifive.com>, Alistair Francis <Alistair.Francis@wdc.com>, "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org> Subject: Re: [Qemu-devel] [PATCH v4 17/28] riscv: sifive: Implement PRCI model for FU540 Date: Mon, 19 Aug 2019 13:21:18 -0700 Message-ID: <CAKmqyKMwgZzyUMjkdBxpCy-ZBrr0-a37eFEoEoSMnCDbr_XWCQ@mail.gmail.com> (raw) In-Reply-To: <1566191521-7820-18-git-send-email-bmeng.cn@gmail.com> On Sun, Aug 18, 2019 at 10:30 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > This adds a simple PRCI model for FU540 (sifive_u). It has different > register layout from the existing PRCI model for FE310 (sifive_e). > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > --- > > Changes in v4: > - prefix all macros/variables/functions with SIFIVE_U/sifive_u > in the sifive_u_prci driver > > Changes in v3: None > Changes in v2: None > > hw/riscv/Makefile.objs | 1 + > hw/riscv/sifive_u_prci.c | 165 +++++++++++++++++++++++++++++++++++++++ > include/hw/riscv/sifive_u_prci.h | 90 +++++++++++++++++++++ > 3 files changed, 256 insertions(+) > create mode 100644 hw/riscv/sifive_u_prci.c > create mode 100644 include/hw/riscv/sifive_u_prci.h > > diff --git a/hw/riscv/Makefile.objs b/hw/riscv/Makefile.objs > index c859697..b95bbd5 100644 > --- a/hw/riscv/Makefile.objs > +++ b/hw/riscv/Makefile.objs > @@ -8,6 +8,7 @@ obj-$(CONFIG_SIFIVE) += sifive_gpio.o > obj-$(CONFIG_SIFIVE) += sifive_plic.o > obj-$(CONFIG_SIFIVE) += sifive_test.o > obj-$(CONFIG_SIFIVE_U) += sifive_u.o > +obj-$(CONFIG_SIFIVE_U) += sifive_u_prci.o > obj-$(CONFIG_SIFIVE) += sifive_uart.o > obj-$(CONFIG_SPIKE) += spike.o > obj-$(CONFIG_RISCV_VIRT) += virt.o > diff --git a/hw/riscv/sifive_u_prci.c b/hw/riscv/sifive_u_prci.c > new file mode 100644 > index 0000000..578c643 > --- /dev/null > +++ b/hw/riscv/sifive_u_prci.c > @@ -0,0 +1,165 @@ > +/* > + * QEMU SiFive U PRCI (Power, Reset, Clock, Interrupt) > + * > + * Copyright (c) 2019 Bin Meng <bmeng.cn@gmail.com> > + * > + * Simple model of the PRCI to emulate register reads made by the SDK BSP > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2 or later, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + * > + * You should have received a copy of the GNU General Public License along with > + * this program. If not, see <http://www.gnu.org/licenses/>. > + */ > + > +#include "qemu/osdep.h" > +#include "hw/sysbus.h" > +#include "qemu/module.h" > +#include "target/riscv/cpu.h" > +#include "hw/riscv/sifive_u_prci.h" > + > +static uint64_t sifive_u_prci_read(void *opaque, hwaddr addr, unsigned int size) > +{ > + SiFiveUPRCIState *s = opaque; > + > + switch (addr) { > + case SIFIVE_U_PRCI_HFXOSCCFG: > + return s->hfxosccfg; > + case SIFIVE_U_PRCI_COREPLLCFG0: > + return s->corepllcfg0; > + case SIFIVE_U_PRCI_DDRPLLCFG0: > + return s->ddrpllcfg0; > + case SIFIVE_U_PRCI_DDRPLLCFG1: > + return s->ddrpllcfg1; > + case SIFIVE_U_PRCI_GEMGXLPLLCFG0: > + return s->gemgxlpllcfg0; > + case SIFIVE_U_PRCI_GEMGXLPLLCFG1: > + return s->gemgxlpllcfg1; > + case SIFIVE_U_PRCI_CORECLKSEL: > + return s->coreclksel; > + case SIFIVE_U_PRCI_DEVICESRESET: > + return s->devicesreset; > + case SIFIVE_U_PRCI_CLKMUXSTATUS: > + return s->clkmuxstatus; > + } > + > + hw_error("%s: read: addr=0x%x\n", __func__, (int)addr); This should be: qemu_log_mask(LOG_GUEST_ERROR,... instead. > + return 0; > +} > + > +static void sifive_u_prci_write(void *opaque, hwaddr addr, > + uint64_t val64, unsigned int size) > +{ > + SiFiveUPRCIState *s = opaque; > + > + switch (addr) { > + case SIFIVE_U_PRCI_HFXOSCCFG: > + s->hfxosccfg = (uint32_t) val64; > + /* OSC stays ready */ > + s->hfxosccfg |= SIFIVE_U_PRCI_HFXOSCCFG_RDY; > + break; > + case SIFIVE_U_PRCI_COREPLLCFG0: > + s->corepllcfg0 = (uint32_t) val64; > + /* internal feedback */ > + s->corepllcfg0 |= SIFIVE_U_PRCI_PLLCFG0_FSE; > + /* PLL stays locked */ > + s->corepllcfg0 |= SIFIVE_U_PRCI_PLLCFG0_LOCK; > + break; > + case SIFIVE_U_PRCI_DDRPLLCFG0: > + s->ddrpllcfg0 = (uint32_t) val64; > + /* internal feedback */ > + s->ddrpllcfg0 |= SIFIVE_U_PRCI_PLLCFG0_FSE; > + /* PLL stays locked */ > + s->ddrpllcfg0 |= SIFIVE_U_PRCI_PLLCFG0_LOCK; > + break; > + case SIFIVE_U_PRCI_DDRPLLCFG1: > + s->ddrpllcfg1 = (uint32_t) val64; > + break; > + case SIFIVE_U_PRCI_GEMGXLPLLCFG0: > + s->gemgxlpllcfg0 = (uint32_t) val64; > + /* internal feedback */ > + s->gemgxlpllcfg0 |= SIFIVE_U_PRCI_PLLCFG0_FSE; > + /* PLL stays locked */ > + s->gemgxlpllcfg0 |= SIFIVE_U_PRCI_PLLCFG0_LOCK; > + break; > + case SIFIVE_U_PRCI_GEMGXLPLLCFG1: > + s->gemgxlpllcfg1 = (uint32_t) val64; > + break; > + case SIFIVE_U_PRCI_CORECLKSEL: > + s->coreclksel = (uint32_t) val64; > + break; > + case SIFIVE_U_PRCI_DEVICESRESET: > + s->devicesreset = (uint32_t) val64; > + break; > + case SIFIVE_U_PRCI_CLKMUXSTATUS: > + s->clkmuxstatus = (uint32_t) val64; Maybe it's worth creating a 32-bit val variable and using that instead of casting everywhere. > + break; > + default: > + hw_error("%s: bad write: addr=0x%x v=0x%x\n", > + __func__, (int)addr, (int)val64); Same comment about: qemu_log_mask(LOG_GUEST_ERROR, > + } > +} > + > +static const MemoryRegionOps sifive_u_prci_ops = { > + .read = sifive_u_prci_read, > + .write = sifive_u_prci_write, > + .endianness = DEVICE_NATIVE_ENDIAN, > + .valid = { > + .min_access_size = 4, > + .max_access_size = 4 > + } > +}; > + > +static void sifive_u_prci_init(Object *obj) > +{ > + SiFiveUPRCIState *s = SIFIVE_U_PRCI(obj); > + > + memory_region_init_io(&s->mmio, obj, &sifive_u_prci_ops, s, > + TYPE_SIFIVE_U_PRCI, SIFIVE_U_PRCI_REG_SIZE); > + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio); > + > + /* Initialize register to power-on-reset values */ > + s->hfxosccfg = (SIFIVE_U_PRCI_HFXOSCCFG_RDY | SIFIVE_U_PRCI_HFXOSCCFG_EN); > + s->corepllcfg0 = (SIFIVE_U_PRCI_PLLCFG0_DIVR | SIFIVE_U_PRCI_PLLCFG0_DIVF | > + SIFIVE_U_PRCI_PLLCFG0_DIVQ | SIFIVE_U_PRCI_PLLCFG0_FSE | > + SIFIVE_U_PRCI_PLLCFG0_LOCK); > + s->ddrpllcfg0 = (SIFIVE_U_PRCI_PLLCFG0_DIVR | SIFIVE_U_PRCI_PLLCFG0_DIVF | > + SIFIVE_U_PRCI_PLLCFG0_DIVQ | SIFIVE_U_PRCI_PLLCFG0_FSE | > + SIFIVE_U_PRCI_PLLCFG0_LOCK); > + s->gemgxlpllcfg0 = (SIFIVE_U_PRCI_PLLCFG0_DIVR | > + SIFIVE_U_PRCI_PLLCFG0_DIVF | > + SIFIVE_U_PRCI_PLLCFG0_DIVQ | > + SIFIVE_U_PRCI_PLLCFG0_FSE | > + SIFIVE_U_PRCI_PLLCFG0_LOCK); > + s->coreclksel = SIFIVE_U_PRCI_CORECLKSEL_HFCLK; These should be in the reset functino shouldn't they? > +} > + > +static const TypeInfo sifive_u_prci_info = { > + .name = TYPE_SIFIVE_U_PRCI, > + .parent = TYPE_SYS_BUS_DEVICE, > + .instance_size = sizeof(SiFiveUPRCIState), > + .instance_init = sifive_u_prci_init, > +}; > + > +static void sifive_u_prci_register_types(void) > +{ > + type_register_static(&sifive_u_prci_info); > +} > + > +type_init(sifive_u_prci_register_types) > + > + > +/* Create PRCI device */ > +DeviceState *sifive_u_prci_create(hwaddr addr) > +{ > + DeviceState *dev = qdev_create(NULL, TYPE_SIFIVE_U_PRCI); > + qdev_init_nofail(dev); > + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, addr); > + return dev; > +} Don't do this, just create it in the machine. > diff --git a/include/hw/riscv/sifive_u_prci.h b/include/hw/riscv/sifive_u_prci.h > new file mode 100644 > index 0000000..66eacb5 > --- /dev/null > +++ b/include/hw/riscv/sifive_u_prci.h > @@ -0,0 +1,90 @@ > +/* > + * QEMU SiFive U PRCI (Power, Reset, Clock, Interrupt) interface > + * > + * Copyright (c) 2019 Bin Meng <bmeng.cn@gmail.com> > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2 or later, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope it will be useful, but WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > + * more details. > + * > + * You should have received a copy of the GNU General Public License along with > + * this program. If not, see <http://www.gnu.org/licenses/>. > + */ > + > +#ifndef HW_SIFIVE_U_PRCI_H > +#define HW_SIFIVE_U_PRCI_H > + > +enum { > + SIFIVE_U_PRCI_HFXOSCCFG = 0x00, > + SIFIVE_U_PRCI_COREPLLCFG0 = 0x04, > + SIFIVE_U_PRCI_DDRPLLCFG0 = 0x0C, > + SIFIVE_U_PRCI_DDRPLLCFG1 = 0x10, > + SIFIVE_U_PRCI_GEMGXLPLLCFG0 = 0x1C, > + SIFIVE_U_PRCI_GEMGXLPLLCFG1 = 0x20, > + SIFIVE_U_PRCI_CORECLKSEL = 0x24, > + SIFIVE_U_PRCI_DEVICESRESET = 0x28, > + SIFIVE_U_PRCI_CLKMUXSTATUS = 0x2C > +}; > + > +/* > + * Current FU540-C000 manual says ready bit is at bit 29, but > + * freedom-u540-c000-bootloader codes (ux00prci.h) says it is at bit 31. > + * We have to trust the actual codes that worked. s/codes that worked/code that works/g > + * > + * see https://github.com/sifive/freedom-u540-c000-bootloader > + */ > +enum { > + SIFIVE_U_PRCI_HFXOSCCFG_EN = (1 << 30), > + SIFIVE_U_PRCI_HFXOSCCFG_RDY = (1 << 31), > +}; > + > +/* xxxPLLCFG0 register bits */ > +enum { > + SIFIVE_U_PRCI_PLLCFG0_DIVR = (1 << 0), > + SIFIVE_U_PRCI_PLLCFG0_DIVF = (31 << 6), > + SIFIVE_U_PRCI_PLLCFG0_DIVQ = (3 << 15), > + SIFIVE_U_PRCI_PLLCFG0_FSE = (1 << 25), > + SIFIVE_U_PRCI_PLLCFG0_LOCK = (1 << 31) > +}; > + > +/* xxxPLLCFG1 register bits */ > +enum { > + SIFIVE_U_PRCI_PLLCFG1_CKE = (1 << 24) > +}; > + > +enum { > + SIFIVE_U_PRCI_CORECLKSEL_HFCLK = (1 << 0) > +}; Why use enums for eveythign instead of #defines? Alistair > + > +#define SIFIVE_U_PRCI_REG_SIZE 0x1000 > + > +#define TYPE_SIFIVE_U_PRCI "riscv.sifive.u.prci" > + > +#define SIFIVE_U_PRCI(obj) \ > + OBJECT_CHECK(SiFiveUPRCIState, (obj), TYPE_SIFIVE_U_PRCI) > + > +typedef struct SiFiveUPRCIState { > + /*< private >*/ > + SysBusDevice parent_obj; > + > + /*< public >*/ > + MemoryRegion mmio; > + uint32_t hfxosccfg; > + uint32_t corepllcfg0; > + uint32_t ddrpllcfg0; > + uint32_t ddrpllcfg1; > + uint32_t gemgxlpllcfg0; > + uint32_t gemgxlpllcfg1; > + uint32_t coreclksel; > + uint32_t devicesreset; > + uint32_t clkmuxstatus; > +} SiFiveUPRCIState; > + > +DeviceState *sifive_u_prci_create(hwaddr addr); > + > +#endif /* HW_SIFIVE_U_PRCI_H */ > -- > 2.7.4 > >
next prev parent reply index Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-19 5:11 [Qemu-devel] [PATCH v4 00/28] riscv: sifive_u: Improve the emulation fidelity of sifive_u machine Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 01/28] riscv: hw: Remove superfluous "linux, phandle" property Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 02/28] riscv: hw: Use qemu_fdt_setprop_cell() for property with only 1 cell Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 03/28] riscv: hw: Remove not needed PLIC properties in device tree Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 04/28] riscv: hw: Change create_fdt() to return void Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 05/28] riscv: roms: Remove executable attribute of opensbi images Bin Meng 2019-08-19 20:08 ` Alistair Francis 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 06/28] riscv: sifive_u: Remove the unnecessary include of prci header Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 07/28] riscv: sifive: Rename sifive_prci.{c, h} to sifive_e_prci.{c, h} Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 08/28] riscv: sifive_e: prci: Fix a typo of hfxosccfg register programming Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 09/28] riscv: sifive_e: prci: Update the PRCI register block size Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 11/28] riscv: Add a sifive_cpu.h to include both E and U cpu type defines Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 12/28] riscv: hart: Extract hart realize to a separate routine Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 13/28] riscv: hart: Add a "hartid-base" property to RISC-V hart array Bin Meng 2019-08-22 22:40 ` Alistair Francis 2019-08-23 1:57 ` Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 14/28] riscv: sifive_u: Update hart configuration to reflect the real FU540 SoC Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 15/28] riscv: sifive_u: Set the minimum number of cpus to 2 Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 16/28] riscv: sifive_u: Update PLIC hart topology configuration string Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 17/28] riscv: sifive: Implement PRCI model for FU540 Bin Meng 2019-08-19 20:21 ` Alistair Francis [this message] 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 18/28] riscv: sifive_u: Generate hfclk and rtcclk nodes Bin Meng 2019-08-19 20:22 ` Alistair Francis 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 19/28] riscv: sifive_u: Add PRCI block to the SoC Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 20/28] riscv: sifive_u: Reference PRCI clocks in UART and ethernet nodes Bin Meng 2019-08-20 18:26 ` Alistair Francis 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 21/28] riscv: sifive_u: Update UART base addresses and IRQs Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 22/28] riscv: sifive_u: Change UART node name in device tree Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 23/28] riscv: roms: Update default bios for sifive_u machine Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 24/28] riscv: sifive: Implement a model for SiFive FU540 OTP Bin Meng 2019-08-22 22:41 ` Alistair Francis 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 25/28] riscv: sifive_u: Instantiate OTP memory with a serial number Bin Meng 2019-08-19 5:11 ` [Qemu-devel] [PATCH v4 26/28] riscv: sifive_u: Fix broken GEM support Bin Meng 2019-08-19 5:12 ` [Qemu-devel] [PATCH v4 27/28] riscv: sifive_u: Remove handcrafted clock nodes for UART and ethernet Bin Meng 2019-08-22 22:39 ` Alistair Francis 2019-08-19 5:12 ` [Qemu-devel] [PATCH v4 28/28] riscv: sifive_u: Update model and compatible strings in device tree 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=CAKmqyKMwgZzyUMjkdBxpCy-ZBrr0-a37eFEoEoSMnCDbr_XWCQ@mail.gmail.com \ --to=alistair23@gmail.com \ --cc=Alistair.Francis@wdc.com \ --cc=bmeng.cn@gmail.com \ --cc=palmer@sifive.com \ --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
QEMU-Devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git git clone --mirror https://lore.kernel.org/qemu-devel/2 qemu-devel/git/2.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \ qemu-devel@nongnu.org public-inbox-index qemu-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git