Skip to content

Commit 2fc8f50

Browse files
MollyChenalistair23
authored andcommitted
target/riscv: add support for RV64 Xiangshan Nanhu CPU
Add a CPU entry for the RV64 XiangShan NANHU CPU which supports single-core and dual-core configurations. More details can be found at https://docs.xiangshan.cc/zh-cn/latest/integration/overview Signed-off-by: MollyChen <[email protected]> Acked-by: Alistair Francis <[email protected]> Reviewed-by: Daniel Henrique Barboza <[email protected]> Message-ID: <[email protected]> [ Changes by AF - Fixup code formatting ] Signed-off-by: Alistair Francis <[email protected]>
1 parent c3de19c commit 2fc8f50

File tree

2 files changed

+31
-0
lines changed

2 files changed

+31
-0
lines changed

target/riscv/cpu-qom.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#define TYPE_RISCV_CPU_THEAD_C906 RISCV_CPU_TYPE_NAME("thead-c906")
5151
#define TYPE_RISCV_CPU_VEYRON_V1 RISCV_CPU_TYPE_NAME("veyron-v1")
5252
#define TYPE_RISCV_CPU_TT_ASCALON RISCV_CPU_TYPE_NAME("tt-ascalon")
53+
#define TYPE_RISCV_CPU_XIANGSHAN_NANHU RISCV_CPU_TYPE_NAME("xiangshan-nanhu")
5354
#define TYPE_RISCV_CPU_HOST RISCV_CPU_TYPE_NAME("host")
5455

5556
OBJECT_DECLARE_CPU_TYPE(RISCVCPU, RISCVCPUClass, RISCV_CPU)

target/riscv/cpu.c

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,34 @@ static void rv64_tt_ascalon_cpu_init(Object *obj)
647647
#endif
648648
}
649649

650+
static void rv64_xiangshan_nanhu_cpu_init(Object *obj)
651+
{
652+
CPURISCVState *env = &RISCV_CPU(obj)->env;
653+
RISCVCPU *cpu = RISCV_CPU(obj);
654+
655+
riscv_cpu_set_misa_ext(env, RVG | RVC | RVB | RVS | RVU);
656+
env->priv_ver = PRIV_VERSION_1_12_0;
657+
658+
/* Enable ISA extensions */
659+
cpu->cfg.ext_zbc = true;
660+
cpu->cfg.ext_zbkb = true;
661+
cpu->cfg.ext_zbkc = true;
662+
cpu->cfg.ext_zbkx = true;
663+
cpu->cfg.ext_zknd = true;
664+
cpu->cfg.ext_zkne = true;
665+
cpu->cfg.ext_zknh = true;
666+
cpu->cfg.ext_zksed = true;
667+
cpu->cfg.ext_zksh = true;
668+
cpu->cfg.ext_svinval = true;
669+
670+
cpu->cfg.mmu = true;
671+
cpu->cfg.pmp = true;
672+
673+
#ifndef CONFIG_USER_ONLY
674+
set_satp_mode_max_supported(cpu, VM_1_10_SV39);
675+
#endif
676+
}
677+
650678
#ifdef CONFIG_TCG
651679
static void rv128_base_cpu_init(Object *obj)
652680
{
@@ -3056,6 +3084,8 @@ static const TypeInfo riscv_cpu_type_infos[] = {
30563084
DEFINE_VENDOR_CPU(TYPE_RISCV_CPU_THEAD_C906, MXL_RV64, rv64_thead_c906_cpu_init),
30573085
DEFINE_VENDOR_CPU(TYPE_RISCV_CPU_TT_ASCALON, MXL_RV64, rv64_tt_ascalon_cpu_init),
30583086
DEFINE_VENDOR_CPU(TYPE_RISCV_CPU_VEYRON_V1, MXL_RV64, rv64_veyron_v1_cpu_init),
3087+
DEFINE_VENDOR_CPU(TYPE_RISCV_CPU_XIANGSHAN_NANHU,
3088+
MXL_RV64, rv64_xiangshan_nanhu_cpu_init),
30593089
#ifdef CONFIG_TCG
30603090
DEFINE_DYNAMIC_CPU(TYPE_RISCV_CPU_BASE128, MXL_RV128, rv128_base_cpu_init),
30613091
#endif /* CONFIG_TCG */

0 commit comments

Comments
 (0)