* [PATCH v4 2/2] hw/riscv: Initial support for BOSC's Xiangshan Kunminghu FPGA prototype @ 2025-04-25 12:22 Ran Wang 2025-06-09 4:26 ` Alistair Francis 2025-06-17 2:59 ` Alistair Francis 0 siblings, 2 replies; 5+ messages in thread From: Ran Wang @ 2025-04-25 12:22 UTC (permalink / raw) To: alistair23 Cc: 3543977024, palmer, alistair.francis, liwei1518, dbarboza, zhiwei_liu, qemu-riscv, qemu-devel From: Huang Borong <3543977024@qq.com> This implementation provides emulation for the Xiangshan Kunminghu FPGA prototype platform, including support for UART, CLINT, IMSIC, and APLIC devices. More details can be found at https://github.com/OpenXiangShan/XiangShan Signed-off-by: qinshaoqing <qinshaoqing@bosc.ac.cn> Signed-off-by: Yang Wang <wangyang@bosc.ac.cn> Signed-off-by: Yu Hu <huyu@bosc.ac.cn> Signed-off-by: Ran Wang <wangran@bosc.ac.cn> Signed-off-by: Borong Huang <3543977024@qq.com> Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> --- MAINTAINERS | 7 + configs/devices/riscv64-softmmu/default.mak | 1 + docs/system/riscv/xiangshan-kunminghu.rst | 39 ++++ docs/system/target-riscv.rst | 1 + hw/riscv/Kconfig | 9 + hw/riscv/meson.build | 1 + hw/riscv/xiangshan_kmh.c | 220 ++++++++++++++++++++ include/hw/riscv/xiangshan_kmh.h | 78 +++++++ 8 files changed, 356 insertions(+) create mode 100644 docs/system/riscv/xiangshan-kunminghu.rst create mode 100644 hw/riscv/xiangshan_kmh.c create mode 100644 include/hw/riscv/xiangshan_kmh.h diff --git a/MAINTAINERS b/MAINTAINERS index 8978adf999..a9258bd610 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1667,6 +1667,13 @@ S: Maintained F: hw/riscv/microblaze-v-generic.c F: docs/system/riscv/microblaze-v-generic.rst +Xiangshan Kunminghu +M: Ran Wang <wangran@bosc.ac.cn> +S: Maintained +F: docs/system/riscv/xiangshan-kunminghu.rst +F: hw/riscv/xiangshan_kmh.c +F: include/hw/riscv/xiangshan_kmh.h + RX Machines ----------- rx-gdbsim diff --git a/configs/devices/riscv64-softmmu/default.mak b/configs/devices/riscv64-softmmu/default.mak index 39ed3a0061..e485bbd1a3 100644 --- a/configs/devices/riscv64-softmmu/default.mak +++ b/configs/devices/riscv64-softmmu/default.mak @@ -11,3 +11,4 @@ # CONFIG_RISCV_VIRT=n # CONFIG_MICROCHIP_PFSOC=n # CONFIG_SHAKTI_C=n +# CONFIG_XIANGSHAN_KUNMINGHU=n diff --git a/docs/system/riscv/xiangshan-kunminghu.rst b/docs/system/riscv/xiangshan-kunminghu.rst new file mode 100644 index 0000000000..46e7ceeda0 --- /dev/null +++ b/docs/system/riscv/xiangshan-kunminghu.rst @@ -0,0 +1,39 @@ +BOSC Xiangshan Kunminghu FPGA prototype platform (``xiangshan-kunminghu``) +========================================================================== +The ``xiangshan-kunminghu`` machine is compatible with our FPGA prototype +platform. + +XiangShan is an open-source high-performance RISC-V processor project. +The third generation processor is called Kunminghu. Kunminghu is a 64-bit +RV64GCBSUHV processor core. More information can be found in our Github +repository: +https://github.com/OpenXiangShan/XiangShan + +Supported devices +----------------- +The ``xiangshan-kunminghu`` machine supports the following devices: + +* Up to 16 xiangshan-kunminghu cores +* Core Local Interruptor (CLINT) +* Incoming MSI Controller (IMSIC) +* Advanced Platform-Level Interrupt Controller (APLIC) +* 1 UART + +Boot options +------------ +The ``xiangshan-kunminghu`` machine can start using the standard ``-bios`` +functionality for loading the boot image. You need to compile and link +the firmware, kernel, and Device Tree (FDT) into a single binary file, +such as ``fw_payload.bin``. + +Running +------- +Below is an example command line for running the ``xiangshan-kunminghu`` +machine: + +.. code-block:: bash + + $ qemu-system-riscv64 -machine xiangshan-kunminghu \ + -smp 16 -m 16G \ + -bios path/to/opensbi/platform/generic/firmware/fw_payload.bin \ + -nographic diff --git a/docs/system/target-riscv.rst b/docs/system/target-riscv.rst index 95457af130..89b2cb732c 100644 --- a/docs/system/target-riscv.rst +++ b/docs/system/target-riscv.rst @@ -71,6 +71,7 @@ undocumented; you can get a complete list by running riscv/shakti-c riscv/sifive_u riscv/virt + riscv/xiangshan-kunminghu RISC-V CPU firmware ------------------- diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig index e6a0ac1fa1..fc9c35bd98 100644 --- a/hw/riscv/Kconfig +++ b/hw/riscv/Kconfig @@ -119,3 +119,12 @@ config SPIKE select HTIF select RISCV_ACLINT select SIFIVE_PLIC + +config XIANGSHAN_KUNMINGHU + bool + default y + depends on RISCV64 + select RISCV_ACLINT + select RISCV_APLIC + select RISCV_IMSIC + select SERIAL_MM diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build index c22f3a7216..2a8d5b136c 100644 --- a/hw/riscv/meson.build +++ b/hw/riscv/meson.build @@ -13,5 +13,6 @@ riscv_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) riscv_ss.add(when: 'CONFIG_RISCV_IOMMU', if_true: files( 'riscv-iommu.c', 'riscv-iommu-pci.c', 'riscv-iommu-sys.c', 'riscv-iommu-hpm.c')) riscv_ss.add(when: 'CONFIG_MICROBLAZE_V', if_true: files('microblaze-v-generic.c')) +riscv_ss.add(when: 'CONFIG_XIANGSHAN_KUNMINGHU', if_true: files('xiangshan_kmh.c')) hw_arch += {'riscv': riscv_ss} diff --git a/hw/riscv/xiangshan_kmh.c b/hw/riscv/xiangshan_kmh.c new file mode 100644 index 0000000000..f7ae879d13 --- /dev/null +++ b/hw/riscv/xiangshan_kmh.c @@ -0,0 +1,220 @@ +/* + * QEMU RISC-V Board Compatible with the Xiangshan Kunminghu + * FPGA prototype platform + * + * Copyright (c) 2025 Beijing Institute of Open Source Chip (BOSC) + * SPDX-License-Identifier: GPL-2.0-or-later + * + * Provides a board compatible with the Xiangshan Kunminghu + * FPGA prototype platform: + * + * 0) UART (16550A) + * 1) CLINT (Core-Local Interruptor) + * 2) IMSIC (Incoming MSI Controller) + * 3) APLIC (Advanced Platform-Level Interrupt Controller) + * + * More information can be found in our Github repository: + * https://github.com/OpenXiangShan/XiangShan + * + * 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 "qapi/error.h" +#include "exec/address-spaces.h" +#include "hw/boards.h" +#include "hw/char/serial-mm.h" +#include "hw/intc/riscv_aclint.h" +#include "hw/intc/riscv_aplic.h" +#include "hw/intc/riscv_imsic.h" +#include "hw/qdev-properties.h" +#include "hw/riscv/boot.h" +#include "hw/riscv/xiangshan_kmh.h" +#include "hw/riscv/riscv_hart.h" +#include "system/system.h" + +static const MemMapEntry xiangshan_kmh_memmap[] = { + [XIANGSHAN_KMH_ROM] = { 0x1000, 0xF000 }, + [XIANGSHAN_KMH_UART0] = { 0x310B0000, 0x10000 }, + [XIANGSHAN_KMH_CLINT] = { 0x38000000, 0x10000 }, + [XIANGSHAN_KMH_APLIC_M] = { 0x31100000, 0x4000 }, + [XIANGSHAN_KMH_APLIC_S] = { 0x31120000, 0x4000 }, + [XIANGSHAN_KMH_IMSIC_M] = { 0x3A800000, 0x10000 }, + [XIANGSHAN_KMH_IMSIC_S] = { 0x3B000000, 0x80000 }, + [XIANGSHAN_KMH_DRAM] = { 0x80000000, 0x0 }, +}; + +static DeviceState *xiangshan_kmh_create_aia(uint32_t num_harts) +{ + int i; + const MemMapEntry *memmap = xiangshan_kmh_memmap; + hwaddr addr = 0; + DeviceState *aplic_m = NULL; + + /* M-level IMSICs */ + addr = memmap[XIANGSHAN_KMH_IMSIC_M].base; + for (i = 0; i < num_harts; i++) { + riscv_imsic_create(addr + i * IMSIC_HART_SIZE(0), i, true, + 1, XIANGSHAN_KMH_IMSIC_NUM_IDS); + } + + /* S-level IMSICs */ + addr = memmap[XIANGSHAN_KMH_IMSIC_S].base; + for (i = 0; i < num_harts; i++) { + riscv_imsic_create(addr + + i * IMSIC_HART_SIZE(XIANGSHAN_KMH_IMSIC_GUEST_BITS), + i, false, 1 + XIANGSHAN_KMH_IMSIC_GUEST_BITS, + XIANGSHAN_KMH_IMSIC_NUM_IDS); + } + + /* M-level APLIC */ + aplic_m = riscv_aplic_create(memmap[XIANGSHAN_KMH_APLIC_M].base, + memmap[XIANGSHAN_KMH_APLIC_M].size, + 0, 0, XIANGSHAN_KMH_APLIC_NUM_SOURCES, + 1, true, true, NULL); + + /* S-level APLIC */ + riscv_aplic_create(memmap[XIANGSHAN_KMH_APLIC_S].base, + memmap[XIANGSHAN_KMH_APLIC_S].size, + 0, 0, XIANGSHAN_KMH_APLIC_NUM_SOURCES, + 1, true, false, aplic_m); + + return aplic_m; +} + +static void xiangshan_kmh_soc_realize(DeviceState *dev, Error **errp) +{ + MachineState *ms = MACHINE(qdev_get_machine()); + XiangshanKmhSoCState *s = XIANGSHAN_KMH_SOC(dev); + const MemMapEntry *memmap = xiangshan_kmh_memmap; + MemoryRegion *system_memory = get_system_memory(); + uint32_t num_harts = ms->smp.cpus; + + qdev_prop_set_uint32(DEVICE(&s->cpus), "num-harts", num_harts); + qdev_prop_set_uint32(DEVICE(&s->cpus), "hartid-base", 0); + qdev_prop_set_string(DEVICE(&s->cpus), "cpu-type", + TYPE_RISCV_CPU_XIANGSHAN_KMH); + sysbus_realize(SYS_BUS_DEVICE(&s->cpus), &error_fatal); + + /* AIA */ + s->irqchip = xiangshan_kmh_create_aia(num_harts); + + /* UART */ + serial_mm_init(system_memory, memmap[XIANGSHAN_KMH_UART0].base, 2, + qdev_get_gpio_in(s->irqchip, XIANGSHAN_KMH_UART0_IRQ), + 115200, serial_hd(0), DEVICE_LITTLE_ENDIAN); + + /* CLINT */ + riscv_aclint_swi_create(memmap[XIANGSHAN_KMH_CLINT].base, + 0, num_harts, false); + riscv_aclint_mtimer_create(memmap[XIANGSHAN_KMH_CLINT].base + + RISCV_ACLINT_SWI_SIZE, + RISCV_ACLINT_DEFAULT_MTIMER_SIZE, + 0, num_harts, RISCV_ACLINT_DEFAULT_MTIMECMP, + RISCV_ACLINT_DEFAULT_MTIME, + XIANGSHAN_KMH_CLINT_TIMEBASE_FREQ, true); + + /* ROM */ + memory_region_init_rom(&s->rom, OBJECT(dev), "xiangshan.kunminghu.rom", + memmap[XIANGSHAN_KMH_ROM].size, &error_fatal); + memory_region_add_subregion(system_memory, + memmap[XIANGSHAN_KMH_ROM].base, &s->rom); +} + +static void xiangshan_kmh_soc_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->realize = xiangshan_kmh_soc_realize; + dc->user_creatable = false; +} + +static void xiangshan_kmh_soc_instance_init(Object *obj) +{ + XiangshanKmhSoCState *s = XIANGSHAN_KMH_SOC(obj); + + object_initialize_child(obj, "cpus", &s->cpus, TYPE_RISCV_HART_ARRAY); +} + +static const TypeInfo xiangshan_kmh_soc_info = { + .name = TYPE_XIANGSHAN_KMH_SOC, + .parent = TYPE_DEVICE, + .instance_size = sizeof(XiangshanKmhSoCState), + .instance_init = xiangshan_kmh_soc_instance_init, + .class_init = xiangshan_kmh_soc_class_init, +}; + +static void xiangshan_kmh_soc_register_types(void) +{ + type_register_static(&xiangshan_kmh_soc_info); +} +type_init(xiangshan_kmh_soc_register_types) + +static void xiangshan_kmh_machine_init(MachineState *machine) +{ + XiangshanKmhState *s = XIANGSHAN_KMH_MACHINE(machine); + const MemMapEntry *memmap = xiangshan_kmh_memmap; + MemoryRegion *system_memory = get_system_memory(); + hwaddr start_addr = memmap[XIANGSHAN_KMH_DRAM].base; + + /* Initialize SoC */ + object_initialize_child(OBJECT(machine), "soc", &s->soc, + TYPE_XIANGSHAN_KMH_SOC); + qdev_realize(DEVICE(&s->soc), NULL, &error_fatal); + + /* Register RAM */ + memory_region_add_subregion(system_memory, + memmap[XIANGSHAN_KMH_DRAM].base, + machine->ram); + + /* ROM reset vector */ + riscv_setup_rom_reset_vec(machine, &s->soc.cpus, + start_addr, + memmap[XIANGSHAN_KMH_ROM].base, + memmap[XIANGSHAN_KMH_ROM].size, 0, 0); + if (machine->firmware) { + riscv_load_firmware(machine->firmware, &start_addr, NULL); + } + + /* Note: dtb has been integrated into firmware(OpenSBI) when compiling */ +} + +static void xiangshan_kmh_machine_class_init(ObjectClass *klass, void *data) +{ + MachineClass *mc = MACHINE_CLASS(klass); + static const char *const valid_cpu_types[] = { + TYPE_RISCV_CPU_XIANGSHAN_KMH, + NULL + }; + + mc->desc = "RISC-V Board compatible with the Xiangshan " \ + "Kunminghu FPGA prototype platform"; + mc->init = xiangshan_kmh_machine_init; + mc->max_cpus = XIANGSHAN_KMH_MAX_CPUS; + mc->default_cpu_type = TYPE_RISCV_CPU_XIANGSHAN_KMH; + mc->valid_cpu_types = valid_cpu_types; + mc->default_ram_id = "xiangshan.kunminghu.ram"; +} + +static const TypeInfo xiangshan_kmh_machine_info = { + .name = TYPE_XIANGSHAN_KMH_MACHINE, + .parent = TYPE_MACHINE, + .instance_size = sizeof(XiangshanKmhState), + .class_init = xiangshan_kmh_machine_class_init, +}; + +static void xiangshan_kmh_machine_register_types(void) +{ + type_register_static(&xiangshan_kmh_machine_info); +} +type_init(xiangshan_kmh_machine_register_types) diff --git a/include/hw/riscv/xiangshan_kmh.h b/include/hw/riscv/xiangshan_kmh.h new file mode 100644 index 0000000000..952473fbb6 --- /dev/null +++ b/include/hw/riscv/xiangshan_kmh.h @@ -0,0 +1,78 @@ +/* + * QEMU RISC-V Board Compatible with the Xiangshan Kunminghu + * FPGA prototype platform + * + * Copyright (c) 2025 Beijing Institute of Open Source Chip (BOSC) + * + * 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_XIANGSHAN_KMH_H +#define HW_XIANGSHAN_KMH_H + +#include "hw/boards.h" +#include "hw/riscv/riscv_hart.h" + +#define XIANGSHAN_KMH_MAX_CPUS 16 + +typedef struct XiangshanKmhSoCState { + /*< private >*/ + DeviceState parent_obj; + + /*< public >*/ + RISCVHartArrayState cpus; + DeviceState *irqchip; + MemoryRegion rom; +} XiangshanKmhSoCState; + +#define TYPE_XIANGSHAN_KMH_SOC "xiangshan.kunminghu.soc" +DECLARE_INSTANCE_CHECKER(XiangshanKmhSoCState, XIANGSHAN_KMH_SOC, + TYPE_XIANGSHAN_KMH_SOC) + +typedef struct XiangshanKmhState { + /*< private >*/ + MachineState parent_obj; + + /*< public >*/ + XiangshanKmhSoCState soc; +} XiangshanKmhState; + +#define TYPE_XIANGSHAN_KMH_MACHINE MACHINE_TYPE_NAME("xiangshan-kunminghu") +DECLARE_INSTANCE_CHECKER(XiangshanKmhState, XIANGSHAN_KMH_MACHINE, + TYPE_XIANGSHAN_KMH_MACHINE) + +enum { + XIANGSHAN_KMH_ROM, + XIANGSHAN_KMH_UART0, + XIANGSHAN_KMH_CLINT, + XIANGSHAN_KMH_APLIC_M, + XIANGSHAN_KMH_APLIC_S, + XIANGSHAN_KMH_IMSIC_M, + XIANGSHAN_KMH_IMSIC_S, + XIANGSHAN_KMH_DRAM, +}; + +enum { + XIANGSHAN_KMH_UART0_IRQ = 10, +}; + +/* Indicating Timebase-freq (1MHZ) */ +#define XIANGSHAN_KMH_CLINT_TIMEBASE_FREQ 1000000 + +#define XIANGSHAN_KMH_IMSIC_NUM_IDS 255 +#define XIANGSHAN_KMH_IMSIC_NUM_GUESTS 7 +#define XIANGSHAN_KMH_IMSIC_GUEST_BITS 3 + +#define XIANGSHAN_KMH_APLIC_NUM_SOURCES 96 + +#endif -- 2.34.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v4 2/2] hw/riscv: Initial support for BOSC's Xiangshan Kunminghu FPGA prototype 2025-04-25 12:22 [PATCH v4 2/2] hw/riscv: Initial support for BOSC's Xiangshan Kunminghu FPGA prototype Ran Wang @ 2025-06-09 4:26 ` Alistair Francis 2025-06-16 10:06 ` Ran Wang 2025-06-17 2:59 ` Alistair Francis 1 sibling, 1 reply; 5+ messages in thread From: Alistair Francis @ 2025-06-09 4:26 UTC (permalink / raw) To: Ran Wang Cc: 3543977024, palmer, alistair.francis, liwei1518, dbarboza, zhiwei_liu, qemu-riscv, qemu-devel On Fri, Apr 25, 2025 at 10:22 PM Ran Wang <wangran@bosc.ac.cn> wrote: > > From: Huang Borong <3543977024@qq.com> > > This implementation provides emulation for the Xiangshan Kunminghu > FPGA prototype platform, including support for UART, CLINT, IMSIC, > and APLIC devices. More details can be found at > https://github.com/OpenXiangShan/XiangShan > > Signed-off-by: qinshaoqing <qinshaoqing@bosc.ac.cn> > Signed-off-by: Yang Wang <wangyang@bosc.ac.cn> > Signed-off-by: Yu Hu <huyu@bosc.ac.cn> > Signed-off-by: Ran Wang <wangran@bosc.ac.cn> > Signed-off-by: Borong Huang <3543977024@qq.com> > Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> Acked-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > MAINTAINERS | 7 + > configs/devices/riscv64-softmmu/default.mak | 1 + > docs/system/riscv/xiangshan-kunminghu.rst | 39 ++++ > docs/system/target-riscv.rst | 1 + > hw/riscv/Kconfig | 9 + > hw/riscv/meson.build | 1 + > hw/riscv/xiangshan_kmh.c | 220 ++++++++++++++++++++ > include/hw/riscv/xiangshan_kmh.h | 78 +++++++ > 8 files changed, 356 insertions(+) > create mode 100644 docs/system/riscv/xiangshan-kunminghu.rst > create mode 100644 hw/riscv/xiangshan_kmh.c > create mode 100644 include/hw/riscv/xiangshan_kmh.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index 8978adf999..a9258bd610 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1667,6 +1667,13 @@ S: Maintained > F: hw/riscv/microblaze-v-generic.c > F: docs/system/riscv/microblaze-v-generic.rst > > +Xiangshan Kunminghu > +M: Ran Wang <wangran@bosc.ac.cn> > +S: Maintained > +F: docs/system/riscv/xiangshan-kunminghu.rst > +F: hw/riscv/xiangshan_kmh.c > +F: include/hw/riscv/xiangshan_kmh.h > + > RX Machines > ----------- > rx-gdbsim > diff --git a/configs/devices/riscv64-softmmu/default.mak b/configs/devices/riscv64-softmmu/default.mak > index 39ed3a0061..e485bbd1a3 100644 > --- a/configs/devices/riscv64-softmmu/default.mak > +++ b/configs/devices/riscv64-softmmu/default.mak > @@ -11,3 +11,4 @@ > # CONFIG_RISCV_VIRT=n > # CONFIG_MICROCHIP_PFSOC=n > # CONFIG_SHAKTI_C=n > +# CONFIG_XIANGSHAN_KUNMINGHU=n > diff --git a/docs/system/riscv/xiangshan-kunminghu.rst b/docs/system/riscv/xiangshan-kunminghu.rst > new file mode 100644 > index 0000000000..46e7ceeda0 > --- /dev/null > +++ b/docs/system/riscv/xiangshan-kunminghu.rst > @@ -0,0 +1,39 @@ > +BOSC Xiangshan Kunminghu FPGA prototype platform (``xiangshan-kunminghu``) > +========================================================================== > +The ``xiangshan-kunminghu`` machine is compatible with our FPGA prototype > +platform. > + > +XiangShan is an open-source high-performance RISC-V processor project. > +The third generation processor is called Kunminghu. Kunminghu is a 64-bit > +RV64GCBSUHV processor core. More information can be found in our Github > +repository: > +https://github.com/OpenXiangShan/XiangShan > + > +Supported devices > +----------------- > +The ``xiangshan-kunminghu`` machine supports the following devices: > + > +* Up to 16 xiangshan-kunminghu cores > +* Core Local Interruptor (CLINT) > +* Incoming MSI Controller (IMSIC) > +* Advanced Platform-Level Interrupt Controller (APLIC) > +* 1 UART > + > +Boot options > +------------ > +The ``xiangshan-kunminghu`` machine can start using the standard ``-bios`` > +functionality for loading the boot image. You need to compile and link > +the firmware, kernel, and Device Tree (FDT) into a single binary file, > +such as ``fw_payload.bin``. > + > +Running > +------- > +Below is an example command line for running the ``xiangshan-kunminghu`` > +machine: > + > +.. code-block:: bash > + > + $ qemu-system-riscv64 -machine xiangshan-kunminghu \ > + -smp 16 -m 16G \ > + -bios path/to/opensbi/platform/generic/firmware/fw_payload.bin \ > + -nographic > diff --git a/docs/system/target-riscv.rst b/docs/system/target-riscv.rst > index 95457af130..89b2cb732c 100644 > --- a/docs/system/target-riscv.rst > +++ b/docs/system/target-riscv.rst > @@ -71,6 +71,7 @@ undocumented; you can get a complete list by running > riscv/shakti-c > riscv/sifive_u > riscv/virt > + riscv/xiangshan-kunminghu > > RISC-V CPU firmware > ------------------- > diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig > index e6a0ac1fa1..fc9c35bd98 100644 > --- a/hw/riscv/Kconfig > +++ b/hw/riscv/Kconfig > @@ -119,3 +119,12 @@ config SPIKE > select HTIF > select RISCV_ACLINT > select SIFIVE_PLIC > + > +config XIANGSHAN_KUNMINGHU > + bool > + default y > + depends on RISCV64 > + select RISCV_ACLINT > + select RISCV_APLIC > + select RISCV_IMSIC > + select SERIAL_MM > diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build > index c22f3a7216..2a8d5b136c 100644 > --- a/hw/riscv/meson.build > +++ b/hw/riscv/meson.build > @@ -13,5 +13,6 @@ riscv_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) > riscv_ss.add(when: 'CONFIG_RISCV_IOMMU', if_true: files( > 'riscv-iommu.c', 'riscv-iommu-pci.c', 'riscv-iommu-sys.c', 'riscv-iommu-hpm.c')) > riscv_ss.add(when: 'CONFIG_MICROBLAZE_V', if_true: files('microblaze-v-generic.c')) > +riscv_ss.add(when: 'CONFIG_XIANGSHAN_KUNMINGHU', if_true: files('xiangshan_kmh.c')) > > hw_arch += {'riscv': riscv_ss} > diff --git a/hw/riscv/xiangshan_kmh.c b/hw/riscv/xiangshan_kmh.c > new file mode 100644 > index 0000000000..f7ae879d13 > --- /dev/null > +++ b/hw/riscv/xiangshan_kmh.c > @@ -0,0 +1,220 @@ > +/* > + * QEMU RISC-V Board Compatible with the Xiangshan Kunminghu > + * FPGA prototype platform > + * > + * Copyright (c) 2025 Beijing Institute of Open Source Chip (BOSC) > + * SPDX-License-Identifier: GPL-2.0-or-later > + * > + * Provides a board compatible with the Xiangshan Kunminghu > + * FPGA prototype platform: > + * > + * 0) UART (16550A) > + * 1) CLINT (Core-Local Interruptor) > + * 2) IMSIC (Incoming MSI Controller) > + * 3) APLIC (Advanced Platform-Level Interrupt Controller) > + * > + * More information can be found in our Github repository: > + * https://github.com/OpenXiangShan/XiangShan > + * > + * 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 "qapi/error.h" > +#include "exec/address-spaces.h" > +#include "hw/boards.h" > +#include "hw/char/serial-mm.h" > +#include "hw/intc/riscv_aclint.h" > +#include "hw/intc/riscv_aplic.h" > +#include "hw/intc/riscv_imsic.h" > +#include "hw/qdev-properties.h" > +#include "hw/riscv/boot.h" > +#include "hw/riscv/xiangshan_kmh.h" > +#include "hw/riscv/riscv_hart.h" > +#include "system/system.h" > + > +static const MemMapEntry xiangshan_kmh_memmap[] = { > + [XIANGSHAN_KMH_ROM] = { 0x1000, 0xF000 }, > + [XIANGSHAN_KMH_UART0] = { 0x310B0000, 0x10000 }, > + [XIANGSHAN_KMH_CLINT] = { 0x38000000, 0x10000 }, > + [XIANGSHAN_KMH_APLIC_M] = { 0x31100000, 0x4000 }, > + [XIANGSHAN_KMH_APLIC_S] = { 0x31120000, 0x4000 }, > + [XIANGSHAN_KMH_IMSIC_M] = { 0x3A800000, 0x10000 }, > + [XIANGSHAN_KMH_IMSIC_S] = { 0x3B000000, 0x80000 }, > + [XIANGSHAN_KMH_DRAM] = { 0x80000000, 0x0 }, > +}; > + > +static DeviceState *xiangshan_kmh_create_aia(uint32_t num_harts) > +{ > + int i; > + const MemMapEntry *memmap = xiangshan_kmh_memmap; > + hwaddr addr = 0; > + DeviceState *aplic_m = NULL; > + > + /* M-level IMSICs */ > + addr = memmap[XIANGSHAN_KMH_IMSIC_M].base; > + for (i = 0; i < num_harts; i++) { > + riscv_imsic_create(addr + i * IMSIC_HART_SIZE(0), i, true, > + 1, XIANGSHAN_KMH_IMSIC_NUM_IDS); > + } > + > + /* S-level IMSICs */ > + addr = memmap[XIANGSHAN_KMH_IMSIC_S].base; > + for (i = 0; i < num_harts; i++) { > + riscv_imsic_create(addr + > + i * IMSIC_HART_SIZE(XIANGSHAN_KMH_IMSIC_GUEST_BITS), > + i, false, 1 + XIANGSHAN_KMH_IMSIC_GUEST_BITS, > + XIANGSHAN_KMH_IMSIC_NUM_IDS); > + } > + > + /* M-level APLIC */ > + aplic_m = riscv_aplic_create(memmap[XIANGSHAN_KMH_APLIC_M].base, > + memmap[XIANGSHAN_KMH_APLIC_M].size, > + 0, 0, XIANGSHAN_KMH_APLIC_NUM_SOURCES, > + 1, true, true, NULL); > + > + /* S-level APLIC */ > + riscv_aplic_create(memmap[XIANGSHAN_KMH_APLIC_S].base, > + memmap[XIANGSHAN_KMH_APLIC_S].size, > + 0, 0, XIANGSHAN_KMH_APLIC_NUM_SOURCES, > + 1, true, false, aplic_m); > + > + return aplic_m; > +} > + > +static void xiangshan_kmh_soc_realize(DeviceState *dev, Error **errp) > +{ > + MachineState *ms = MACHINE(qdev_get_machine()); > + XiangshanKmhSoCState *s = XIANGSHAN_KMH_SOC(dev); > + const MemMapEntry *memmap = xiangshan_kmh_memmap; > + MemoryRegion *system_memory = get_system_memory(); > + uint32_t num_harts = ms->smp.cpus; > + > + qdev_prop_set_uint32(DEVICE(&s->cpus), "num-harts", num_harts); > + qdev_prop_set_uint32(DEVICE(&s->cpus), "hartid-base", 0); > + qdev_prop_set_string(DEVICE(&s->cpus), "cpu-type", > + TYPE_RISCV_CPU_XIANGSHAN_KMH); > + sysbus_realize(SYS_BUS_DEVICE(&s->cpus), &error_fatal); > + > + /* AIA */ > + s->irqchip = xiangshan_kmh_create_aia(num_harts); > + > + /* UART */ > + serial_mm_init(system_memory, memmap[XIANGSHAN_KMH_UART0].base, 2, > + qdev_get_gpio_in(s->irqchip, XIANGSHAN_KMH_UART0_IRQ), > + 115200, serial_hd(0), DEVICE_LITTLE_ENDIAN); > + > + /* CLINT */ > + riscv_aclint_swi_create(memmap[XIANGSHAN_KMH_CLINT].base, > + 0, num_harts, false); > + riscv_aclint_mtimer_create(memmap[XIANGSHAN_KMH_CLINT].base + > + RISCV_ACLINT_SWI_SIZE, > + RISCV_ACLINT_DEFAULT_MTIMER_SIZE, > + 0, num_harts, RISCV_ACLINT_DEFAULT_MTIMECMP, > + RISCV_ACLINT_DEFAULT_MTIME, > + XIANGSHAN_KMH_CLINT_TIMEBASE_FREQ, true); > + > + /* ROM */ > + memory_region_init_rom(&s->rom, OBJECT(dev), "xiangshan.kunminghu.rom", > + memmap[XIANGSHAN_KMH_ROM].size, &error_fatal); > + memory_region_add_subregion(system_memory, > + memmap[XIANGSHAN_KMH_ROM].base, &s->rom); > +} > + > +static void xiangshan_kmh_soc_class_init(ObjectClass *klass, void *data) > +{ > + DeviceClass *dc = DEVICE_CLASS(klass); > + > + dc->realize = xiangshan_kmh_soc_realize; > + dc->user_creatable = false; > +} > + > +static void xiangshan_kmh_soc_instance_init(Object *obj) > +{ > + XiangshanKmhSoCState *s = XIANGSHAN_KMH_SOC(obj); > + > + object_initialize_child(obj, "cpus", &s->cpus, TYPE_RISCV_HART_ARRAY); > +} > + > +static const TypeInfo xiangshan_kmh_soc_info = { > + .name = TYPE_XIANGSHAN_KMH_SOC, > + .parent = TYPE_DEVICE, > + .instance_size = sizeof(XiangshanKmhSoCState), > + .instance_init = xiangshan_kmh_soc_instance_init, > + .class_init = xiangshan_kmh_soc_class_init, > +}; > + > +static void xiangshan_kmh_soc_register_types(void) > +{ > + type_register_static(&xiangshan_kmh_soc_info); > +} > +type_init(xiangshan_kmh_soc_register_types) > + > +static void xiangshan_kmh_machine_init(MachineState *machine) > +{ > + XiangshanKmhState *s = XIANGSHAN_KMH_MACHINE(machine); > + const MemMapEntry *memmap = xiangshan_kmh_memmap; > + MemoryRegion *system_memory = get_system_memory(); > + hwaddr start_addr = memmap[XIANGSHAN_KMH_DRAM].base; > + > + /* Initialize SoC */ > + object_initialize_child(OBJECT(machine), "soc", &s->soc, > + TYPE_XIANGSHAN_KMH_SOC); > + qdev_realize(DEVICE(&s->soc), NULL, &error_fatal); > + > + /* Register RAM */ > + memory_region_add_subregion(system_memory, > + memmap[XIANGSHAN_KMH_DRAM].base, > + machine->ram); > + > + /* ROM reset vector */ > + riscv_setup_rom_reset_vec(machine, &s->soc.cpus, > + start_addr, > + memmap[XIANGSHAN_KMH_ROM].base, > + memmap[XIANGSHAN_KMH_ROM].size, 0, 0); > + if (machine->firmware) { > + riscv_load_firmware(machine->firmware, &start_addr, NULL); > + } > + > + /* Note: dtb has been integrated into firmware(OpenSBI) when compiling */ > +} > + > +static void xiangshan_kmh_machine_class_init(ObjectClass *klass, void *data) > +{ > + MachineClass *mc = MACHINE_CLASS(klass); > + static const char *const valid_cpu_types[] = { > + TYPE_RISCV_CPU_XIANGSHAN_KMH, > + NULL > + }; > + > + mc->desc = "RISC-V Board compatible with the Xiangshan " \ > + "Kunminghu FPGA prototype platform"; > + mc->init = xiangshan_kmh_machine_init; > + mc->max_cpus = XIANGSHAN_KMH_MAX_CPUS; > + mc->default_cpu_type = TYPE_RISCV_CPU_XIANGSHAN_KMH; > + mc->valid_cpu_types = valid_cpu_types; > + mc->default_ram_id = "xiangshan.kunminghu.ram"; > +} > + > +static const TypeInfo xiangshan_kmh_machine_info = { > + .name = TYPE_XIANGSHAN_KMH_MACHINE, > + .parent = TYPE_MACHINE, > + .instance_size = sizeof(XiangshanKmhState), > + .class_init = xiangshan_kmh_machine_class_init, > +}; > + > +static void xiangshan_kmh_machine_register_types(void) > +{ > + type_register_static(&xiangshan_kmh_machine_info); > +} > +type_init(xiangshan_kmh_machine_register_types) > diff --git a/include/hw/riscv/xiangshan_kmh.h b/include/hw/riscv/xiangshan_kmh.h > new file mode 100644 > index 0000000000..952473fbb6 > --- /dev/null > +++ b/include/hw/riscv/xiangshan_kmh.h > @@ -0,0 +1,78 @@ > +/* > + * QEMU RISC-V Board Compatible with the Xiangshan Kunminghu > + * FPGA prototype platform > + * > + * Copyright (c) 2025 Beijing Institute of Open Source Chip (BOSC) > + * > + * 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_XIANGSHAN_KMH_H > +#define HW_XIANGSHAN_KMH_H > + > +#include "hw/boards.h" > +#include "hw/riscv/riscv_hart.h" > + > +#define XIANGSHAN_KMH_MAX_CPUS 16 > + > +typedef struct XiangshanKmhSoCState { > + /*< private >*/ > + DeviceState parent_obj; > + > + /*< public >*/ > + RISCVHartArrayState cpus; > + DeviceState *irqchip; > + MemoryRegion rom; > +} XiangshanKmhSoCState; > + > +#define TYPE_XIANGSHAN_KMH_SOC "xiangshan.kunminghu.soc" > +DECLARE_INSTANCE_CHECKER(XiangshanKmhSoCState, XIANGSHAN_KMH_SOC, > + TYPE_XIANGSHAN_KMH_SOC) > + > +typedef struct XiangshanKmhState { > + /*< private >*/ > + MachineState parent_obj; > + > + /*< public >*/ > + XiangshanKmhSoCState soc; > +} XiangshanKmhState; > + > +#define TYPE_XIANGSHAN_KMH_MACHINE MACHINE_TYPE_NAME("xiangshan-kunminghu") > +DECLARE_INSTANCE_CHECKER(XiangshanKmhState, XIANGSHAN_KMH_MACHINE, > + TYPE_XIANGSHAN_KMH_MACHINE) > + > +enum { > + XIANGSHAN_KMH_ROM, > + XIANGSHAN_KMH_UART0, > + XIANGSHAN_KMH_CLINT, > + XIANGSHAN_KMH_APLIC_M, > + XIANGSHAN_KMH_APLIC_S, > + XIANGSHAN_KMH_IMSIC_M, > + XIANGSHAN_KMH_IMSIC_S, > + XIANGSHAN_KMH_DRAM, > +}; > + > +enum { > + XIANGSHAN_KMH_UART0_IRQ = 10, > +}; > + > +/* Indicating Timebase-freq (1MHZ) */ > +#define XIANGSHAN_KMH_CLINT_TIMEBASE_FREQ 1000000 > + > +#define XIANGSHAN_KMH_IMSIC_NUM_IDS 255 > +#define XIANGSHAN_KMH_IMSIC_NUM_GUESTS 7 > +#define XIANGSHAN_KMH_IMSIC_GUEST_BITS 3 > + > +#define XIANGSHAN_KMH_APLIC_NUM_SOURCES 96 > + > +#endif > -- > 2.34.1 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v4 2/2] hw/riscv: Initial support for BOSC's Xiangshan Kunminghu FPGA prototype 2025-06-09 4:26 ` Alistair Francis @ 2025-06-16 10:06 ` Ran Wang 0 siblings, 0 replies; 5+ messages in thread From: Ran Wang @ 2025-06-16 10:06 UTC (permalink / raw) To: Alistair Francis Cc: 3543977024, palmer, alistair.francis, liwei1518, dbarboza, zhiwei_liu, qemu-riscv, qemu-devel Hi Alistair, On 2025/6/9 12:26, Alistair Francis wrote: > On Fri, Apr 25, 2025 at 10:22 PM Ran Wang <wangran@bosc.ac.cn> wrote: >> >> From: Huang Borong <3543977024@qq.com> >> >> This implementation provides emulation for the Xiangshan Kunminghu >> FPGA prototype platform, including support for UART, CLINT, IMSIC, >> and APLIC devices. More details can be found at >> https://github.com/OpenXiangShan/XiangShan >> >> Signed-off-by: qinshaoqing <qinshaoqing@bosc.ac.cn> >> Signed-off-by: Yang Wang <wangyang@bosc.ac.cn> >> Signed-off-by: Yu Hu <huyu@bosc.ac.cn> >> Signed-off-by: Ran Wang <wangran@bosc.ac.cn> >> Signed-off-by: Borong Huang <3543977024@qq.com> >> Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > > Acked-by: Alistair Francis <alistair.francis@wdc.com> Thanks for your review. So, what's the next? Do I need to raise any pull request or just wait for it get integrated into branch riscv-to-apply.next ? Thanks & Regards, Ran > Alistair > >> --- >> MAINTAINERS | 7 + >> configs/devices/riscv64-softmmu/default.mak | 1 + >> docs/system/riscv/xiangshan-kunminghu.rst | 39 ++++ >> docs/system/target-riscv.rst | 1 + >> hw/riscv/Kconfig | 9 + >> hw/riscv/meson.build | 1 + >> hw/riscv/xiangshan_kmh.c | 220 ++++++++++++++++++++ >> include/hw/riscv/xiangshan_kmh.h | 78 +++++++ >> 8 files changed, 356 insertions(+) >> create mode 100644 docs/system/riscv/xiangshan-kunminghu.rst >> create mode 100644 hw/riscv/xiangshan_kmh.c >> create mode 100644 include/hw/riscv/xiangshan_kmh.h >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index 8978adf999..a9258bd610 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -1667,6 +1667,13 @@ S: Maintained >> F: hw/riscv/microblaze-v-generic.c >> F: docs/system/riscv/microblaze-v-generic.rst >> >> +Xiangshan Kunminghu >> +M: Ran Wang <wangran@bosc.ac.cn> >> +S: Maintained >> +F: docs/system/riscv/xiangshan-kunminghu.rst >> +F: hw/riscv/xiangshan_kmh.c >> +F: include/hw/riscv/xiangshan_kmh.h >> + >> RX Machines >> ----------- >> rx-gdbsim >> diff --git a/configs/devices/riscv64-softmmu/default.mak b/configs/devices/riscv64-softmmu/default.mak >> index 39ed3a0061..e485bbd1a3 100644 >> --- a/configs/devices/riscv64-softmmu/default.mak >> +++ b/configs/devices/riscv64-softmmu/default.mak >> @@ -11,3 +11,4 @@ >> # CONFIG_RISCV_VIRT=n >> # CONFIG_MICROCHIP_PFSOC=n >> # CONFIG_SHAKTI_C=n >> +# CONFIG_XIANGSHAN_KUNMINGHU=n >> diff --git a/docs/system/riscv/xiangshan-kunminghu.rst b/docs/system/riscv/xiangshan-kunminghu.rst >> new file mode 100644 >> index 0000000000..46e7ceeda0 >> --- /dev/null >> +++ b/docs/system/riscv/xiangshan-kunminghu.rst >> @@ -0,0 +1,39 @@ >> +BOSC Xiangshan Kunminghu FPGA prototype platform (``xiangshan-kunminghu``) >> +========================================================================== >> +The ``xiangshan-kunminghu`` machine is compatible with our FPGA prototype >> +platform. >> + >> +XiangShan is an open-source high-performance RISC-V processor project. >> +The third generation processor is called Kunminghu. Kunminghu is a 64-bit >> +RV64GCBSUHV processor core. More information can be found in our Github >> +repository: >> +https://github.com/OpenXiangShan/XiangShan >> + >> +Supported devices >> +----------------- >> +The ``xiangshan-kunminghu`` machine supports the following devices: >> + >> +* Up to 16 xiangshan-kunminghu cores >> +* Core Local Interruptor (CLINT) >> +* Incoming MSI Controller (IMSIC) >> +* Advanced Platform-Level Interrupt Controller (APLIC) >> +* 1 UART >> + >> +Boot options >> +------------ >> +The ``xiangshan-kunminghu`` machine can start using the standard ``-bios`` >> +functionality for loading the boot image. You need to compile and link >> +the firmware, kernel, and Device Tree (FDT) into a single binary file, >> +such as ``fw_payload.bin``. >> + >> +Running >> +------- >> +Below is an example command line for running the ``xiangshan-kunminghu`` >> +machine: >> + >> +.. code-block:: bash >> + >> + $ qemu-system-riscv64 -machine xiangshan-kunminghu \ >> + -smp 16 -m 16G \ >> + -bios path/to/opensbi/platform/generic/firmware/fw_payload.bin \ >> + -nographic >> diff --git a/docs/system/target-riscv.rst b/docs/system/target-riscv.rst >> index 95457af130..89b2cb732c 100644 >> --- a/docs/system/target-riscv.rst >> +++ b/docs/system/target-riscv.rst >> @@ -71,6 +71,7 @@ undocumented; you can get a complete list by running >> riscv/shakti-c >> riscv/sifive_u >> riscv/virt >> + riscv/xiangshan-kunminghu >> >> RISC-V CPU firmware >> ------------------- >> diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig >> index e6a0ac1fa1..fc9c35bd98 100644 >> --- a/hw/riscv/Kconfig >> +++ b/hw/riscv/Kconfig >> @@ -119,3 +119,12 @@ config SPIKE >> select HTIF >> select RISCV_ACLINT >> select SIFIVE_PLIC >> + >> +config XIANGSHAN_KUNMINGHU >> + bool >> + default y >> + depends on RISCV64 >> + select RISCV_ACLINT >> + select RISCV_APLIC >> + select RISCV_IMSIC >> + select SERIAL_MM >> diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build >> index c22f3a7216..2a8d5b136c 100644 >> --- a/hw/riscv/meson.build >> +++ b/hw/riscv/meson.build >> @@ -13,5 +13,6 @@ riscv_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) >> riscv_ss.add(when: 'CONFIG_RISCV_IOMMU', if_true: files( >> 'riscv-iommu.c', 'riscv-iommu-pci.c', 'riscv-iommu-sys.c', 'riscv-iommu-hpm.c')) >> riscv_ss.add(when: 'CONFIG_MICROBLAZE_V', if_true: files('microblaze-v-generic.c')) >> +riscv_ss.add(when: 'CONFIG_XIANGSHAN_KUNMINGHU', if_true: files('xiangshan_kmh.c')) >> >> hw_arch += {'riscv': riscv_ss} >> diff --git a/hw/riscv/xiangshan_kmh.c b/hw/riscv/xiangshan_kmh.c >> new file mode 100644 >> index 0000000000..f7ae879d13 >> --- /dev/null >> +++ b/hw/riscv/xiangshan_kmh.c >> @@ -0,0 +1,220 @@ >> +/* >> + * QEMU RISC-V Board Compatible with the Xiangshan Kunminghu >> + * FPGA prototype platform >> + * >> + * Copyright (c) 2025 Beijing Institute of Open Source Chip (BOSC) >> + * SPDX-License-Identifier: GPL-2.0-or-later >> + * >> + * Provides a board compatible with the Xiangshan Kunminghu >> + * FPGA prototype platform: >> + * >> + * 0) UART (16550A) >> + * 1) CLINT (Core-Local Interruptor) >> + * 2) IMSIC (Incoming MSI Controller) >> + * 3) APLIC (Advanced Platform-Level Interrupt Controller) >> + * >> + * More information can be found in our Github repository: >> + * https://github.com/OpenXiangShan/XiangShan >> + * >> + * 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 "qapi/error.h" >> +#include "exec/address-spaces.h" >> +#include "hw/boards.h" >> +#include "hw/char/serial-mm.h" >> +#include "hw/intc/riscv_aclint.h" >> +#include "hw/intc/riscv_aplic.h" >> +#include "hw/intc/riscv_imsic.h" >> +#include "hw/qdev-properties.h" >> +#include "hw/riscv/boot.h" >> +#include "hw/riscv/xiangshan_kmh.h" >> +#include "hw/riscv/riscv_hart.h" >> +#include "system/system.h" >> + >> +static const MemMapEntry xiangshan_kmh_memmap[] = { >> + [XIANGSHAN_KMH_ROM] = { 0x1000, 0xF000 }, >> + [XIANGSHAN_KMH_UART0] = { 0x310B0000, 0x10000 }, >> + [XIANGSHAN_KMH_CLINT] = { 0x38000000, 0x10000 }, >> + [XIANGSHAN_KMH_APLIC_M] = { 0x31100000, 0x4000 }, >> + [XIANGSHAN_KMH_APLIC_S] = { 0x31120000, 0x4000 }, >> + [XIANGSHAN_KMH_IMSIC_M] = { 0x3A800000, 0x10000 }, >> + [XIANGSHAN_KMH_IMSIC_S] = { 0x3B000000, 0x80000 }, >> + [XIANGSHAN_KMH_DRAM] = { 0x80000000, 0x0 }, >> +}; >> + >> +static DeviceState *xiangshan_kmh_create_aia(uint32_t num_harts) >> +{ >> + int i; >> + const MemMapEntry *memmap = xiangshan_kmh_memmap; >> + hwaddr addr = 0; >> + DeviceState *aplic_m = NULL; >> + >> + /* M-level IMSICs */ >> + addr = memmap[XIANGSHAN_KMH_IMSIC_M].base; >> + for (i = 0; i < num_harts; i++) { >> + riscv_imsic_create(addr + i * IMSIC_HART_SIZE(0), i, true, >> + 1, XIANGSHAN_KMH_IMSIC_NUM_IDS); >> + } >> + >> + /* S-level IMSICs */ >> + addr = memmap[XIANGSHAN_KMH_IMSIC_S].base; >> + for (i = 0; i < num_harts; i++) { >> + riscv_imsic_create(addr + >> + i * IMSIC_HART_SIZE(XIANGSHAN_KMH_IMSIC_GUEST_BITS), >> + i, false, 1 + XIANGSHAN_KMH_IMSIC_GUEST_BITS, >> + XIANGSHAN_KMH_IMSIC_NUM_IDS); >> + } >> + >> + /* M-level APLIC */ >> + aplic_m = riscv_aplic_create(memmap[XIANGSHAN_KMH_APLIC_M].base, >> + memmap[XIANGSHAN_KMH_APLIC_M].size, >> + 0, 0, XIANGSHAN_KMH_APLIC_NUM_SOURCES, >> + 1, true, true, NULL); >> + >> + /* S-level APLIC */ >> + riscv_aplic_create(memmap[XIANGSHAN_KMH_APLIC_S].base, >> + memmap[XIANGSHAN_KMH_APLIC_S].size, >> + 0, 0, XIANGSHAN_KMH_APLIC_NUM_SOURCES, >> + 1, true, false, aplic_m); >> + >> + return aplic_m; >> +} >> + >> +static void xiangshan_kmh_soc_realize(DeviceState *dev, Error **errp) >> +{ >> + MachineState *ms = MACHINE(qdev_get_machine()); >> + XiangshanKmhSoCState *s = XIANGSHAN_KMH_SOC(dev); >> + const MemMapEntry *memmap = xiangshan_kmh_memmap; >> + MemoryRegion *system_memory = get_system_memory(); >> + uint32_t num_harts = ms->smp.cpus; >> + >> + qdev_prop_set_uint32(DEVICE(&s->cpus), "num-harts", num_harts); >> + qdev_prop_set_uint32(DEVICE(&s->cpus), "hartid-base", 0); >> + qdev_prop_set_string(DEVICE(&s->cpus), "cpu-type", >> + TYPE_RISCV_CPU_XIANGSHAN_KMH); >> + sysbus_realize(SYS_BUS_DEVICE(&s->cpus), &error_fatal); >> + >> + /* AIA */ >> + s->irqchip = xiangshan_kmh_create_aia(num_harts); >> + >> + /* UART */ >> + serial_mm_init(system_memory, memmap[XIANGSHAN_KMH_UART0].base, 2, >> + qdev_get_gpio_in(s->irqchip, XIANGSHAN_KMH_UART0_IRQ), >> + 115200, serial_hd(0), DEVICE_LITTLE_ENDIAN); >> + >> + /* CLINT */ >> + riscv_aclint_swi_create(memmap[XIANGSHAN_KMH_CLINT].base, >> + 0, num_harts, false); >> + riscv_aclint_mtimer_create(memmap[XIANGSHAN_KMH_CLINT].base + >> + RISCV_ACLINT_SWI_SIZE, >> + RISCV_ACLINT_DEFAULT_MTIMER_SIZE, >> + 0, num_harts, RISCV_ACLINT_DEFAULT_MTIMECMP, >> + RISCV_ACLINT_DEFAULT_MTIME, >> + XIANGSHAN_KMH_CLINT_TIMEBASE_FREQ, true); >> + >> + /* ROM */ >> + memory_region_init_rom(&s->rom, OBJECT(dev), "xiangshan.kunminghu.rom", >> + memmap[XIANGSHAN_KMH_ROM].size, &error_fatal); >> + memory_region_add_subregion(system_memory, >> + memmap[XIANGSHAN_KMH_ROM].base, &s->rom); >> +} >> + >> +static void xiangshan_kmh_soc_class_init(ObjectClass *klass, void *data) >> +{ >> + DeviceClass *dc = DEVICE_CLASS(klass); >> + >> + dc->realize = xiangshan_kmh_soc_realize; >> + dc->user_creatable = false; >> +} >> + >> +static void xiangshan_kmh_soc_instance_init(Object *obj) >> +{ >> + XiangshanKmhSoCState *s = XIANGSHAN_KMH_SOC(obj); >> + >> + object_initialize_child(obj, "cpus", &s->cpus, TYPE_RISCV_HART_ARRAY); >> +} >> + >> +static const TypeInfo xiangshan_kmh_soc_info = { >> + .name = TYPE_XIANGSHAN_KMH_SOC, >> + .parent = TYPE_DEVICE, >> + .instance_size = sizeof(XiangshanKmhSoCState), >> + .instance_init = xiangshan_kmh_soc_instance_init, >> + .class_init = xiangshan_kmh_soc_class_init, >> +}; >> + >> +static void xiangshan_kmh_soc_register_types(void) >> +{ >> + type_register_static(&xiangshan_kmh_soc_info); >> +} >> +type_init(xiangshan_kmh_soc_register_types) >> + >> +static void xiangshan_kmh_machine_init(MachineState *machine) >> +{ >> + XiangshanKmhState *s = XIANGSHAN_KMH_MACHINE(machine); >> + const MemMapEntry *memmap = xiangshan_kmh_memmap; >> + MemoryRegion *system_memory = get_system_memory(); >> + hwaddr start_addr = memmap[XIANGSHAN_KMH_DRAM].base; >> + >> + /* Initialize SoC */ >> + object_initialize_child(OBJECT(machine), "soc", &s->soc, >> + TYPE_XIANGSHAN_KMH_SOC); >> + qdev_realize(DEVICE(&s->soc), NULL, &error_fatal); >> + >> + /* Register RAM */ >> + memory_region_add_subregion(system_memory, >> + memmap[XIANGSHAN_KMH_DRAM].base, >> + machine->ram); >> + >> + /* ROM reset vector */ >> + riscv_setup_rom_reset_vec(machine, &s->soc.cpus, >> + start_addr, >> + memmap[XIANGSHAN_KMH_ROM].base, >> + memmap[XIANGSHAN_KMH_ROM].size, 0, 0); >> + if (machine->firmware) { >> + riscv_load_firmware(machine->firmware, &start_addr, NULL); >> + } >> + >> + /* Note: dtb has been integrated into firmware(OpenSBI) when compiling */ >> +} >> + >> +static void xiangshan_kmh_machine_class_init(ObjectClass *klass, void *data) >> +{ >> + MachineClass *mc = MACHINE_CLASS(klass); >> + static const char *const valid_cpu_types[] = { >> + TYPE_RISCV_CPU_XIANGSHAN_KMH, >> + NULL >> + }; >> + >> + mc->desc = "RISC-V Board compatible with the Xiangshan " \ >> + "Kunminghu FPGA prototype platform"; >> + mc->init = xiangshan_kmh_machine_init; >> + mc->max_cpus = XIANGSHAN_KMH_MAX_CPUS; >> + mc->default_cpu_type = TYPE_RISCV_CPU_XIANGSHAN_KMH; >> + mc->valid_cpu_types = valid_cpu_types; >> + mc->default_ram_id = "xiangshan.kunminghu.ram"; >> +} >> + >> +static const TypeInfo xiangshan_kmh_machine_info = { >> + .name = TYPE_XIANGSHAN_KMH_MACHINE, >> + .parent = TYPE_MACHINE, >> + .instance_size = sizeof(XiangshanKmhState), >> + .class_init = xiangshan_kmh_machine_class_init, >> +}; >> + >> +static void xiangshan_kmh_machine_register_types(void) >> +{ >> + type_register_static(&xiangshan_kmh_machine_info); >> +} >> +type_init(xiangshan_kmh_machine_register_types) >> diff --git a/include/hw/riscv/xiangshan_kmh.h b/include/hw/riscv/xiangshan_kmh.h >> new file mode 100644 >> index 0000000000..952473fbb6 >> --- /dev/null >> +++ b/include/hw/riscv/xiangshan_kmh.h >> @@ -0,0 +1,78 @@ >> +/* >> + * QEMU RISC-V Board Compatible with the Xiangshan Kunminghu >> + * FPGA prototype platform >> + * >> + * Copyright (c) 2025 Beijing Institute of Open Source Chip (BOSC) >> + * >> + * 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_XIANGSHAN_KMH_H >> +#define HW_XIANGSHAN_KMH_H >> + >> +#include "hw/boards.h" >> +#include "hw/riscv/riscv_hart.h" >> + >> +#define XIANGSHAN_KMH_MAX_CPUS 16 >> + >> +typedef struct XiangshanKmhSoCState { >> + /*< private >*/ >> + DeviceState parent_obj; >> + >> + /*< public >*/ >> + RISCVHartArrayState cpus; >> + DeviceState *irqchip; >> + MemoryRegion rom; >> +} XiangshanKmhSoCState; >> + >> +#define TYPE_XIANGSHAN_KMH_SOC "xiangshan.kunminghu.soc" >> +DECLARE_INSTANCE_CHECKER(XiangshanKmhSoCState, XIANGSHAN_KMH_SOC, >> + TYPE_XIANGSHAN_KMH_SOC) >> + >> +typedef struct XiangshanKmhState { >> + /*< private >*/ >> + MachineState parent_obj; >> + >> + /*< public >*/ >> + XiangshanKmhSoCState soc; >> +} XiangshanKmhState; >> + >> +#define TYPE_XIANGSHAN_KMH_MACHINE MACHINE_TYPE_NAME("xiangshan-kunminghu") >> +DECLARE_INSTANCE_CHECKER(XiangshanKmhState, XIANGSHAN_KMH_MACHINE, >> + TYPE_XIANGSHAN_KMH_MACHINE) >> + >> +enum { >> + XIANGSHAN_KMH_ROM, >> + XIANGSHAN_KMH_UART0, >> + XIANGSHAN_KMH_CLINT, >> + XIANGSHAN_KMH_APLIC_M, >> + XIANGSHAN_KMH_APLIC_S, >> + XIANGSHAN_KMH_IMSIC_M, >> + XIANGSHAN_KMH_IMSIC_S, >> + XIANGSHAN_KMH_DRAM, >> +}; >> + >> +enum { >> + XIANGSHAN_KMH_UART0_IRQ = 10, >> +}; >> + >> +/* Indicating Timebase-freq (1MHZ) */ >> +#define XIANGSHAN_KMH_CLINT_TIMEBASE_FREQ 1000000 >> + >> +#define XIANGSHAN_KMH_IMSIC_NUM_IDS 255 >> +#define XIANGSHAN_KMH_IMSIC_NUM_GUESTS 7 >> +#define XIANGSHAN_KMH_IMSIC_GUEST_BITS 3 >> + >> +#define XIANGSHAN_KMH_APLIC_NUM_SOURCES 96 >> + >> +#endif >> -- >> 2.34.1 >> ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v4 2/2] hw/riscv: Initial support for BOSC's Xiangshan Kunminghu FPGA prototype 2025-04-25 12:22 [PATCH v4 2/2] hw/riscv: Initial support for BOSC's Xiangshan Kunminghu FPGA prototype Ran Wang 2025-06-09 4:26 ` Alistair Francis @ 2025-06-17 2:59 ` Alistair Francis 2025-06-17 3:17 ` Ran Wang 1 sibling, 1 reply; 5+ messages in thread From: Alistair Francis @ 2025-06-17 2:59 UTC (permalink / raw) To: Ran Wang Cc: 3543977024, palmer, alistair.francis, liwei1518, dbarboza, zhiwei_liu, qemu-riscv, qemu-devel On Fri, Apr 25, 2025 at 10:22 PM Ran Wang <wangran@bosc.ac.cn> wrote: > > From: Huang Borong <3543977024@qq.com> > > This implementation provides emulation for the Xiangshan Kunminghu > FPGA prototype platform, including support for UART, CLINT, IMSIC, > and APLIC devices. More details can be found at > https://github.com/OpenXiangShan/XiangShan > > Signed-off-by: qinshaoqing <qinshaoqing@bosc.ac.cn> > Signed-off-by: Yang Wang <wangyang@bosc.ac.cn> > Signed-off-by: Yu Hu <huyu@bosc.ac.cn> > Signed-off-by: Ran Wang <wangran@bosc.ac.cn> > Signed-off-by: Borong Huang <3543977024@qq.com> > Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > --- > MAINTAINERS | 7 + > configs/devices/riscv64-softmmu/default.mak | 1 + > docs/system/riscv/xiangshan-kunminghu.rst | 39 ++++ > docs/system/target-riscv.rst | 1 + > hw/riscv/Kconfig | 9 + > hw/riscv/meson.build | 1 + > hw/riscv/xiangshan_kmh.c | 220 ++++++++++++++++++++ > include/hw/riscv/xiangshan_kmh.h | 78 +++++++ > 8 files changed, 356 insertions(+) > create mode 100644 docs/system/riscv/xiangshan-kunminghu.rst > create mode 100644 hw/riscv/xiangshan_kmh.c > create mode 100644 include/hw/riscv/xiangshan_kmh.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index 8978adf999..a9258bd610 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1667,6 +1667,13 @@ S: Maintained > F: hw/riscv/microblaze-v-generic.c > F: docs/system/riscv/microblaze-v-generic.rst > > +Xiangshan Kunminghu > +M: Ran Wang <wangran@bosc.ac.cn> > +S: Maintained > +F: docs/system/riscv/xiangshan-kunminghu.rst > +F: hw/riscv/xiangshan_kmh.c > +F: include/hw/riscv/xiangshan_kmh.h > + > RX Machines > ----------- > rx-gdbsim > diff --git a/configs/devices/riscv64-softmmu/default.mak b/configs/devices/riscv64-softmmu/default.mak > index 39ed3a0061..e485bbd1a3 100644 > --- a/configs/devices/riscv64-softmmu/default.mak > +++ b/configs/devices/riscv64-softmmu/default.mak > @@ -11,3 +11,4 @@ > # CONFIG_RISCV_VIRT=n > # CONFIG_MICROCHIP_PFSOC=n > # CONFIG_SHAKTI_C=n > +# CONFIG_XIANGSHAN_KUNMINGHU=n > diff --git a/docs/system/riscv/xiangshan-kunminghu.rst b/docs/system/riscv/xiangshan-kunminghu.rst > new file mode 100644 > index 0000000000..46e7ceeda0 > --- /dev/null > +++ b/docs/system/riscv/xiangshan-kunminghu.rst > @@ -0,0 +1,39 @@ > +BOSC Xiangshan Kunminghu FPGA prototype platform (``xiangshan-kunminghu``) > +========================================================================== > +The ``xiangshan-kunminghu`` machine is compatible with our FPGA prototype > +platform. > + > +XiangShan is an open-source high-performance RISC-V processor project. > +The third generation processor is called Kunminghu. Kunminghu is a 64-bit > +RV64GCBSUHV processor core. More information can be found in our Github > +repository: > +https://github.com/OpenXiangShan/XiangShan > + > +Supported devices > +----------------- > +The ``xiangshan-kunminghu`` machine supports the following devices: > + > +* Up to 16 xiangshan-kunminghu cores > +* Core Local Interruptor (CLINT) > +* Incoming MSI Controller (IMSIC) > +* Advanced Platform-Level Interrupt Controller (APLIC) > +* 1 UART > + > +Boot options > +------------ > +The ``xiangshan-kunminghu`` machine can start using the standard ``-bios`` > +functionality for loading the boot image. You need to compile and link > +the firmware, kernel, and Device Tree (FDT) into a single binary file, > +such as ``fw_payload.bin``. > + > +Running > +------- > +Below is an example command line for running the ``xiangshan-kunminghu`` > +machine: > + > +.. code-block:: bash > + > + $ qemu-system-riscv64 -machine xiangshan-kunminghu \ > + -smp 16 -m 16G \ > + -bios path/to/opensbi/platform/generic/firmware/fw_payload.bin \ > + -nographic > diff --git a/docs/system/target-riscv.rst b/docs/system/target-riscv.rst > index 95457af130..89b2cb732c 100644 > --- a/docs/system/target-riscv.rst > +++ b/docs/system/target-riscv.rst > @@ -71,6 +71,7 @@ undocumented; you can get a complete list by running > riscv/shakti-c > riscv/sifive_u > riscv/virt > + riscv/xiangshan-kunminghu > > RISC-V CPU firmware > ------------------- > diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig > index e6a0ac1fa1..fc9c35bd98 100644 > --- a/hw/riscv/Kconfig > +++ b/hw/riscv/Kconfig > @@ -119,3 +119,12 @@ config SPIKE > select HTIF > select RISCV_ACLINT > select SIFIVE_PLIC > + > +config XIANGSHAN_KUNMINGHU > + bool > + default y > + depends on RISCV64 > + select RISCV_ACLINT > + select RISCV_APLIC > + select RISCV_IMSIC > + select SERIAL_MM > diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build > index c22f3a7216..2a8d5b136c 100644 > --- a/hw/riscv/meson.build > +++ b/hw/riscv/meson.build > @@ -13,5 +13,6 @@ riscv_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) > riscv_ss.add(when: 'CONFIG_RISCV_IOMMU', if_true: files( > 'riscv-iommu.c', 'riscv-iommu-pci.c', 'riscv-iommu-sys.c', 'riscv-iommu-hpm.c')) > riscv_ss.add(when: 'CONFIG_MICROBLAZE_V', if_true: files('microblaze-v-generic.c')) > +riscv_ss.add(when: 'CONFIG_XIANGSHAN_KUNMINGHU', if_true: files('xiangshan_kmh.c')) > > hw_arch += {'riscv': riscv_ss} > diff --git a/hw/riscv/xiangshan_kmh.c b/hw/riscv/xiangshan_kmh.c > new file mode 100644 > index 0000000000..f7ae879d13 > --- /dev/null > +++ b/hw/riscv/xiangshan_kmh.c > @@ -0,0 +1,220 @@ > +/* > + * QEMU RISC-V Board Compatible with the Xiangshan Kunminghu > + * FPGA prototype platform > + * > + * Copyright (c) 2025 Beijing Institute of Open Source Chip (BOSC) > + * SPDX-License-Identifier: GPL-2.0-or-later > + * > + * Provides a board compatible with the Xiangshan Kunminghu > + * FPGA prototype platform: > + * > + * 0) UART (16550A) > + * 1) CLINT (Core-Local Interruptor) > + * 2) IMSIC (Incoming MSI Controller) > + * 3) APLIC (Advanced Platform-Level Interrupt Controller) > + * > + * More information can be found in our Github repository: > + * https://github.com/OpenXiangShan/XiangShan > + * > + * 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 "qapi/error.h" > +#include "exec/address-spaces.h" This should be #include "system/address-spaces.h" But even with that change I see a few errors with this patch FAILED: libqemu-riscv64-softmmu.a.p/hw_riscv_xiangshan_kmh.c.o ... ../hw/riscv/xiangshan_kmh.c:154:19: error: initialization of ‘void (*)(ObjectClass *, const void *)’ from incompatible pointer type ‘void (*)(ObjectClass *, void *)’ [-Wincompatible-pointer-types] 154 | .class_init = xiangshan_kmh_soc_class_init, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../hw/riscv/xiangshan_kmh.c:154:19: note: (near initialization for ‘xiangshan_kmh_soc_info.class_init’) ../hw/riscv/xiangshan_kmh.c:134:13: note: ‘xiangshan_kmh_soc_class_init’ declared here 134 | static void xiangshan_kmh_soc_class_init(ObjectClass *klass, void *data) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../hw/riscv/xiangshan_kmh.c:213:19: error: initialization of ‘void (*)(ObjectClass *, const void *)’ from incompatible pointer type ‘void (*)(ObjectClass *, void *)’ [-Wincompatible-pointer-types] 213 | .class_init = xiangshan_kmh_machine_class_init, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../hw/riscv/xiangshan_kmh.c:213:19: note: (near initialization for ‘xiangshan_kmh_machine_info.class_init’) ../hw/riscv/xiangshan_kmh.c:192:13: note: ‘xiangshan_kmh_machine_class_init’ declared here 192 | static void xiangshan_kmh_machine_class_init(ObjectClass *klass, void *data) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Alistair > +#include "hw/boards.h" > +#include "hw/char/serial-mm.h" > +#include "hw/intc/riscv_aclint.h" > +#include "hw/intc/riscv_aplic.h" > +#include "hw/intc/riscv_imsic.h" > +#include "hw/qdev-properties.h" > +#include "hw/riscv/boot.h" > +#include "hw/riscv/xiangshan_kmh.h" > +#include "hw/riscv/riscv_hart.h" > +#include "system/system.h" > + > +static const MemMapEntry xiangshan_kmh_memmap[] = { > + [XIANGSHAN_KMH_ROM] = { 0x1000, 0xF000 }, > + [XIANGSHAN_KMH_UART0] = { 0x310B0000, 0x10000 }, > + [XIANGSHAN_KMH_CLINT] = { 0x38000000, 0x10000 }, > + [XIANGSHAN_KMH_APLIC_M] = { 0x31100000, 0x4000 }, > + [XIANGSHAN_KMH_APLIC_S] = { 0x31120000, 0x4000 }, > + [XIANGSHAN_KMH_IMSIC_M] = { 0x3A800000, 0x10000 }, > + [XIANGSHAN_KMH_IMSIC_S] = { 0x3B000000, 0x80000 }, > + [XIANGSHAN_KMH_DRAM] = { 0x80000000, 0x0 }, > +}; > + > +static DeviceState *xiangshan_kmh_create_aia(uint32_t num_harts) > +{ > + int i; > + const MemMapEntry *memmap = xiangshan_kmh_memmap; > + hwaddr addr = 0; > + DeviceState *aplic_m = NULL; > + > + /* M-level IMSICs */ > + addr = memmap[XIANGSHAN_KMH_IMSIC_M].base; > + for (i = 0; i < num_harts; i++) { > + riscv_imsic_create(addr + i * IMSIC_HART_SIZE(0), i, true, > + 1, XIANGSHAN_KMH_IMSIC_NUM_IDS); > + } > + > + /* S-level IMSICs */ > + addr = memmap[XIANGSHAN_KMH_IMSIC_S].base; > + for (i = 0; i < num_harts; i++) { > + riscv_imsic_create(addr + > + i * IMSIC_HART_SIZE(XIANGSHAN_KMH_IMSIC_GUEST_BITS), > + i, false, 1 + XIANGSHAN_KMH_IMSIC_GUEST_BITS, > + XIANGSHAN_KMH_IMSIC_NUM_IDS); > + } > + > + /* M-level APLIC */ > + aplic_m = riscv_aplic_create(memmap[XIANGSHAN_KMH_APLIC_M].base, > + memmap[XIANGSHAN_KMH_APLIC_M].size, > + 0, 0, XIANGSHAN_KMH_APLIC_NUM_SOURCES, > + 1, true, true, NULL); > + > + /* S-level APLIC */ > + riscv_aplic_create(memmap[XIANGSHAN_KMH_APLIC_S].base, > + memmap[XIANGSHAN_KMH_APLIC_S].size, > + 0, 0, XIANGSHAN_KMH_APLIC_NUM_SOURCES, > + 1, true, false, aplic_m); > + > + return aplic_m; > +} > + > +static void xiangshan_kmh_soc_realize(DeviceState *dev, Error **errp) > +{ > + MachineState *ms = MACHINE(qdev_get_machine()); > + XiangshanKmhSoCState *s = XIANGSHAN_KMH_SOC(dev); > + const MemMapEntry *memmap = xiangshan_kmh_memmap; > + MemoryRegion *system_memory = get_system_memory(); > + uint32_t num_harts = ms->smp.cpus; > + > + qdev_prop_set_uint32(DEVICE(&s->cpus), "num-harts", num_harts); > + qdev_prop_set_uint32(DEVICE(&s->cpus), "hartid-base", 0); > + qdev_prop_set_string(DEVICE(&s->cpus), "cpu-type", > + TYPE_RISCV_CPU_XIANGSHAN_KMH); > + sysbus_realize(SYS_BUS_DEVICE(&s->cpus), &error_fatal); > + > + /* AIA */ > + s->irqchip = xiangshan_kmh_create_aia(num_harts); > + > + /* UART */ > + serial_mm_init(system_memory, memmap[XIANGSHAN_KMH_UART0].base, 2, > + qdev_get_gpio_in(s->irqchip, XIANGSHAN_KMH_UART0_IRQ), > + 115200, serial_hd(0), DEVICE_LITTLE_ENDIAN); > + > + /* CLINT */ > + riscv_aclint_swi_create(memmap[XIANGSHAN_KMH_CLINT].base, > + 0, num_harts, false); > + riscv_aclint_mtimer_create(memmap[XIANGSHAN_KMH_CLINT].base + > + RISCV_ACLINT_SWI_SIZE, > + RISCV_ACLINT_DEFAULT_MTIMER_SIZE, > + 0, num_harts, RISCV_ACLINT_DEFAULT_MTIMECMP, > + RISCV_ACLINT_DEFAULT_MTIME, > + XIANGSHAN_KMH_CLINT_TIMEBASE_FREQ, true); > + > + /* ROM */ > + memory_region_init_rom(&s->rom, OBJECT(dev), "xiangshan.kunminghu.rom", > + memmap[XIANGSHAN_KMH_ROM].size, &error_fatal); > + memory_region_add_subregion(system_memory, > + memmap[XIANGSHAN_KMH_ROM].base, &s->rom); > +} > + > +static void xiangshan_kmh_soc_class_init(ObjectClass *klass, void *data) > +{ > + DeviceClass *dc = DEVICE_CLASS(klass); > + > + dc->realize = xiangshan_kmh_soc_realize; > + dc->user_creatable = false; > +} > + > +static void xiangshan_kmh_soc_instance_init(Object *obj) > +{ > + XiangshanKmhSoCState *s = XIANGSHAN_KMH_SOC(obj); > + > + object_initialize_child(obj, "cpus", &s->cpus, TYPE_RISCV_HART_ARRAY); > +} > + > +static const TypeInfo xiangshan_kmh_soc_info = { > + .name = TYPE_XIANGSHAN_KMH_SOC, > + .parent = TYPE_DEVICE, > + .instance_size = sizeof(XiangshanKmhSoCState), > + .instance_init = xiangshan_kmh_soc_instance_init, > + .class_init = xiangshan_kmh_soc_class_init, > +}; > + > +static void xiangshan_kmh_soc_register_types(void) > +{ > + type_register_static(&xiangshan_kmh_soc_info); > +} > +type_init(xiangshan_kmh_soc_register_types) > + > +static void xiangshan_kmh_machine_init(MachineState *machine) > +{ > + XiangshanKmhState *s = XIANGSHAN_KMH_MACHINE(machine); > + const MemMapEntry *memmap = xiangshan_kmh_memmap; > + MemoryRegion *system_memory = get_system_memory(); > + hwaddr start_addr = memmap[XIANGSHAN_KMH_DRAM].base; > + > + /* Initialize SoC */ > + object_initialize_child(OBJECT(machine), "soc", &s->soc, > + TYPE_XIANGSHAN_KMH_SOC); > + qdev_realize(DEVICE(&s->soc), NULL, &error_fatal); > + > + /* Register RAM */ > + memory_region_add_subregion(system_memory, > + memmap[XIANGSHAN_KMH_DRAM].base, > + machine->ram); > + > + /* ROM reset vector */ > + riscv_setup_rom_reset_vec(machine, &s->soc.cpus, > + start_addr, > + memmap[XIANGSHAN_KMH_ROM].base, > + memmap[XIANGSHAN_KMH_ROM].size, 0, 0); > + if (machine->firmware) { > + riscv_load_firmware(machine->firmware, &start_addr, NULL); > + } > + > + /* Note: dtb has been integrated into firmware(OpenSBI) when compiling */ > +} > + > +static void xiangshan_kmh_machine_class_init(ObjectClass *klass, void *data) > +{ > + MachineClass *mc = MACHINE_CLASS(klass); > + static const char *const valid_cpu_types[] = { > + TYPE_RISCV_CPU_XIANGSHAN_KMH, > + NULL > + }; > + > + mc->desc = "RISC-V Board compatible with the Xiangshan " \ > + "Kunminghu FPGA prototype platform"; > + mc->init = xiangshan_kmh_machine_init; > + mc->max_cpus = XIANGSHAN_KMH_MAX_CPUS; > + mc->default_cpu_type = TYPE_RISCV_CPU_XIANGSHAN_KMH; > + mc->valid_cpu_types = valid_cpu_types; > + mc->default_ram_id = "xiangshan.kunminghu.ram"; > +} > + > +static const TypeInfo xiangshan_kmh_machine_info = { > + .name = TYPE_XIANGSHAN_KMH_MACHINE, > + .parent = TYPE_MACHINE, > + .instance_size = sizeof(XiangshanKmhState), > + .class_init = xiangshan_kmh_machine_class_init, > +}; > + > +static void xiangshan_kmh_machine_register_types(void) > +{ > + type_register_static(&xiangshan_kmh_machine_info); > +} > +type_init(xiangshan_kmh_machine_register_types) > diff --git a/include/hw/riscv/xiangshan_kmh.h b/include/hw/riscv/xiangshan_kmh.h > new file mode 100644 > index 0000000000..952473fbb6 > --- /dev/null > +++ b/include/hw/riscv/xiangshan_kmh.h > @@ -0,0 +1,78 @@ > +/* > + * QEMU RISC-V Board Compatible with the Xiangshan Kunminghu > + * FPGA prototype platform > + * > + * Copyright (c) 2025 Beijing Institute of Open Source Chip (BOSC) > + * > + * 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_XIANGSHAN_KMH_H > +#define HW_XIANGSHAN_KMH_H > + > +#include "hw/boards.h" > +#include "hw/riscv/riscv_hart.h" > + > +#define XIANGSHAN_KMH_MAX_CPUS 16 > + > +typedef struct XiangshanKmhSoCState { > + /*< private >*/ > + DeviceState parent_obj; > + > + /*< public >*/ > + RISCVHartArrayState cpus; > + DeviceState *irqchip; > + MemoryRegion rom; > +} XiangshanKmhSoCState; > + > +#define TYPE_XIANGSHAN_KMH_SOC "xiangshan.kunminghu.soc" > +DECLARE_INSTANCE_CHECKER(XiangshanKmhSoCState, XIANGSHAN_KMH_SOC, > + TYPE_XIANGSHAN_KMH_SOC) > + > +typedef struct XiangshanKmhState { > + /*< private >*/ > + MachineState parent_obj; > + > + /*< public >*/ > + XiangshanKmhSoCState soc; > +} XiangshanKmhState; > + > +#define TYPE_XIANGSHAN_KMH_MACHINE MACHINE_TYPE_NAME("xiangshan-kunminghu") > +DECLARE_INSTANCE_CHECKER(XiangshanKmhState, XIANGSHAN_KMH_MACHINE, > + TYPE_XIANGSHAN_KMH_MACHINE) > + > +enum { > + XIANGSHAN_KMH_ROM, > + XIANGSHAN_KMH_UART0, > + XIANGSHAN_KMH_CLINT, > + XIANGSHAN_KMH_APLIC_M, > + XIANGSHAN_KMH_APLIC_S, > + XIANGSHAN_KMH_IMSIC_M, > + XIANGSHAN_KMH_IMSIC_S, > + XIANGSHAN_KMH_DRAM, > +}; > + > +enum { > + XIANGSHAN_KMH_UART0_IRQ = 10, > +}; > + > +/* Indicating Timebase-freq (1MHZ) */ > +#define XIANGSHAN_KMH_CLINT_TIMEBASE_FREQ 1000000 > + > +#define XIANGSHAN_KMH_IMSIC_NUM_IDS 255 > +#define XIANGSHAN_KMH_IMSIC_NUM_GUESTS 7 > +#define XIANGSHAN_KMH_IMSIC_GUEST_BITS 3 > + > +#define XIANGSHAN_KMH_APLIC_NUM_SOURCES 96 > + > +#endif > -- > 2.34.1 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v4 2/2] hw/riscv: Initial support for BOSC's Xiangshan Kunminghu FPGA prototype 2025-06-17 2:59 ` Alistair Francis @ 2025-06-17 3:17 ` Ran Wang 0 siblings, 0 replies; 5+ messages in thread From: Ran Wang @ 2025-06-17 3:17 UTC (permalink / raw) To: Alistair Francis Cc: 3543977024, palmer, alistair.francis, liwei1518, dbarboza, zhiwei_liu, qemu-riscv, qemu-devel Hi Alistair, On 2025/6/17 10:59, Alistair Francis wrote: > On Fri, Apr 25, 2025 at 10:22 PM Ran Wang <wangran@bosc.ac.cn> wrote: >> >> From: Huang Borong <3543977024@qq.com> >> >> This implementation provides emulation for the Xiangshan Kunminghu >> FPGA prototype platform, including support for UART, CLINT, IMSIC, >> and APLIC devices. More details can be found at >> https://github.com/OpenXiangShan/XiangShan >> >> Signed-off-by: qinshaoqing <qinshaoqing@bosc.ac.cn> >> Signed-off-by: Yang Wang <wangyang@bosc.ac.cn> >> Signed-off-by: Yu Hu <huyu@bosc.ac.cn> >> Signed-off-by: Ran Wang <wangran@bosc.ac.cn> >> Signed-off-by: Borong Huang <3543977024@qq.com> >> Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> >> --- >> MAINTAINERS | 7 + >> configs/devices/riscv64-softmmu/default.mak | 1 + >> docs/system/riscv/xiangshan-kunminghu.rst | 39 ++++ >> docs/system/target-riscv.rst | 1 + >> hw/riscv/Kconfig | 9 + >> hw/riscv/meson.build | 1 + >> hw/riscv/xiangshan_kmh.c | 220 ++++++++++++++++++++ >> include/hw/riscv/xiangshan_kmh.h | 78 +++++++ >> 8 files changed, 356 insertions(+) >> create mode 100644 docs/system/riscv/xiangshan-kunminghu.rst >> create mode 100644 hw/riscv/xiangshan_kmh.c >> create mode 100644 include/hw/riscv/xiangshan_kmh.h >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index 8978adf999..a9258bd610 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -1667,6 +1667,13 @@ S: Maintained >> F: hw/riscv/microblaze-v-generic.c >> F: docs/system/riscv/microblaze-v-generic.rst >> >> +Xiangshan Kunminghu >> +M: Ran Wang <wangran@bosc.ac.cn> >> +S: Maintained >> +F: docs/system/riscv/xiangshan-kunminghu.rst >> +F: hw/riscv/xiangshan_kmh.c >> +F: include/hw/riscv/xiangshan_kmh.h >> + >> RX Machines >> ----------- >> rx-gdbsim >> diff --git a/configs/devices/riscv64-softmmu/default.mak b/configs/devices/riscv64-softmmu/default.mak >> index 39ed3a0061..e485bbd1a3 100644 >> --- a/configs/devices/riscv64-softmmu/default.mak >> +++ b/configs/devices/riscv64-softmmu/default.mak >> @@ -11,3 +11,4 @@ >> # CONFIG_RISCV_VIRT=n >> # CONFIG_MICROCHIP_PFSOC=n >> # CONFIG_SHAKTI_C=n >> +# CONFIG_XIANGSHAN_KUNMINGHU=n >> diff --git a/docs/system/riscv/xiangshan-kunminghu.rst b/docs/system/riscv/xiangshan-kunminghu.rst >> new file mode 100644 >> index 0000000000..46e7ceeda0 >> --- /dev/null >> +++ b/docs/system/riscv/xiangshan-kunminghu.rst >> @@ -0,0 +1,39 @@ >> +BOSC Xiangshan Kunminghu FPGA prototype platform (``xiangshan-kunminghu``) >> +========================================================================== >> +The ``xiangshan-kunminghu`` machine is compatible with our FPGA prototype >> +platform. >> + >> +XiangShan is an open-source high-performance RISC-V processor project. >> +The third generation processor is called Kunminghu. Kunminghu is a 64-bit >> +RV64GCBSUHV processor core. More information can be found in our Github >> +repository: >> +https://github.com/OpenXiangShan/XiangShan >> + >> +Supported devices >> +----------------- >> +The ``xiangshan-kunminghu`` machine supports the following devices: >> + >> +* Up to 16 xiangshan-kunminghu cores >> +* Core Local Interruptor (CLINT) >> +* Incoming MSI Controller (IMSIC) >> +* Advanced Platform-Level Interrupt Controller (APLIC) >> +* 1 UART >> + >> +Boot options >> +------------ >> +The ``xiangshan-kunminghu`` machine can start using the standard ``-bios`` >> +functionality for loading the boot image. You need to compile and link >> +the firmware, kernel, and Device Tree (FDT) into a single binary file, >> +such as ``fw_payload.bin``. >> + >> +Running >> +------- >> +Below is an example command line for running the ``xiangshan-kunminghu`` >> +machine: >> + >> +.. code-block:: bash >> + >> + $ qemu-system-riscv64 -machine xiangshan-kunminghu \ >> + -smp 16 -m 16G \ >> + -bios path/to/opensbi/platform/generic/firmware/fw_payload.bin \ >> + -nographic >> diff --git a/docs/system/target-riscv.rst b/docs/system/target-riscv.rst >> index 95457af130..89b2cb732c 100644 >> --- a/docs/system/target-riscv.rst >> +++ b/docs/system/target-riscv.rst >> @@ -71,6 +71,7 @@ undocumented; you can get a complete list by running >> riscv/shakti-c >> riscv/sifive_u >> riscv/virt >> + riscv/xiangshan-kunminghu >> >> RISC-V CPU firmware >> ------------------- >> diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig >> index e6a0ac1fa1..fc9c35bd98 100644 >> --- a/hw/riscv/Kconfig >> +++ b/hw/riscv/Kconfig >> @@ -119,3 +119,12 @@ config SPIKE >> select HTIF >> select RISCV_ACLINT >> select SIFIVE_PLIC >> + >> +config XIANGSHAN_KUNMINGHU >> + bool >> + default y >> + depends on RISCV64 >> + select RISCV_ACLINT >> + select RISCV_APLIC >> + select RISCV_IMSIC >> + select SERIAL_MM >> diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build >> index c22f3a7216..2a8d5b136c 100644 >> --- a/hw/riscv/meson.build >> +++ b/hw/riscv/meson.build >> @@ -13,5 +13,6 @@ riscv_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) >> riscv_ss.add(when: 'CONFIG_RISCV_IOMMU', if_true: files( >> 'riscv-iommu.c', 'riscv-iommu-pci.c', 'riscv-iommu-sys.c', 'riscv-iommu-hpm.c')) >> riscv_ss.add(when: 'CONFIG_MICROBLAZE_V', if_true: files('microblaze-v-generic.c')) >> +riscv_ss.add(when: 'CONFIG_XIANGSHAN_KUNMINGHU', if_true: files('xiangshan_kmh.c')) >> >> hw_arch += {'riscv': riscv_ss} >> diff --git a/hw/riscv/xiangshan_kmh.c b/hw/riscv/xiangshan_kmh.c >> new file mode 100644 >> index 0000000000..f7ae879d13 >> --- /dev/null >> +++ b/hw/riscv/xiangshan_kmh.c >> @@ -0,0 +1,220 @@ >> +/* >> + * QEMU RISC-V Board Compatible with the Xiangshan Kunminghu >> + * FPGA prototype platform >> + * >> + * Copyright (c) 2025 Beijing Institute of Open Source Chip (BOSC) >> + * SPDX-License-Identifier: GPL-2.0-or-later >> + * >> + * Provides a board compatible with the Xiangshan Kunminghu >> + * FPGA prototype platform: >> + * >> + * 0) UART (16550A) >> + * 1) CLINT (Core-Local Interruptor) >> + * 2) IMSIC (Incoming MSI Controller) >> + * 3) APLIC (Advanced Platform-Level Interrupt Controller) >> + * >> + * More information can be found in our Github repository: >> + * https://github.com/OpenXiangShan/XiangShan >> + * >> + * 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 "qapi/error.h" >> +#include "exec/address-spaces.h" > > This should be > > #include "system/address-spaces.h" > > But even with that change I see a few errors with this patch > > FAILED: libqemu-riscv64-softmmu.a.p/hw_riscv_xiangshan_kmh.c.o > ... > ../hw/riscv/xiangshan_kmh.c:154:19: error: initialization of ‘void > (*)(ObjectClass *, const void *)’ from incompatible pointer type ‘void > (*)(ObjectClass *, > void *)’ [-Wincompatible-pointer-types] > 154 | .class_init = xiangshan_kmh_soc_class_init, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ > ../hw/riscv/xiangshan_kmh.c:154:19: note: (near initialization for > ‘xiangshan_kmh_soc_info.class_init’) > ../hw/riscv/xiangshan_kmh.c:134:13: note: > ‘xiangshan_kmh_soc_class_init’ declared here > 134 | static void xiangshan_kmh_soc_class_init(ObjectClass *klass, void *data) > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ > ../hw/riscv/xiangshan_kmh.c:213:19: error: initialization of ‘void > (*)(ObjectClass *, const void *)’ from incompatible pointer type ‘void > (*)(ObjectClass *, > void *)’ [-Wincompatible-pointer-types] > 213 | .class_init = xiangshan_kmh_machine_class_init, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > ../hw/riscv/xiangshan_kmh.c:213:19: note: (near initialization for > ‘xiangshan_kmh_machine_info.class_init’) > ../hw/riscv/xiangshan_kmh.c:192:13: note: > ‘xiangshan_kmh_machine_class_init’ declared here > 192 | static void xiangshan_kmh_machine_class_init(ObjectClass > *klass, void *data) > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Got it, let me check this and may send out v5 patch later. Thanks for the test. Regards, Ran > Alistair > >> +#include "hw/boards.h" >> +#include "hw/char/serial-mm.h" >> +#include "hw/intc/riscv_aclint.h" >> +#include "hw/intc/riscv_aplic.h" >> +#include "hw/intc/riscv_imsic.h" >> +#include "hw/qdev-properties.h" >> +#include "hw/riscv/boot.h" >> +#include "hw/riscv/xiangshan_kmh.h" >> +#include "hw/riscv/riscv_hart.h" >> +#include "system/system.h" >> + >> +static const MemMapEntry xiangshan_kmh_memmap[] = { >> + [XIANGSHAN_KMH_ROM] = { 0x1000, 0xF000 }, >> + [XIANGSHAN_KMH_UART0] = { 0x310B0000, 0x10000 }, >> + [XIANGSHAN_KMH_CLINT] = { 0x38000000, 0x10000 }, >> + [XIANGSHAN_KMH_APLIC_M] = { 0x31100000, 0x4000 }, >> + [XIANGSHAN_KMH_APLIC_S] = { 0x31120000, 0x4000 }, >> + [XIANGSHAN_KMH_IMSIC_M] = { 0x3A800000, 0x10000 }, >> + [XIANGSHAN_KMH_IMSIC_S] = { 0x3B000000, 0x80000 }, >> + [XIANGSHAN_KMH_DRAM] = { 0x80000000, 0x0 }, >> +}; >> + >> +static DeviceState *xiangshan_kmh_create_aia(uint32_t num_harts) >> +{ >> + int i; >> + const MemMapEntry *memmap = xiangshan_kmh_memmap; >> + hwaddr addr = 0; >> + DeviceState *aplic_m = NULL; >> + >> + /* M-level IMSICs */ >> + addr = memmap[XIANGSHAN_KMH_IMSIC_M].base; >> + for (i = 0; i < num_harts; i++) { >> + riscv_imsic_create(addr + i * IMSIC_HART_SIZE(0), i, true, >> + 1, XIANGSHAN_KMH_IMSIC_NUM_IDS); >> + } >> + >> + /* S-level IMSICs */ >> + addr = memmap[XIANGSHAN_KMH_IMSIC_S].base; >> + for (i = 0; i < num_harts; i++) { >> + riscv_imsic_create(addr + >> + i * IMSIC_HART_SIZE(XIANGSHAN_KMH_IMSIC_GUEST_BITS), >> + i, false, 1 + XIANGSHAN_KMH_IMSIC_GUEST_BITS, >> + XIANGSHAN_KMH_IMSIC_NUM_IDS); >> + } >> + >> + /* M-level APLIC */ >> + aplic_m = riscv_aplic_create(memmap[XIANGSHAN_KMH_APLIC_M].base, >> + memmap[XIANGSHAN_KMH_APLIC_M].size, >> + 0, 0, XIANGSHAN_KMH_APLIC_NUM_SOURCES, >> + 1, true, true, NULL); >> + >> + /* S-level APLIC */ >> + riscv_aplic_create(memmap[XIANGSHAN_KMH_APLIC_S].base, >> + memmap[XIANGSHAN_KMH_APLIC_S].size, >> + 0, 0, XIANGSHAN_KMH_APLIC_NUM_SOURCES, >> + 1, true, false, aplic_m); >> + >> + return aplic_m; >> +} >> + >> +static void xiangshan_kmh_soc_realize(DeviceState *dev, Error **errp) >> +{ >> + MachineState *ms = MACHINE(qdev_get_machine()); >> + XiangshanKmhSoCState *s = XIANGSHAN_KMH_SOC(dev); >> + const MemMapEntry *memmap = xiangshan_kmh_memmap; >> + MemoryRegion *system_memory = get_system_memory(); >> + uint32_t num_harts = ms->smp.cpus; >> + >> + qdev_prop_set_uint32(DEVICE(&s->cpus), "num-harts", num_harts); >> + qdev_prop_set_uint32(DEVICE(&s->cpus), "hartid-base", 0); >> + qdev_prop_set_string(DEVICE(&s->cpus), "cpu-type", >> + TYPE_RISCV_CPU_XIANGSHAN_KMH); >> + sysbus_realize(SYS_BUS_DEVICE(&s->cpus), &error_fatal); >> + >> + /* AIA */ >> + s->irqchip = xiangshan_kmh_create_aia(num_harts); >> + >> + /* UART */ >> + serial_mm_init(system_memory, memmap[XIANGSHAN_KMH_UART0].base, 2, >> + qdev_get_gpio_in(s->irqchip, XIANGSHAN_KMH_UART0_IRQ), >> + 115200, serial_hd(0), DEVICE_LITTLE_ENDIAN); >> + >> + /* CLINT */ >> + riscv_aclint_swi_create(memmap[XIANGSHAN_KMH_CLINT].base, >> + 0, num_harts, false); >> + riscv_aclint_mtimer_create(memmap[XIANGSHAN_KMH_CLINT].base + >> + RISCV_ACLINT_SWI_SIZE, >> + RISCV_ACLINT_DEFAULT_MTIMER_SIZE, >> + 0, num_harts, RISCV_ACLINT_DEFAULT_MTIMECMP, >> + RISCV_ACLINT_DEFAULT_MTIME, >> + XIANGSHAN_KMH_CLINT_TIMEBASE_FREQ, true); >> + >> + /* ROM */ >> + memory_region_init_rom(&s->rom, OBJECT(dev), "xiangshan.kunminghu.rom", >> + memmap[XIANGSHAN_KMH_ROM].size, &error_fatal); >> + memory_region_add_subregion(system_memory, >> + memmap[XIANGSHAN_KMH_ROM].base, &s->rom); >> +} >> + >> +static void xiangshan_kmh_soc_class_init(ObjectClass *klass, void *data) >> +{ >> + DeviceClass *dc = DEVICE_CLASS(klass); >> + >> + dc->realize = xiangshan_kmh_soc_realize; >> + dc->user_creatable = false; >> +} >> + >> +static void xiangshan_kmh_soc_instance_init(Object *obj) >> +{ >> + XiangshanKmhSoCState *s = XIANGSHAN_KMH_SOC(obj); >> + >> + object_initialize_child(obj, "cpus", &s->cpus, TYPE_RISCV_HART_ARRAY); >> +} >> + >> +static const TypeInfo xiangshan_kmh_soc_info = { >> + .name = TYPE_XIANGSHAN_KMH_SOC, >> + .parent = TYPE_DEVICE, >> + .instance_size = sizeof(XiangshanKmhSoCState), >> + .instance_init = xiangshan_kmh_soc_instance_init, >> + .class_init = xiangshan_kmh_soc_class_init, >> +}; >> + >> +static void xiangshan_kmh_soc_register_types(void) >> +{ >> + type_register_static(&xiangshan_kmh_soc_info); >> +} >> +type_init(xiangshan_kmh_soc_register_types) >> + >> +static void xiangshan_kmh_machine_init(MachineState *machine) >> +{ >> + XiangshanKmhState *s = XIANGSHAN_KMH_MACHINE(machine); >> + const MemMapEntry *memmap = xiangshan_kmh_memmap; >> + MemoryRegion *system_memory = get_system_memory(); >> + hwaddr start_addr = memmap[XIANGSHAN_KMH_DRAM].base; >> + >> + /* Initialize SoC */ >> + object_initialize_child(OBJECT(machine), "soc", &s->soc, >> + TYPE_XIANGSHAN_KMH_SOC); >> + qdev_realize(DEVICE(&s->soc), NULL, &error_fatal); >> + >> + /* Register RAM */ >> + memory_region_add_subregion(system_memory, >> + memmap[XIANGSHAN_KMH_DRAM].base, >> + machine->ram); >> + >> + /* ROM reset vector */ >> + riscv_setup_rom_reset_vec(machine, &s->soc.cpus, >> + start_addr, >> + memmap[XIANGSHAN_KMH_ROM].base, >> + memmap[XIANGSHAN_KMH_ROM].size, 0, 0); >> + if (machine->firmware) { >> + riscv_load_firmware(machine->firmware, &start_addr, NULL); >> + } >> + >> + /* Note: dtb has been integrated into firmware(OpenSBI) when compiling */ >> +} >> + >> +static void xiangshan_kmh_machine_class_init(ObjectClass *klass, void *data) >> +{ >> + MachineClass *mc = MACHINE_CLASS(klass); >> + static const char *const valid_cpu_types[] = { >> + TYPE_RISCV_CPU_XIANGSHAN_KMH, >> + NULL >> + }; >> + >> + mc->desc = "RISC-V Board compatible with the Xiangshan " \ >> + "Kunminghu FPGA prototype platform"; >> + mc->init = xiangshan_kmh_machine_init; >> + mc->max_cpus = XIANGSHAN_KMH_MAX_CPUS; >> + mc->default_cpu_type = TYPE_RISCV_CPU_XIANGSHAN_KMH; >> + mc->valid_cpu_types = valid_cpu_types; >> + mc->default_ram_id = "xiangshan.kunminghu.ram"; >> +} >> + >> +static const TypeInfo xiangshan_kmh_machine_info = { >> + .name = TYPE_XIANGSHAN_KMH_MACHINE, >> + .parent = TYPE_MACHINE, >> + .instance_size = sizeof(XiangshanKmhState), >> + .class_init = xiangshan_kmh_machine_class_init, >> +}; >> + >> +static void xiangshan_kmh_machine_register_types(void) >> +{ >> + type_register_static(&xiangshan_kmh_machine_info); >> +} >> +type_init(xiangshan_kmh_machine_register_types) >> diff --git a/include/hw/riscv/xiangshan_kmh.h b/include/hw/riscv/xiangshan_kmh.h >> new file mode 100644 >> index 0000000000..952473fbb6 >> --- /dev/null >> +++ b/include/hw/riscv/xiangshan_kmh.h >> @@ -0,0 +1,78 @@ >> +/* >> + * QEMU RISC-V Board Compatible with the Xiangshan Kunminghu >> + * FPGA prototype platform >> + * >> + * Copyright (c) 2025 Beijing Institute of Open Source Chip (BOSC) >> + * >> + * 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_XIANGSHAN_KMH_H >> +#define HW_XIANGSHAN_KMH_H >> + >> +#include "hw/boards.h" >> +#include "hw/riscv/riscv_hart.h" >> + >> +#define XIANGSHAN_KMH_MAX_CPUS 16 >> + >> +typedef struct XiangshanKmhSoCState { >> + /*< private >*/ >> + DeviceState parent_obj; >> + >> + /*< public >*/ >> + RISCVHartArrayState cpus; >> + DeviceState *irqchip; >> + MemoryRegion rom; >> +} XiangshanKmhSoCState; >> + >> +#define TYPE_XIANGSHAN_KMH_SOC "xiangshan.kunminghu.soc" >> +DECLARE_INSTANCE_CHECKER(XiangshanKmhSoCState, XIANGSHAN_KMH_SOC, >> + TYPE_XIANGSHAN_KMH_SOC) >> + >> +typedef struct XiangshanKmhState { >> + /*< private >*/ >> + MachineState parent_obj; >> + >> + /*< public >*/ >> + XiangshanKmhSoCState soc; >> +} XiangshanKmhState; >> + >> +#define TYPE_XIANGSHAN_KMH_MACHINE MACHINE_TYPE_NAME("xiangshan-kunminghu") >> +DECLARE_INSTANCE_CHECKER(XiangshanKmhState, XIANGSHAN_KMH_MACHINE, >> + TYPE_XIANGSHAN_KMH_MACHINE) >> + >> +enum { >> + XIANGSHAN_KMH_ROM, >> + XIANGSHAN_KMH_UART0, >> + XIANGSHAN_KMH_CLINT, >> + XIANGSHAN_KMH_APLIC_M, >> + XIANGSHAN_KMH_APLIC_S, >> + XIANGSHAN_KMH_IMSIC_M, >> + XIANGSHAN_KMH_IMSIC_S, >> + XIANGSHAN_KMH_DRAM, >> +}; >> + >> +enum { >> + XIANGSHAN_KMH_UART0_IRQ = 10, >> +}; >> + >> +/* Indicating Timebase-freq (1MHZ) */ >> +#define XIANGSHAN_KMH_CLINT_TIMEBASE_FREQ 1000000 >> + >> +#define XIANGSHAN_KMH_IMSIC_NUM_IDS 255 >> +#define XIANGSHAN_KMH_IMSIC_NUM_GUESTS 7 >> +#define XIANGSHAN_KMH_IMSIC_GUEST_BITS 3 >> + >> +#define XIANGSHAN_KMH_APLIC_NUM_SOURCES 96 >> + >> +#endif >> -- >> 2.34.1 >> ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-06-17 3:22 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2025-04-25 12:22 [PATCH v4 2/2] hw/riscv: Initial support for BOSC's Xiangshan Kunminghu FPGA prototype Ran Wang 2025-06-09 4:26 ` Alistair Francis 2025-06-16 10:06 ` Ran Wang 2025-06-17 2:59 ` Alistair Francis 2025-06-17 3:17 ` Ran Wang
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).