RISC-V: Add some prep patches for the Hypervisor
cover RISC-V: Add some prep patches for the Hypervisor
Alistair Francis (8):
target/riscv: Mark privilege level 2 as reserved target/riscv: Trigger interrupt on MIP update asynchronously target/riscv: Improve the scause logic target/riscv: Add the MPV and MTL mstatus bits target/riscv: Allow setting mstatus virtulisation bits target/riscv: Add Hypervisor CSR macros target/riscv: Add the HSTATUS register masks target/riscv: Add the HGATP register masks
target/riscv/cpu_bits.h | 45 +++++++++++++++++++++++++++++++++------ target/riscv/cpu_helper.c | 35 ++++++++++++++++++++++++------ target/riscv/csr.c | 19 +++++++---------- 3 files changed, 74 insertions(+), 25 deletions(-)
Signature · 1 line
2.21.0
PATCH 1/8 target/riscv: Mark privilege level 2 as reserved
--- target/riscv/cpu_bits.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/riscv/cpu_bits.h +1 -1
@@ -383,7 +383,7 @@/* Privilege modes */ #define PRV_U 0#define PRV_S 1 -#define PRV_H 2 +#define PRV_H 2/* Reserved */ #define PRV_M 3/* RV32 satp CSR field masks */
Signature · 1 line
2.21.0
PATCH 2/8 target/riscv: Trigger interrupt on MIP update asynchronously
In reply to Alistair FrancisThe requirement of holding the iothread_mutex is burdersome when swapping the background and foreground registers in the Hypervisor extension. To avoid the requrirement let's set the interrupt asynchronously.
--- target/riscv/cpu_helper.c | 33 +++++++++++++++++++++++++++------ target/riscv/csr.c | 2 -- 2 files changed, 27 insertions(+), 8 deletions(-)
target/riscv/cpu_helper.c +27 -6
@@ -82,10 +82,31 @@ int riscv_cpu_claim_interrupts(RISCVCPU *cpu, uint32_t interrupts) } } -/* iothread_mutex must be held */ +struct CpuAsyncInfo { +uint32_t new_mip; +}; + +static void riscv_cpu_update_mip_irqs_async (CPUState *target_cpu_state, +run_on_cpu_data data) +{ +CPURISCVState *env = &RISCV_CPU (target_cpu_state)->env; +RISCVCPU *cpu =riscv_env_get_cpu (env); +struct CpuAsyncInfo *info = (struct CpuAsyncInfo *) data.host_ptr; + +if (info->new_mip) { +cpu_interrupt (CPU (cpu),CPU_INTERRUPT_HARD ); + }else { +cpu_reset_interrupt (CPU (cpu),CPU_INTERRUPT_HARD ); + } + +g_free (info); +} +uint32_t riscv_cpu_update_mip (RISCVCPU *cpu,uint32_t mask,uint32_t value) {CPURISCVState *env = &cpu->env; +CPUState *cs =CPU (cpu); +struct CpuAsyncInfo *info;uint32_t old, new, cmp =atomic_read (&env->mip); do {
@@ -94,11 +115,11 @@ uint32_t riscv_cpu_update_mip(RISCVCPU *cpu, uint32_t mask, uint32_t value) cmp =atomic_cmpxchg (&env->mip, old, new); }while (old != cmp); -if (new) { -cpu_interrupt (CPU (cpu),CPU_INTERRUPT_HARD ); - }else { -cpu_reset_interrupt (CPU (cpu),CPU_INTERRUPT_HARD ); - } + info = g_new(struct CpuAsyncInfo, 1); + info->new_mip = new; + +async_run_on_cpu (cs, riscv_cpu_update_mip_irqs_async, +RUN_ON_CPU_HOST_PTR (info));return old; }
target/riscv/csr.c +0 -2
@@ -555,9 +555,7 @@ static int rmw_mip(CPURISCVState *env, int csrno, target_ulong *ret_value,uint32_t old_mip;if (mask) { -qemu_mutex_lock_iothread (); old_mip =riscv_cpu_update_mip (cpu, mask, (new_value & mask)); -qemu_mutex_unlock_iothread (); }else { old_mip =atomic_read (&env->mip); }
Signature · 1 line
2.21.0
PATCH 3/8 target/riscv: Improve the scause logic
In reply to Alistair FrancisNo functional change, just making the code easier to read.
--- target/riscv/cpu_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/riscv/cpu_helper.c +1 -1
@@ -525,7 +525,7 @@ void riscv_cpu_do_interrupt(CPUState *cs) s =set_field (s,MSTATUS_SPP , env->priv); s =set_field (s,MSTATUS_SIE ,0 ); env->mstatus = s; - env->scause = cause | ~(((target_ulong)-1 ) >> async); + env->scause = cause | ((target_ulong )async << (TARGET_LONG_BITS -1 )); env->sepc = env->pc; env->sbadaddr = tval; env->pc = (env->stvec >> 2 << 2) +
Signature · 1 line
2.21.0
PATCH 4/8 target/riscv: Add the MPV and MTL mstatus bits
In reply to Alistair Francis--- target/riscv/cpu_bits.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
target/riscv/cpu_bits.h +2 -3
@@ -316,14 +316,11 @@/* mstatus CSR bits */ #define MSTATUS_UIE 0x00000001#define MSTATUS_SIE 0x00000002 -#define MSTATUS_HIE 0x00000004#define MSTATUS_MIE 0x00000008#define MSTATUS_UPIE 0x00000010#define MSTATUS_SPIE 0x00000020 -#define MSTATUS_HPIE 0x00000040#define MSTATUS_MPIE 0x00000080#define MSTATUS_SPP 0x00000100 -#define MSTATUS_HPP 0x00000600#define MSTATUS_MPP 0x00001800#define MSTATUS_FS 0x00006000#define MSTATUS_XS 0x00018000
@@ -335,6 +332,8 @@#define MSTATUS_TVM 0x00100000/* since: priv-1.10 */ #define MSTATUS_TW 0x20000000/* since: priv-1.10 */ #define MSTATUS_TSR 0x40000000/* since: priv-1.10 */ +#define MSTATUS_MTL 0x4000000000ULL +#define MSTATUS_MPV 0x8000000000ULL#define MSTATUS64_UXL 0x0000000300000000ULL#define MSTATUS64_SXL 0x0000000C00000000ULL
Signature · 1 line
2.21.0
PATCH 5/8 target/riscv: Allow setting mstatus virtulisation bits
In reply to Alistair Francis--- target/riscv/csr.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
target/riscv/csr.c +8 -9
@@ -290,7 +290,6 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val) {target_ulong mstatus = env->mstatus;target_ulong mask =0 ; -target_ulong mpp =get_field (val,MSTATUS_MPP );/* flush tlb on mstatus fields that affect VM */ if (env->priv_ver <=PRIV_VERSION_1_09_1 ) {
@@ -305,7 +304,7 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val) MSTATUS_VM : 0); }if (env->priv_ver >=PRIV_VERSION_1_10_0 ) { -if ((val ^ mstatus) & (MSTATUS_MXR |MSTATUS_MPP | +if ((val ^ mstatus) & (MSTATUS_MXR |MSTATUS_MPP |MSTATUS_MPV |MSTATUS_MPRV |MSTATUS_SUM )) {tlb_flush (CPU (riscv_env_get_cpu (env))); }
@@ -313,13 +312,13 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val)MSTATUS_SPP |MSTATUS_FS |MSTATUS_MPRV |MSTATUS_SUM |MSTATUS_MPP |MSTATUS_MXR |MSTATUS_TVM |MSTATUS_TSR |MSTATUS_TW ; - } - -/* silenty discard mstatus.mpp writes for unsupported modes */ -if (mpp ==PRV_H || - (!riscv_has_ext (env,RVS ) && mpp ==PRV_S ) || - (!riscv_has_ext (env,RVU ) && mpp ==PRV_U )) { - mask &= ~MSTATUS_MPP ; +#if defined(TARGET_RISCV64 ) +/* +* RV32: MPV and MTL are not in mstatus. The current plan is to +* add them to mstatush. For now, we just don't support it. +*/ + mask |=MSTATUS_MPP |MSTATUS_MPV ; +#endif } mstatus = (mstatus & ~mask) | (val & mask);
Signature · 1 line
2.21.0
PATCH 6/8 target/riscv: Add Hypervisor CSR macros
In reply to Alistair FrancisAdd the 1.10.1 Hypervisor CSRs and remove the 1.9.1 spec versions.
--- target/riscv/cpu_bits.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
target/riscv/cpu_bits.h +6 -3
@@ -202,6 +202,12 @@#define CSR_DPC 0x7b1#define CSR_DSCRATCH 0x7b2 +/* Hpervisor CSRs */ +#define CSR_HSTATUS 0xa00 +#define CSR_HEDELEG 0xa02 +#define CSR_HIDELEG 0xa03 +#define CSR_HGATP 0xa80 +/* Performance Counters */ #define CSR_MHPMCOUNTER3 0xb03#define CSR_MHPMCOUNTER4 0xb04
@@ -292,9 +298,6 @@#define CSR_MHPMCOUNTER31H 0xb9f/* Legacy Hypervisor Trap Setup (priv v1.9.1) */ -#define CSR_HSTATUS 0x200 -#define CSR_HEDELEG 0x202 -#define CSR_HIDELEG 0x203#define CSR_HIE 0x204#define CSR_HTVEC 0x205
Signature · 1 line
2.21.0
PATCH 7/8 target/riscv: Add the HSTATUS register masks
In reply to Alistair Francis--- target/riscv/cpu_bits.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
target/riscv/cpu_bits.h +18 -0
@@ -382,6 +382,24 @@#define SSTATUS_SD SSTATUS64_SD#endif +/* hstatus CSR bits */ +#define HSTATUS_SPRV 0x00000001 +#define HSTATUS_STL 0x00000040 +#define HSTATUS_SPV 0x00000080 +#define HSTATUS_SP2P 0x00000100 +#define HSTATUS_SP2V 0x00000200 +#define HSTATUS_VTVM 0x00100000 +#define HSTATUS_VTSR 0x00400000 + +#define HSTATUS32_WPRI 0xFF8FF87E +#define HSTATUS64_WPRI 0xFFFFFFFFFF8FF87EULL + +#if defined(TARGET_RISCV32 ) +#define HSTATUS_WPRI HSTATUS32_WPRI +#elif defined(TARGET_RISCV64 ) +#define HSTATUS_WPRI HSTATUS64_WPRI +#endif +/* Privilege modes */ #define PRV_U 0#define PRV_S 1
Signature · 1 line
2.21.0
PATCH 8/8 target/riscv: Add the HGATP register masks
In reply to Alistair Francis--- target/riscv/cpu_bits.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
target/riscv/cpu_bits.h +11 -0
@@ -208,6 +208,17 @@#define CSR_HIDELEG 0xa03#define CSR_HGATP 0xa80 +#if defined(TARGET_RISCV32 ) +#define HGATP_MODE SATP32_MODE +#define HGATP_ASID SATP32_ASID +#define HGATP_PPN SATP32_PPN +#endif +#if defined(TARGET_RISCV64 ) +#define HGATP_MODE SATP64_MODE +#define HGATP_ASID SATP64_ASID +#define HGATP_PPN SATP64_PPN +#endif +/* Performance Counters */ #define CSR_MHPMCOUNTER3 0xb03#define CSR_MHPMCOUNTER4 0xb04
Signature · 1 line
2.21.0