Re: [PATCH v10 4/5] riscv: Introduce satp mode hw capabilities
On Fri, Feb 3, 2023 at 4:04 PM Alexandre Ghiti wrote: > > Currently, the max satp mode is set with the only constraint that it must be > implemented in QEMU, i.e. set in valid_vm_1_10_[32|64]. > > But we actually need to add another level of constraint: what the hw is > actually capable of, because currently, a linux booting on a sifive-u54 > boots in sv57 mode which is incompatible with the cpu's sv39 max > capability. > > So add a new bitmap to RISCVSATPMap which contains this capability and > initialize it in every XXX_cpu_init. > > Finally: > - valid_vm_1_10_[32|64] constrains which satp mode the CPU can use > - the CPU hw capabilities constrains what the user may select > - the user's selection then constrains what's available to the guest > OS. > > Signed-off-by: Alexandre Ghiti > Reviewed-by: Andrew Jones > Reviewed-by: Bin Meng Reviewed-by: Alistair Francis Alistair > --- > target/riscv/cpu.c | 91 +- > target/riscv/cpu.h | 8 +++- > 2 files changed, 72 insertions(+), 27 deletions(-) > > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c > index 56057cf87c..7e9924ede9 100644 > --- a/target/riscv/cpu.c > +++ b/target/riscv/cpu.c > @@ -293,18 +293,24 @@ const char *satp_mode_str(uint8_t satp_mode, bool > is_32_bit) > g_assert_not_reached(); > } > > -/* Sets the satp mode to the max supported */ > -static void set_satp_mode_default_map(RISCVCPU *cpu) > +static void set_satp_mode_max_supported(RISCVCPU *cpu, > +uint8_t satp_mode) > { > bool rv32 = riscv_cpu_mxl(>env) == MXL_RV32; > +const bool *valid_vm = rv32 ? valid_vm_1_10_32 : valid_vm_1_10_64; > > -if (riscv_feature(>env, RISCV_FEATURE_MMU)) { > -cpu->cfg.satp_mode.map |= > -(1 << satp_mode_from_str(rv32 ? "sv32" : "sv57")); > -} else { > -cpu->cfg.satp_mode.map |= (1 << satp_mode_from_str("mbare")); > +for (int i = 0; i <= satp_mode; ++i) { > +if (valid_vm[i]) { > +cpu->cfg.satp_mode.supported |= (1 << i); > +} > } > } > + > +/* Set the satp mode to the max supported */ > +static void set_satp_mode_default_map(RISCVCPU *cpu) > +{ > +cpu->cfg.satp_mode.map = cpu->cfg.satp_mode.supported; > +} > #endif > > static void riscv_any_cpu_init(Object *obj) > @@ -315,6 +321,13 @@ static void riscv_any_cpu_init(Object *obj) > #elif defined(TARGET_RISCV64) > set_misa(env, MXL_RV64, RVI | RVM | RVA | RVF | RVD | RVC | RVU); > #endif > + > +#ifndef CONFIG_USER_ONLY > +set_satp_mode_max_supported(RISCV_CPU(obj), > +riscv_cpu_mxl(_CPU(obj)->env) == MXL_RV32 ? > +VM_1_10_SV32 : VM_1_10_SV57); > +#endif > + > set_priv_version(env, PRIV_VERSION_1_12_0); > register_cpu_props(obj); > } > @@ -328,6 +341,9 @@ static void rv64_base_cpu_init(Object *obj) > register_cpu_props(obj); > /* Set latest version of privileged specification */ > set_priv_version(env, PRIV_VERSION_1_12_0); > +#ifndef CONFIG_USER_ONLY > +set_satp_mode_max_supported(RISCV_CPU(obj), VM_1_10_SV57); > +#endif > } > > static void rv64_sifive_u_cpu_init(Object *obj) > @@ -335,6 +351,9 @@ static void rv64_sifive_u_cpu_init(Object *obj) > CPURISCVState *env = _CPU(obj)->env; > set_misa(env, MXL_RV64, RVI | RVM | RVA | RVF | RVD | RVC | RVS | RVU); > set_priv_version(env, PRIV_VERSION_1_10_0); > +#ifndef CONFIG_USER_ONLY > +set_satp_mode_max_supported(RISCV_CPU(obj), VM_1_10_SV39); > +#endif > } > > static void rv64_sifive_e_cpu_init(Object *obj) > @@ -345,6 +364,9 @@ static void rv64_sifive_e_cpu_init(Object *obj) > set_misa(env, MXL_RV64, RVI | RVM | RVA | RVC | RVU); > set_priv_version(env, PRIV_VERSION_1_10_0); > cpu->cfg.mmu = false; > +#ifndef CONFIG_USER_ONLY > +set_satp_mode_max_supported(cpu, VM_1_10_MBARE); > +#endif > } > > static void rv128_base_cpu_init(Object *obj) > @@ -361,6 +383,9 @@ static void rv128_base_cpu_init(Object *obj) > register_cpu_props(obj); > /* Set latest version of privileged specification */ > set_priv_version(env, PRIV_VERSION_1_12_0); > +#ifndef CONFIG_USER_ONLY > +set_satp_mode_max_supported(RISCV_CPU(obj), VM_1_10_SV57); > +#endif > } > #else > static void rv32_base_cpu_init(Object *obj) > @@ -371,6 +396,9 @@ static void rv32_base_cpu_init(Object *obj) > register_cpu_props(obj); > /* Set latest version of privileged specification */ > set_priv_version(env, PRIV_VERSION_1_12_0); > +#ifndef CONFIG_USER_ONLY > +set_satp_mode_max_supported(RISCV_CPU(obj), VM_1_10_SV32); > +#endif > } > > static void rv32_sifive_u_cpu_init(Object *obj) > @@ -378,6 +406,9 @@ static void rv32_sifive_u_cpu_init(Object *obj) > CPURISCVState *env = _CPU(obj)->env; > set_misa(env, MXL_RV32, RVI | RVM | RVA | RVF | RVD | RVC | RVS | RVU); > set_priv_version(env, PRIV_VERSION_1_10_0); > +#ifndef
Re: [PATCH v10 4/5] riscv: Introduce satp mode hw capabilities
Reviewed-by: Frank Chang On Fri, Feb 3, 2023 at 2:02 PM Alexandre Ghiti wrote: > Currently, the max satp mode is set with the only constraint that it must > be > implemented in QEMU, i.e. set in valid_vm_1_10_[32|64]. > > But we actually need to add another level of constraint: what the hw is > actually capable of, because currently, a linux booting on a sifive-u54 > boots in sv57 mode which is incompatible with the cpu's sv39 max > capability. > > So add a new bitmap to RISCVSATPMap which contains this capability and > initialize it in every XXX_cpu_init. > > Finally: > - valid_vm_1_10_[32|64] constrains which satp mode the CPU can use > - the CPU hw capabilities constrains what the user may select > - the user's selection then constrains what's available to the guest > OS. > > Signed-off-by: Alexandre Ghiti > Reviewed-by: Andrew Jones > Reviewed-by: Bin Meng > --- > target/riscv/cpu.c | 91 +- > target/riscv/cpu.h | 8 +++- > 2 files changed, 72 insertions(+), 27 deletions(-) > > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c > index 56057cf87c..7e9924ede9 100644 > --- a/target/riscv/cpu.c > +++ b/target/riscv/cpu.c > @@ -293,18 +293,24 @@ const char *satp_mode_str(uint8_t satp_mode, bool > is_32_bit) > g_assert_not_reached(); > } > > -/* Sets the satp mode to the max supported */ > -static void set_satp_mode_default_map(RISCVCPU *cpu) > +static void set_satp_mode_max_supported(RISCVCPU *cpu, > +uint8_t satp_mode) > { > bool rv32 = riscv_cpu_mxl(>env) == MXL_RV32; > +const bool *valid_vm = rv32 ? valid_vm_1_10_32 : valid_vm_1_10_64; > > -if (riscv_feature(>env, RISCV_FEATURE_MMU)) { > -cpu->cfg.satp_mode.map |= > -(1 << satp_mode_from_str(rv32 ? "sv32" : "sv57")); > -} else { > -cpu->cfg.satp_mode.map |= (1 << satp_mode_from_str("mbare")); > +for (int i = 0; i <= satp_mode; ++i) { > +if (valid_vm[i]) { > +cpu->cfg.satp_mode.supported |= (1 << i); > +} > } > } > + > +/* Set the satp mode to the max supported */ > +static void set_satp_mode_default_map(RISCVCPU *cpu) > +{ > +cpu->cfg.satp_mode.map = cpu->cfg.satp_mode.supported; > +} > #endif > > static void riscv_any_cpu_init(Object *obj) > @@ -315,6 +321,13 @@ static void riscv_any_cpu_init(Object *obj) > #elif defined(TARGET_RISCV64) > set_misa(env, MXL_RV64, RVI | RVM | RVA | RVF | RVD | RVC | RVU); > #endif > + > +#ifndef CONFIG_USER_ONLY > +set_satp_mode_max_supported(RISCV_CPU(obj), > +riscv_cpu_mxl(_CPU(obj)->env) == MXL_RV32 ? > +VM_1_10_SV32 : VM_1_10_SV57); > +#endif > + > set_priv_version(env, PRIV_VERSION_1_12_0); > register_cpu_props(obj); > } > @@ -328,6 +341,9 @@ static void rv64_base_cpu_init(Object *obj) > register_cpu_props(obj); > /* Set latest version of privileged specification */ > set_priv_version(env, PRIV_VERSION_1_12_0); > +#ifndef CONFIG_USER_ONLY > +set_satp_mode_max_supported(RISCV_CPU(obj), VM_1_10_SV57); > +#endif > } > > static void rv64_sifive_u_cpu_init(Object *obj) > @@ -335,6 +351,9 @@ static void rv64_sifive_u_cpu_init(Object *obj) > CPURISCVState *env = _CPU(obj)->env; > set_misa(env, MXL_RV64, RVI | RVM | RVA | RVF | RVD | RVC | RVS | > RVU); > set_priv_version(env, PRIV_VERSION_1_10_0); > +#ifndef CONFIG_USER_ONLY > +set_satp_mode_max_supported(RISCV_CPU(obj), VM_1_10_SV39); > +#endif > } > > static void rv64_sifive_e_cpu_init(Object *obj) > @@ -345,6 +364,9 @@ static void rv64_sifive_e_cpu_init(Object *obj) > set_misa(env, MXL_RV64, RVI | RVM | RVA | RVC | RVU); > set_priv_version(env, PRIV_VERSION_1_10_0); > cpu->cfg.mmu = false; > +#ifndef CONFIG_USER_ONLY > +set_satp_mode_max_supported(cpu, VM_1_10_MBARE); > +#endif > } > > static void rv128_base_cpu_init(Object *obj) > @@ -361,6 +383,9 @@ static void rv128_base_cpu_init(Object *obj) > register_cpu_props(obj); > /* Set latest version of privileged specification */ > set_priv_version(env, PRIV_VERSION_1_12_0); > +#ifndef CONFIG_USER_ONLY > +set_satp_mode_max_supported(RISCV_CPU(obj), VM_1_10_SV57); > +#endif > } > #else > static void rv32_base_cpu_init(Object *obj) > @@ -371,6 +396,9 @@ static void rv32_base_cpu_init(Object *obj) > register_cpu_props(obj); > /* Set latest version of privileged specification */ > set_priv_version(env, PRIV_VERSION_1_12_0); > +#ifndef CONFIG_USER_ONLY > +set_satp_mode_max_supported(RISCV_CPU(obj), VM_1_10_SV32); > +#endif > } > > static void rv32_sifive_u_cpu_init(Object *obj) > @@ -378,6 +406,9 @@ static void rv32_sifive_u_cpu_init(Object *obj) > CPURISCVState *env = _CPU(obj)->env; > set_misa(env, MXL_RV32, RVI | RVM | RVA | RVF | RVD | RVC | RVS | > RVU); > set_priv_version(env, PRIV_VERSION_1_10_0); > +#ifndef CONFIG_USER_ONLY > +
[PATCH v10 4/5] riscv: Introduce satp mode hw capabilities
Currently, the max satp mode is set with the only constraint that it must be implemented in QEMU, i.e. set in valid_vm_1_10_[32|64]. But we actually need to add another level of constraint: what the hw is actually capable of, because currently, a linux booting on a sifive-u54 boots in sv57 mode which is incompatible with the cpu's sv39 max capability. So add a new bitmap to RISCVSATPMap which contains this capability and initialize it in every XXX_cpu_init. Finally: - valid_vm_1_10_[32|64] constrains which satp mode the CPU can use - the CPU hw capabilities constrains what the user may select - the user's selection then constrains what's available to the guest OS. Signed-off-by: Alexandre Ghiti Reviewed-by: Andrew Jones Reviewed-by: Bin Meng --- target/riscv/cpu.c | 91 +- target/riscv/cpu.h | 8 +++- 2 files changed, 72 insertions(+), 27 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 56057cf87c..7e9924ede9 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -293,18 +293,24 @@ const char *satp_mode_str(uint8_t satp_mode, bool is_32_bit) g_assert_not_reached(); } -/* Sets the satp mode to the max supported */ -static void set_satp_mode_default_map(RISCVCPU *cpu) +static void set_satp_mode_max_supported(RISCVCPU *cpu, +uint8_t satp_mode) { bool rv32 = riscv_cpu_mxl(>env) == MXL_RV32; +const bool *valid_vm = rv32 ? valid_vm_1_10_32 : valid_vm_1_10_64; -if (riscv_feature(>env, RISCV_FEATURE_MMU)) { -cpu->cfg.satp_mode.map |= -(1 << satp_mode_from_str(rv32 ? "sv32" : "sv57")); -} else { -cpu->cfg.satp_mode.map |= (1 << satp_mode_from_str("mbare")); +for (int i = 0; i <= satp_mode; ++i) { +if (valid_vm[i]) { +cpu->cfg.satp_mode.supported |= (1 << i); +} } } + +/* Set the satp mode to the max supported */ +static void set_satp_mode_default_map(RISCVCPU *cpu) +{ +cpu->cfg.satp_mode.map = cpu->cfg.satp_mode.supported; +} #endif static void riscv_any_cpu_init(Object *obj) @@ -315,6 +321,13 @@ static void riscv_any_cpu_init(Object *obj) #elif defined(TARGET_RISCV64) set_misa(env, MXL_RV64, RVI | RVM | RVA | RVF | RVD | RVC | RVU); #endif + +#ifndef CONFIG_USER_ONLY +set_satp_mode_max_supported(RISCV_CPU(obj), +riscv_cpu_mxl(_CPU(obj)->env) == MXL_RV32 ? +VM_1_10_SV32 : VM_1_10_SV57); +#endif + set_priv_version(env, PRIV_VERSION_1_12_0); register_cpu_props(obj); } @@ -328,6 +341,9 @@ static void rv64_base_cpu_init(Object *obj) register_cpu_props(obj); /* Set latest version of privileged specification */ set_priv_version(env, PRIV_VERSION_1_12_0); +#ifndef CONFIG_USER_ONLY +set_satp_mode_max_supported(RISCV_CPU(obj), VM_1_10_SV57); +#endif } static void rv64_sifive_u_cpu_init(Object *obj) @@ -335,6 +351,9 @@ static void rv64_sifive_u_cpu_init(Object *obj) CPURISCVState *env = _CPU(obj)->env; set_misa(env, MXL_RV64, RVI | RVM | RVA | RVF | RVD | RVC | RVS | RVU); set_priv_version(env, PRIV_VERSION_1_10_0); +#ifndef CONFIG_USER_ONLY +set_satp_mode_max_supported(RISCV_CPU(obj), VM_1_10_SV39); +#endif } static void rv64_sifive_e_cpu_init(Object *obj) @@ -345,6 +364,9 @@ static void rv64_sifive_e_cpu_init(Object *obj) set_misa(env, MXL_RV64, RVI | RVM | RVA | RVC | RVU); set_priv_version(env, PRIV_VERSION_1_10_0); cpu->cfg.mmu = false; +#ifndef CONFIG_USER_ONLY +set_satp_mode_max_supported(cpu, VM_1_10_MBARE); +#endif } static void rv128_base_cpu_init(Object *obj) @@ -361,6 +383,9 @@ static void rv128_base_cpu_init(Object *obj) register_cpu_props(obj); /* Set latest version of privileged specification */ set_priv_version(env, PRIV_VERSION_1_12_0); +#ifndef CONFIG_USER_ONLY +set_satp_mode_max_supported(RISCV_CPU(obj), VM_1_10_SV57); +#endif } #else static void rv32_base_cpu_init(Object *obj) @@ -371,6 +396,9 @@ static void rv32_base_cpu_init(Object *obj) register_cpu_props(obj); /* Set latest version of privileged specification */ set_priv_version(env, PRIV_VERSION_1_12_0); +#ifndef CONFIG_USER_ONLY +set_satp_mode_max_supported(RISCV_CPU(obj), VM_1_10_SV32); +#endif } static void rv32_sifive_u_cpu_init(Object *obj) @@ -378,6 +406,9 @@ static void rv32_sifive_u_cpu_init(Object *obj) CPURISCVState *env = _CPU(obj)->env; set_misa(env, MXL_RV32, RVI | RVM | RVA | RVF | RVD | RVC | RVS | RVU); set_priv_version(env, PRIV_VERSION_1_10_0); +#ifndef CONFIG_USER_ONLY +set_satp_mode_max_supported(RISCV_CPU(obj), VM_1_10_SV32); +#endif } static void rv32_sifive_e_cpu_init(Object *obj) @@ -388,6 +419,9 @@ static void rv32_sifive_e_cpu_init(Object *obj) set_misa(env, MXL_RV32, RVI | RVM | RVA | RVC | RVU); set_priv_version(env, PRIV_VERSION_1_10_0); cpu->cfg.mmu = false; +#ifndef