mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

riscv: hart: Add a "hartid-base" property to RISC-V hart array

Browse Source 
At present each hart's hartid in a RISC-V hart array is assigned
the same value of its index in the hart array. But for a system
that has multiple hart arrays, this is not the case any more.

Add a new "hartid-base" property so that hartid number can be
assigned based on the property value.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
This commit is contained in:
Bin Meng 2019-09-06 09:20:04 -07:00 committed by Palmer Dabbelt
parent 91c985851d
commit e8c56787cd
No known key found for this signature in database
GPG Key ID: EF4CA1502CCBAB41
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/riscv/riscv_hart.c
View File

@ -29,6 +29,7 @@
static Property riscv_harts_props[] = { static Property riscv_harts_props[] = {
DEFINE_PROP_UINT32("num-harts", RISCVHartArrayState, num_harts, 1), DEFINE_PROP_UINT32("num-harts", RISCVHartArrayState, num_harts, 1),
DEFINE_PROP_UINT32("hartid-base", RISCVHartArrayState, hartid_base, 0),
DEFINE_PROP_STRING("cpu-type", RISCVHartArrayState, cpu_type), DEFINE_PROP_STRING("cpu-type", RISCVHartArrayState, cpu_type),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };
@ -47,7 +48,7 @@ static void riscv_hart_realize(RISCVHartArrayState *s, int idx,
object_initialize_child(OBJECT(s), "harts[*]", &s->harts[idx], object_initialize_child(OBJECT(s), "harts[*]", &s->harts[idx],
sizeof(RISCVCPU), cpu_type, sizeof(RISCVCPU), cpu_type,
&error_abort, NULL); &error_abort, NULL);
s->harts[idx].env.mhartid = idx; s->harts[idx].env.mhartid = s->hartid_base + idx;
qemu_register_reset(riscv_harts_cpu_reset, &s->harts[idx]); qemu_register_reset(riscv_harts_cpu_reset, &s->harts[idx]);
object_property_set_bool(OBJECT(&s->harts[idx]), true, object_property_set_bool(OBJECT(&s->harts[idx]), true,
"realized", &err); "realized", &err);

1
include/hw/riscv/riscv_hart.h
View File

@ -35,6 +35,7 @@ typedef struct RISCVHartArrayState {
/*< public >*/ /*< public >*/
uint32_t num_harts; uint32_t num_harts;
uint32_t hartid_base;
char *cpu_type; char *cpu_type;
RISCVCPU *harts; RISCVCPU *harts;
} RISCVHartArrayState; } RISCVHartArrayState;