RISC-V: Update the Hypervisor spec to v0.6
cover RISC-V: Update the Hypervisor spec to v0.6
This series updates the experimental QEMU RISC-V Hypervisor spec to the v0.6 draft implementation.
THis includes support for the new 2-stage lookup instructions and the new CSRs.
This was tested by running 32-bit and 64-bit Xvisor on QEMU and starting Linux guests.
Alistair Francis (15):
target/riscv: Set access as data_load when validating stage-2 PTEs target/riscv: Report errors validating 2nd-stage PTEs target/riscv: Move the hfence instructions to the rvh decode target/riscv: Implement checks for hfence
target/riscv: Allow setting a two-stage lookup in the virt status target/riscv: Allow generating hlv/hlvx/hsv instructions target/riscv: Do two-stage lookups on hlv/hlvx/hsv instructions target/riscv: Don't allow guest to write to htinst target/riscv: Convert MSTATUS MTL to GVA
target/riscv: Fix the interrupt cause code target/riscv: Update the Hypervisor trap return/entry target/riscv: Update the CSRs to the v0.6 Hyp extension target/riscv: Only support a single VSXL length target/riscv: Only support little endian guests target/riscv: Support the v0.6 Hypervisor extension CRSs
target/riscv/cpu.h | 2 + target/riscv/cpu_bits.h | 19 +- target/riscv/cpu_helper.c | 114 +++--- target/riscv/csr.c | 61 ++- target/riscv/helper.h | 8 + target/riscv/insn32-64.decode | 5 + target/riscv/insn32.decode | 17 +- .../riscv/insn_trans/trans_privileged.inc.c | 40 -- target/riscv/insn_trans/trans_rvh.inc.c | 377 ++++++++++++++++++ target/riscv/op_helper.c | 135 ++++++- target/riscv/translate.c | 11 +- 11 files changed, 674 insertions(+), 115 deletions(-) create mode 100644 target/riscv/insn_trans/trans_rvh.inc.c
Signature · 1 line
2.26.2
PATCH 1/15 target/riscv: Set access as data_load when validating stage-2 PTEs
--- target/riscv/cpu_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/riscv/cpu_helper.c +1 -1
@@ -456,7 +456,7 @@ restart:hwaddr vbase;/* Do the second stage translation on the base PTE address. */ -get_physical_address (env, &vbase, &vbase_prot, base, access_type, +get_physical_address (env, &vbase, &vbase_prot, base,MMU_DATA_LOAD , mmu_idx, false, true); pte_addr = vbase + idx * ptesize;
Signature · 1 line
2.26.2
PATCH 2/15 target/riscv: Report errors validating 2nd-stage PTEs
In reply to Alistair Francis--- target/riscv/cpu_helper.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
target/riscv/cpu_helper.c +7 -2
@@ -456,8 +456,13 @@ restart:hwaddr vbase;/* Do the second stage translation on the base PTE address. */ -get_physical_address (env, &vbase, &vbase_prot, base,MMU_DATA_LOAD , - mmu_idx, false, true); +int vbase_ret =get_physical_address (env, &vbase, &vbase_prot, + base,MMU_DATA_LOAD , + mmu_idx, false, true); + +if (vbase_ret !=TRANSLATE_SUCCESS ) { +return vbase_ret; + } pte_addr = vbase + idx * ptesize; }else {
Signature · 1 line
2.26.2
PATCH 3/15 target/riscv: Move the hfence instructions to the rvh decode
In reply to Alistair Francis--- target/riscv/insn32.decode | 6 +- .../riscv/insn_trans/trans_privileged.inc.c | 40 ------------- target/riscv/insn_trans/trans_rvh.inc.c | 57 +++++++++++++++++++ target/riscv/translate.c | 1 + 4 files changed, 62 insertions(+), 42 deletions(-) create mode 100644 target/riscv/insn_trans/trans_rvh.inc.c
target/riscv/insn32.decode +4 -2
@@ -77,8 +77,6 @@ uret 0000000 00010 00000 000 00000 1110011 sret 0001000 00010 00000 000 00000 1110011 mret 0011000 00010 00000 000 00000 1110011 wfi 0001000 00101 00000 000 00000 1110011 -hfence_gvma 0110001 ..... ..... 000 00000 1110011 @hfence_gvma -hfence_bvma 0010001 ..... ..... 000 00000 1110011 @hfence_bvma sfence_vma 0001001 ..... ..... 000 00000 1110011 @sfence_vma sfence_vm 0001000 00100 ..... 000 00000 1110011 @sfence_vm
@@ -207,3 +205,7 @@ fcvt_w_d 1100001 00000 ..... ... ..... 1010011 @r2_rm fcvt_wu_d 1100001 00001 ..... ... ..... 1010011 @r2_rm fcvt_d_w 1101001 00000 ..... ... ..... 1010011 @r2_rm fcvt_d_wu 1101001 00001 ..... ... ..... 1010011 @r2_rm + +# *** RV32H Base Instruction Set *** +hfence_gvma 0110001 ..... ..... 000 00000 1110011 @hfence_gvma +hfence_bvma 0010001 ..... ..... 000 00000 1110011 @hfence_bvma
target/riscv/insn_trans/trans_privileged.inc.c +0 -40
@@ -103,43 +103,3 @@ static bool trans_sfence_vm(DisasContext *ctx, arg_sfence_vm *a)#endif return false; } - -static bool trans_hfence_gvma (DisasContext *ctx,arg_sfence_vma *a) -{ -#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver >=PRIV_VERSION_1_10_0 && -has_ext (ctx,RVH )) { -/* Hpervisor extensions exist */ -/* -* if (env->priv == PRV_M || -* (env->priv == PRV_S && -* !riscv_cpu_virt_enabled(env) && -* get_field(ctx->mstatus_fs, MSTATUS_TVM))) { -*/ -gen_helper_tlb_flush (cpu_env); -return true; -/* } */ - } -#endif -return false; -} - -static bool trans_hfence_bvma (DisasContext *ctx,arg_sfence_vma *a) -{ -#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver >=PRIV_VERSION_1_10_0 && -has_ext (ctx,RVH )) { -/* Hpervisor extensions exist */ -/* -* if (env->priv == PRV_M || -* (env->priv == PRV_S && -* !riscv_cpu_virt_enabled(env) && -* get_field(ctx->mstatus_fs, MSTATUS_TVM))) { -*/ -gen_helper_tlb_flush (cpu_env); -return true; -/* } */ - } -#endif -return false; -}
target/riscv/insn_trans/trans_rvh.inc.c new file +57 -0
57 lines not on this page · raw message
target/riscv/translate.c +1 -0
@@ -711,6 +711,7 @@ static bool gen_shift(DisasContext *ctx, arg_r *a,#include "insn_trans/trans_rva.inc.c" #include "insn_trans/trans_rvf.inc.c" #include "insn_trans/trans_rvd.inc.c" +#include "insn_trans/trans_rvh.inc.c" #include "insn_trans/trans_privileged.inc.c" /* Include the auto-generated decoder for 16 bit insn */
Signature · 1 line
2.26.2
PATCH 4/15 target/riscv: Implement checks for hfence
In reply to Alistair FrancisCall the helper_hyp_tlb_flush() function on hfence instructions which will generate an illegal insruction execption if we don't have permission to flush the Hypervisor level TLBs.
--- target/riscv/helper.h | 5 ++++ target/riscv/insn_trans/trans_rvh.inc.c | 32 +++++-------------------- target/riscv/op_helper.c | 13 ++++++++++ 3 files changed, 24 insertions(+), 26 deletions(-)
target/riscv/helper.h +5 -0
@@ -76,3 +76,8 @@ DEF_HELPER_2(mret, tl, env, tl) DEF_HELPER_1(wfi, void, env) DEF_HELPER_1(tlb_flush, void, env)#endif + +/* Hypervisor functions */ +#ifndef CONFIG_USER_ONLY +DEF_HELPER_1(hyp_tlb_flush, void, env) +#endif
target/riscv/insn_trans/trans_rvh.inc.c +6 -26
@@ -18,40 +18,20 @@static bool trans_hfence_gvma (DisasContext *ctx,arg_sfence_vma *a) { +REQUIRE_EXT (ctx,RVH );#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver >=PRIV_VERSION_1_10_0 && -has_ext (ctx,RVH )) { -/* Hpervisor extensions exist */ -/* -* if (env->priv == PRV_M || -* (env->priv == PRV_S && -* !riscv_cpu_virt_enabled(env) && -* get_field(ctx->mstatus_fs, MSTATUS_TVM))) { -*/ -gen_helper_tlb_flush (cpu_env); -return true; -/* } */ - } +gen_helper_hyp_tlb_flush (cpu_env); +return true;#endif return false; }static bool trans_hfence_bvma (DisasContext *ctx,arg_sfence_vma *a) { +REQUIRE_EXT (ctx,RVH );#ifndef CONFIG_USER_ONLY -if (ctx->priv_ver >=PRIV_VERSION_1_10_0 && -has_ext (ctx,RVH )) { -/* Hpervisor extensions exist */ -/* -* if (env->priv == PRV_M || -* (env->priv == PRV_S && -* !riscv_cpu_virt_enabled(env) && -* get_field(ctx->mstatus_fs, MSTATUS_TVM))) { -*/ -gen_helper_tlb_flush (cpu_env); -return true; -/* } */ - } +gen_helper_hyp_tlb_flush (cpu_env); +return true;#endif return false; }
target/riscv/op_helper.c +13 -0
@@ -201,4 +201,17 @@ void helper_tlb_flush(CPURISCVState *env) } } +void helper_hyp_tlb_flush (CPURISCVState *env) +{ +CPUState *cs =env_cpu (env); + +if (env->priv ==PRV_M || + (env->priv ==PRV_S && !riscv_cpu_virt_enabled (env))) { +tlb_flush (cs); +return ; + } + +riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ()); +} +#endif /* !CONFIG_USER_ONLY */
Signature · 1 line
2.26.2
PATCH 5/15 target/riscv: Allow setting a two-stage lookup in the virt status
In reply to Alistair Francis--- target/riscv/cpu.h | 2 ++ target/riscv/cpu_bits.h | 1 + target/riscv/cpu_helper.c | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+)
target/riscv/cpu.h +2 -0
@@ -302,6 +302,8 @@ bool riscv_cpu_virt_enabled(CPURISCVState *env);void riscv_cpu_set_virt_enabled (CPURISCVState *env,bool enable);bool riscv_cpu_force_hs_excep_enabled (CPURISCVState *env);void riscv_cpu_set_force_hs_excep (CPURISCVState *env,bool enable); +bool riscv_cpu_two_stage_lookup (CPURISCVState *env); +void riscv_cpu_set_two_stage_lookup (CPURISCVState *env,bool enable);int riscv_cpu_mmu_index (CPURISCVState *env,bool ifetch);hwaddr riscv_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr); void riscv_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
target/riscv/cpu_bits.h +1 -0
@@ -452,6 +452,7 @@* page table fault. */ #define FORCE_HS_EXCEP 2 +#define HS_TWO_STAGE 4/* RV32 satp CSR field masks */ #define SATP32_MODE 0x80000000
target/riscv/cpu_helper.c +18 -0
@@ -220,6 +220,24 @@ void riscv_cpu_set_force_hs_excep(CPURISCVState *env, bool enable) env->virt =set_field (env->virt,FORCE_HS_EXCEP , enable); } +bool riscv_cpu_two_stage_lookup (CPURISCVState *env) +{ +if (!riscv_has_ext (env,RVH )) { +return false; + } + +return get_field (env->virt,HS_TWO_STAGE ); +} + +void riscv_cpu_set_two_stage_lookup (CPURISCVState *env,bool enable) +{ +if (!riscv_has_ext (env,RVH )) { +return ; + } + + env->virt =set_field (env->virt,HS_TWO_STAGE , enable); +} +int riscv_cpu_claim_interrupts (RISCVCPU *cpu,uint32_t interrupts) {CPURISCVState *env = &cpu->env;
Signature · 1 line
2.26.2
PATCH 6/15 target/riscv: Allow generating hlv/hlvx/hsv instructions
In reply to Alistair Francis--- target/riscv/cpu_bits.h | 1 + target/riscv/helper.h | 3 + target/riscv/insn32-64.decode | 5 + target/riscv/insn32.decode | 11 + target/riscv/insn_trans/trans_rvh.inc.c | 340 ++++++++++++++++++++++++ target/riscv/op_helper.c | 114 ++++++++ 6 files changed, 474 insertions(+)
target/riscv/cpu_bits.h +1 -0
@@ -428,6 +428,7 @@#define HSTATUS_SP2V 0x00000200#define HSTATUS_VTVM 0x00100000#define HSTATUS_VTSR 0x00400000 +#define HSTATUS_HU 0x00000200#define HSTATUS32_WPRI 0xFF8FF87E#define HSTATUS64_WPRI 0xFFFFFFFFFF8FF87EULL
target/riscv/helper.h +3 -0
@@ -80,4 +80,7 @@ DEF_HELPER_1(tlb_flush, void, env)/* Hypervisor functions */ #ifndef CONFIG_USER_ONLY DEF_HELPER_1(hyp_tlb_flush, void, env) +DEF_HELPER_4(hyp_load, tl, env, tl, tl, tl) +DEF_HELPER_5(hyp_store, void, env, tl, tl, tl, tl) +DEF_HELPER_4(hyp_x_load, tl, env, tl, tl, tl)#endif
target/riscv/insn32-64.decode +5 -0
@@ -70,3 +70,8 @@ fmv_x_d 1110001 00000 ..... 000 ..... 1010011 @r2 fcvt_d_l 1101001 00010 ..... ... ..... 1010011 @r2_rm fcvt_d_lu 1101001 00011 ..... ... ..... 1010011 @r2_rm fmv_d_x 1111001 00000 ..... 000 ..... 1010011 @r2 + +# *** RV32H Base Instruction Set *** +hlv_wu 0110100 00001 ..... 100 ..... 1110011 @r2 +hlv_d 0110110 00000 ..... 100 ..... 1110011 @r2 +hsv_d 0110111 ..... ..... 100 00000 1110011 @r2_s
target/riscv/insn32.decode +11 -0
@@ -62,6 +62,7 @@ @r_rm ....... ..... ..... ... ..... ....... %rs2 %rs1 %rm %rd @r2_rm ....... ..... ..... ... ..... ....... %rs1 %rm %rd @r2 ....... ..... ..... ... ..... ....... %rs1 %rd +@r2_s ....... ..... ..... ... ..... ....... %rs2 %rs1 @hfence_gvma ....... ..... ..... ... ..... ....... %rs2 %rs1 @hfence_bvma ....... ..... ..... ... ..... ....... %rs2 %rs1
@@ -207,5 +208,15 @@ fcvt_d_w 1101001 00000 ..... ... ..... 1010011 @r2_rm fcvt_d_wu 1101001 00001 ..... ... ..... 1010011 @r2_rm # *** RV32H Base Instruction Set *** +hlv_b 0110000 00000 ..... 100 ..... 1110011 @r2 +hlv_bu 0110000 00001 ..... 100 ..... 1110011 @r2 +hlv_h 0110010 00000 ..... 100 ..... 1110011 @r2 +hlv_hu 0110010 00001 ..... 100 ..... 1110011 @r2 +hlvx_hu 0110010 00011 ..... 100 ..... 1110011 @r2 +hlv_w 0110100 00000 ..... 100 ..... 1110011 @r2 +hlvx_wu 0110100 00011 ..... 100 ..... 1110011 @r2 +hsv_b 0110001 ..... ..... 100 00000 1110011 @r2_s +hsv_h 0110011 ..... ..... 100 00000 1110011 @r2_s +hsv_w 0110101 ..... ..... 100 00000 1110011 @r2_s hfence_gvma 0110001 ..... ..... 000 00000 1110011 @hfence_gvma hfence_bvma 0010001 ..... ..... 000 00000 1110011 @hfence_bvma
target/riscv/insn_trans/trans_rvh.inc.c +340 -0
346 lines not on this page · raw message
target/riscv/op_helper.c +114 -0
118 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH 7/15 target/riscv: Do two-stage lookups on hlv/hlvx/hsv instructions
In reply to Alistair Francis--- target/riscv/cpu_helper.c | 54 +++++++++++++++------------------------ 1 file changed, 21 insertions(+), 33 deletions(-)
target/riscv/cpu_helper.c +21 -33
@@ -340,22 +340,13 @@ static int get_physical_address(CPURISCVState *env, hwaddr *physical,* was called. Background registers will be used if the guest has * forced a two stage translation to be on (in HS or M mode). */ +if (riscv_cpu_two_stage_lookup (env) && access_type !=MMU_INST_FETCH ) { + use_background = true; + } +if (mode ==PRV_M && access_type !=MMU_INST_FETCH ) {if (get_field (env->mstatus,MSTATUS_MPRV )) { mode =get_field (env->mstatus,MSTATUS_MPP ); - -if (riscv_has_ext (env,RVH ) && -MSTATUS_MPV_ISSET (env)) { - use_background = true; - } - } - } - -if (mode ==PRV_S && access_type !=MMU_INST_FETCH && -riscv_has_ext (env,RVH ) && !riscv_cpu_virt_enabled (env)) { -if (get_field (env->hstatus,HSTATUS_SPRV )) { - mode =get_field (env->mstatus,SSTATUS_SPP ); - use_background = true; } }
@@ -727,8 +718,6 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size,hwaddr pa =0 ;int prot, prot2;bool pmp_violation = false; -bool m_mode_two_stage = false; -bool hs_mode_two_stage = false;bool first_stage_error = true;int ret =TRANSLATE_FAIL ;int mode = mmu_idx;
@@ -738,30 +727,21 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size,qemu_log_mask (CPU_LOG_MMU ,"%s ad %" VADDR_PRIx" rw %d mmu_idx %d\n" , __func__, address, access_type, mmu_idx); -/* -* Determine if we are in M mode and MPRV is set or in HS mode and SPRV is -* set and we want to access a virtulisation address. -*/ -if (riscv_has_ext (env,RVH )) { - m_mode_two_stage = env->priv ==PRV_M && - access_type !=MMU_INST_FETCH && -get_field (env->mstatus,MSTATUS_MPRV ) && -MSTATUS_MPV_ISSET (env); - - hs_mode_two_stage = env->priv ==PRV_S && - !riscv_cpu_virt_enabled (env) && - access_type !=MMU_INST_FETCH && -get_field (env->hstatus,HSTATUS_SPRV ) && -get_field (env->hstatus,HSTATUS_SPV ); - } -if (mode ==PRV_M && access_type !=MMU_INST_FETCH ) {if (get_field (env->mstatus,MSTATUS_MPRV )) { mode =get_field (env->mstatus,MSTATUS_MPP ); } } -if (riscv_cpu_virt_enabled (env) || m_mode_two_stage || hs_mode_two_stage) { +if (riscv_has_ext (env,RVH ) && env->priv ==PRV_M && + access_type !=MMU_INST_FETCH && +get_field (env->mstatus,MSTATUS_MPRV ) && +MSTATUS_MPV_ISSET (env)) { +riscv_cpu_set_two_stage_lookup (env, true); + } + +if (riscv_cpu_virt_enabled (env) || + (riscv_cpu_two_stage_lookup (env) && access_type !=MMU_INST_FETCH )) {/* Two stage lookup */ ret =get_physical_address (env, &pa, &prot, address, access_type, mmu_idx, true, true);
@@ -813,6 +793,14 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size, __func__, address, ret, pa, prot); } +/* We did the two stage lookup based on MPRV, unset the lookup */ +if (riscv_has_ext (env,RVH ) && env->priv ==PRV_M && + access_type !=MMU_INST_FETCH && +get_field (env->mstatus,MSTATUS_MPRV ) && +MSTATUS_MPV_ISSET (env)) { +riscv_cpu_set_two_stage_lookup (env, false); + } +if (riscv_feature (env,RISCV_FEATURE_PMP ) && (ret ==TRANSLATE_SUCCESS ) && !pmp_hart_has_privs (env, pa, size,1 << access_type, mode)) {
Signature · 1 line
2.26.2
PATCH 8/15 target/riscv: Don't allow guest to write to htinst
In reply to Alistair Francis--- target/riscv/csr.c | 1 - 1 file changed, 1 deletion(-)
target/riscv/csr.c +0 -1
@@ -940,7 +940,6 @@ static int read_htinst(CPURISCVState *env, int csrno, target_ulong *val)static int write_htinst (CPURISCVState *env,int csrno,target_ulong val) { - env->htinst = val;return 0 ; }
Signature · 1 line
2.26.2
PATCH 9/15 target/riscv: Convert MSTATUS MTL to GVA
In reply to Alistair Francis--- target/riscv/cpu_bits.h | 5 +++-- target/riscv/cpu_helper.c | 20 ++++++++++++++++---- target/riscv/csr.c | 6 +++--- 3 files changed, 22 insertions(+), 9 deletions(-)
target/riscv/cpu_bits.h +3 -2
@@ -364,10 +364,10 @@#define MSTATUS_TW 0x20000000/* since: priv-1.10 */ #define MSTATUS_TSR 0x40000000/* since: priv-1.10 */ #if defined(TARGET_RISCV64 ) -#define MSTATUS_MTL 0x4000000000ULL +#define MSTATUS_GVA 0x4000000000ULL#define MSTATUS_MPV 0x8000000000ULL#elif defined(TARGET_RISCV32 ) -#define MSTATUS_MTL 0x00000040 +#define MSTATUS_GVA 0x00000040#define MSTATUS_MPV 0x00000080#endif
@@ -429,6 +429,7 @@#define HSTATUS_VTVM 0x00100000#define HSTATUS_VTSR 0x00400000#define HSTATUS_HU 0x00000200 +#define HSTATUS_GVA 0x00000040#define HSTATUS32_WPRI 0xFF8FF87E#define HSTATUS64_WPRI 0xFFFFFFFFFF8FF87EULL
target/riscv/cpu_helper.c +16 -4
@@ -914,6 +914,15 @@ void riscv_cpu_do_interrupt(CPUState *cs)if (riscv_has_ext (env,RVH )) {target_ulong hdeleg = async ? env->hideleg : env->hedeleg; +if (riscv_cpu_virt_enabled (env) && tval) { +/* +* If we are writing a guest virtual address to stval, set +* this to 1. If we are trapping to VS we will set this to 0 +* later. +*/ + env->hstatus =set_field (env->hstatus,HSTATUS_GVA ,1 ); + } +if (riscv_cpu_virt_enabled (env) && ((hdeleg >> cause) &1 ) && !force_hs_execp) {/*
@@ -924,6 +933,7 @@ void riscv_cpu_do_interrupt(CPUState *cs) cause == IRQ_VS_EXT) cause = cause -1 ;/* Trap to VS mode */ + env->hstatus =set_field (env->hstatus,HSTATUS_GVA ,0 ); }else if (riscv_cpu_virt_enabled (env)) {/* Trap into HS mode, from virt */ riscv_cpu_swap_hypervisor_regs (env);
@@ -973,13 +983,15 @@ void riscv_cpu_do_interrupt(CPUState *cs)#ifdef TARGET_RISCV32 env->mstatush =set_field (env->mstatush,MSTATUS_MPV ,riscv_cpu_virt_enabled (env)); - env->mstatush =set_field (env->mstatush,MSTATUS_MTL , -riscv_cpu_force_hs_excep_enabled (env)); +if (riscv_cpu_virt_enabled (env) && tval) { + env->mstatush =set_field (env->mstatush,MSTATUS_GVA ,1 ); + }#else env->mstatus =set_field (env->mstatus,MSTATUS_MPV ,riscv_cpu_virt_enabled (env)); - env->mstatus =set_field (env->mstatus,MSTATUS_MTL , -riscv_cpu_force_hs_excep_enabled (env)); +if (riscv_cpu_virt_enabled (env) && tval) { + env->mstatus =set_field (env->mstatus,MSTATUS_GVA ,1 ); + }#endif mtval2 = env->guest_phys_fault_addr;
target/riscv/csr.c +3 -3
@@ -380,10 +380,10 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val)MSTATUS_TW ;#if defined(TARGET_RISCV64 )/* -* RV32: MPV and MTL are not in mstatus. The current plan is to +* RV32: MPV and GVA are not in mstatus. The current plan is to * add them to mstatush. For now, we just don't support it. */ - mask |=MSTATUS_MTL |MSTATUS_MPV ; + mask |=MSTATUS_MPV |MSTATUS_GVA ;#endif }
@@ -410,7 +410,7 @@ static int write_mstatush(CPURISCVState *env, int csrno, target_ulong val)tlb_flush (env_cpu (env)); } - val &=MSTATUS_MPV |MSTATUS_MTL ; + val &=MSTATUS_MPV |MSTATUS_GVA ; env->mstatush = val;
Signature · 1 line
2.26.2
PATCH 10/15 target/riscv: Fix the interrupt cause code
In reply to Alistair Francis--- target/riscv/cpu_helper.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
target/riscv/cpu_helper.c +3 -2
@@ -925,14 +925,15 @@ void riscv_cpu_do_interrupt(CPUState *cs)if (riscv_cpu_virt_enabled (env) && ((hdeleg >> cause) &1 ) && !force_hs_execp) { +/* Trap to VS mode */ /* * See if we need to adjust cause. Yes if its VS mode interrupt * no if hypervisor has delegated one of hs mode's interrupt */ if (cause ==IRQ_VS_TIMER || cause ==IRQ_VS_SOFT || - cause ==IRQ_VS_EXT ) + cause ==IRQ_VS_EXT ) { cause = cause -1 ; -/* Trap to VS mode */ + } env->hstatus =set_field (env->hstatus,HSTATUS_GVA ,0 ); }else if (riscv_cpu_virt_enabled (env)) {/* Trap into HS mode, from virt */
Signature · 1 line
2.26.2
PATCH 11/15 target/riscv: Update the Hypervisor trap return/entry
In reply to Alistair Francis--- target/riscv/cpu_bits.h | 1 + target/riscv/cpu_helper.c | 8 +------- target/riscv/op_helper.c | 8 ++------ target/riscv/translate.c | 10 ---------- 4 files changed, 4 insertions(+), 23 deletions(-)
target/riscv/cpu_bits.h +1 -0
@@ -430,6 +430,7 @@#define HSTATUS_VTSR 0x00400000#define HSTATUS_HU 0x00000200#define HSTATUS_GVA 0x00000040 +#define HSTATUS_SPVP 0x00000100#define HSTATUS32_WPRI 0xFF8FF87E#define HSTATUS64_WPRI 0xFFFFFFFFFF8FF87EULL
target/riscv/cpu_helper.c +1 -7
@@ -938,9 +938,7 @@ void riscv_cpu_do_interrupt(CPUState *cs) }else if (riscv_cpu_virt_enabled (env)) {/* Trap into HS mode, from virt */ riscv_cpu_swap_hypervisor_regs (env); - env->hstatus =set_field (env->hstatus,HSTATUS_SP2V , -get_field (env->hstatus,HSTATUS_SPV )); - env->hstatus =set_field (env->hstatus,HSTATUS_SP2P , + env->hstatus =set_field (env->hstatus,HSTATUS_SPVP ,get_field (env->mstatus,SSTATUS_SPP )); env->hstatus =set_field (env->hstatus,HSTATUS_SPV ,riscv_cpu_virt_enabled (env));
@@ -951,10 +949,6 @@ void riscv_cpu_do_interrupt(CPUState *cs)riscv_cpu_set_force_hs_excep (env,0 ); }else {/* Trap into HS mode */ - env->hstatus =set_field (env->hstatus,HSTATUS_SP2V , -get_field (env->hstatus,HSTATUS_SPV )); - env->hstatus =set_field (env->hstatus,HSTATUS_SP2P , -get_field (env->mstatus,SSTATUS_SPP )); env->hstatus =set_field (env->hstatus,HSTATUS_SPV ,riscv_cpu_virt_enabled (env));
target/riscv/op_helper.c +2 -6
@@ -98,12 +98,8 @@ target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb) prev_priv =get_field (mstatus,MSTATUS_SPP ); prev_virt =get_field (hstatus,HSTATUS_SPV ); - hstatus =set_field (hstatus,HSTATUS_SPV , -get_field (hstatus,HSTATUS_SP2V )); - mstatus =set_field (mstatus,MSTATUS_SPP , -get_field (hstatus,HSTATUS_SP2P )); - hstatus =set_field (hstatus,HSTATUS_SP2V ,0 ); - hstatus =set_field (hstatus,HSTATUS_SP2P ,0 ); + hstatus =set_field (hstatus,HSTATUS_SPV ,0 ); + mstatus =set_field (mstatus,MSTATUS_SPP ,0 ); mstatus =set_field (mstatus,SSTATUS_SIE ,get_field (mstatus,SSTATUS_SPIE )); mstatus =set_field (mstatus,SSTATUS_SPIE ,1 );
target/riscv/translate.c +0 -10
@@ -754,16 +754,6 @@ static void riscv_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs)#if !defined(CONFIG_USER_ONLY )if (riscv_has_ext (env,RVH )) { ctx->virt_enabled =riscv_cpu_virt_enabled (env); -if (env->priv_ver ==PRV_M && -get_field (env->mstatus,MSTATUS_MPRV ) && -MSTATUS_MPV_ISSET (env)) { - ctx->virt_enabled = true; - }else if (env->priv ==PRV_S && - !riscv_cpu_virt_enabled (env) && -get_field (env->hstatus,HSTATUS_SPRV ) && -get_field (env->hstatus,HSTATUS_SPV )) { - ctx->virt_enabled = true; - } }else { ctx->virt_enabled = false; }
Signature · 1 line
2.26.2
PATCH 12/15 target/riscv: Update the CSRs to the v0.6 Hyp extension
In reply to Alistair Francis--- target/riscv/cpu_bits.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
target/riscv/cpu_bits.h +8 -6
@@ -422,15 +422,17 @@#endif /* hstatus CSR bits */ -#define HSTATUS_SPRV 0x00000001 +#define HSTATUS_VSBE 0x00000020 +#define HSTATUS_GVA 0x00000040#define HSTATUS_SPV 0x00000080 -#define HSTATUS_SP2P 0x00000100 -#define HSTATUS_SP2V 0x00000200 +#define HSTATUS_SPVP 0x00000100 +#define HSTATUS_HU 0x00000200 +#define HSTATUS_VGEIN 0x0003F000#define HSTATUS_VTVM 0x00100000#define HSTATUS_VTSR 0x00400000 -#define HSTATUS_HU 0x00000200 -#define HSTATUS_GVA 0x00000040 -#define HSTATUS_SPVP 0x00000100 +#if defined(TARGET_RISCV64 ) +#define HSTATUS_VSXL 0x300000000 +#endif #define HSTATUS32_WPRI 0xFF8FF87E#define HSTATUS64_WPRI 0xFFFFFFFFFF8FF87EULL
Signature · 1 line
2.26.2
PATCH 13/15 target/riscv: Only support a single VSXL length
In reply to Alistair Francis--- target/riscv/csr.c | 9 +++++++++ 1 file changed, 9 insertions(+)
target/riscv/csr.c +9 -0
@@ -854,12 +854,21 @@ static int write_satp(CPURISCVState *env, int csrno, target_ulong val)static int read_hstatus (CPURISCVState *env,int csrno,target_ulong *val) { *val = env->hstatus; +#ifdef TARGET_RISCV64 +/* We only support 64-bit VSXL */ + *val =set_field (*val,HSTATUS_VSXL ,2 ); +#endif return 0 ; }static int write_hstatus (CPURISCVState *env,int csrno,target_ulong val) { env->hstatus = val; +#ifdef TARGET_RISCV64 +if (get_field (val,HSTATUS_VSXL ) !=2 ) { +qemu_log_mask (LOG_UNIMP ,"QEMU does not support mixed HSXLEN options." ); + } +#endif return 0 ; }
Signature · 1 line
2.26.2
PATCH 14/15 target/riscv: Only support little endian guests
In reply to Alistair Francis--- target/riscv/csr.c | 5 +++++ 1 file changed, 5 insertions(+)
target/riscv/csr.c +5 -0
@@ -858,6 +858,8 @@ static int read_hstatus(CPURISCVState *env, int csrno, target_ulong *val)/* We only support 64-bit VSXL */ *val =set_field (*val,HSTATUS_VSXL ,2 );#endif +/* We only support little endian */ + *val =set_field (*val,HSTATUS_VSBE ,0 );return 0 ; }
@@ -869,6 +871,9 @@ static int write_hstatus(CPURISCVState *env, int csrno, target_ulong val) qemu_log_mask(LOG_UNIMP, "QEMU does not support mixed HSXLEN options."); }#endif +if (get_field (val,HSTATUS_VSBE ) !=0 ) { +qemu_log_mask (LOG_UNIMP ,"QEMU does not support big endian guests." ); + }return 0 ; }
Signature · 1 line
2.26.2