openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

target/riscv: Update the Hypervisor trap return/entry 

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: e7e4e801234f2934306e734f65860f601a5745bd.1597259519.git.alistair.francis@wdc.com
Message-Id: <e7e4e801234f2934306e734f65860f601a5745bd.1597259519.git.alistair.francis@wdc.com>
This commit is contained in:
Alistair Francis 2020-08-12 12:13:33 -07:00
parent 84b1c04bba
commit f2d5850f71
4 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/riscv/cpu_bits.h
View File

@ -445,6 +445,7 @@
#define HSTATUS_VTSR 0x00400000 #define HSTATUS_VTSR 0x00400000
#define HSTATUS_HU 0x00000200 #define HSTATUS_HU 0x00000200
#define HSTATUS_GVA 0x00000040 #define HSTATUS_GVA 0x00000040
#define HSTATUS_SPVP 0x00000100
#define HSTATUS32_WPRI 0xFF8FF87E #define HSTATUS32_WPRI 0xFF8FF87E
#define HSTATUS64_WPRI 0xFFFFFFFFFF8FF87EULL #define HSTATUS64_WPRI 0xFFFFFFFFFF8FF87EULL

16
target/riscv/cpu_helper.c
View File

@ -929,9 +929,7 @@ void riscv_cpu_do_interrupt(CPUState *cs)
} else if (riscv_cpu_virt_enabled(env)) { } else if (riscv_cpu_virt_enabled(env)) {
/* Trap into HS mode, from virt */ /* Trap into HS mode, from virt */
riscv_cpu_swap_hypervisor_regs(env); riscv_cpu_swap_hypervisor_regs(env);
env->hstatus = set_field(env->hstatus, HSTATUS_SP2V, env->hstatus = set_field(env->hstatus, HSTATUS_SPVP,
get_field(env->hstatus, HSTATUS_SPV));
env->hstatus = set_field(env->hstatus, HSTATUS_SP2P,
get_field(env->mstatus, SSTATUS_SPP)); get_field(env->mstatus, SSTATUS_SPP));
env->hstatus = set_field(env->hstatus, HSTATUS_SPV, env->hstatus = set_field(env->hstatus, HSTATUS_SPV,
riscv_cpu_virt_enabled(env)); riscv_cpu_virt_enabled(env));
@ -942,13 +940,11 @@ void riscv_cpu_do_interrupt(CPUState *cs)
riscv_cpu_set_force_hs_excep(env, 0); riscv_cpu_set_force_hs_excep(env, 0);
} else { } else {
/* Trap into HS mode */ /* Trap into HS mode */
env->hstatus = set_field(env->hstatus, HSTATUS_SP2V, if (!riscv_cpu_two_stage_lookup(env)) {
get_field(env->hstatus, HSTATUS_SPV)); env->hstatus = set_field(env->hstatus, HSTATUS_SPV,
env->hstatus = set_field(env->hstatus, HSTATUS_SP2P, riscv_cpu_virt_enabled(env));
get_field(env->mstatus, SSTATUS_SPP)); }
env->hstatus = set_field(env->hstatus, HSTATUS_SPV, riscv_cpu_set_two_stage_lookup(env, false);
riscv_cpu_virt_enabled(env));
htval = env->guest_phys_fault_addr; htval = env->guest_phys_fault_addr;
} }
} }

8
target/riscv/op_helper.c
View File

@ -97,12 +97,8 @@ target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb)
prev_priv = get_field(mstatus, MSTATUS_SPP); prev_priv = get_field(mstatus, MSTATUS_SPP);
prev_virt = get_field(hstatus, HSTATUS_SPV); prev_virt = get_field(hstatus, HSTATUS_SPV);
hstatus = set_field(hstatus, HSTATUS_SPV, hstatus = set_field(hstatus, HSTATUS_SPV, 0);
get_field(hstatus, HSTATUS_SP2V)); mstatus = set_field(mstatus, MSTATUS_SPP, 0);
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);
mstatus = set_field(mstatus, SSTATUS_SIE, mstatus = set_field(mstatus, SSTATUS_SIE,
get_field(mstatus, SSTATUS_SPIE)); get_field(mstatus, SSTATUS_SPIE));
mstatus = set_field(mstatus, SSTATUS_SPIE, 1); mstatus = set_field(mstatus, SSTATUS_SPIE, 1);

10
target/riscv/translate.c
View File

@ -797,16 +797,6 @@ static void riscv_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs)
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
if (riscv_has_ext(env, RVH)) { if (riscv_has_ext(env, RVH)) {
ctx->virt_enabled = riscv_cpu_virt_enabled(env); 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 { } else {
ctx->virt_enabled = false; ctx->virt_enabled = false;
} }