Add VM_LEVEL1 macro, env_vm_level() and trigger_vm_exit() functions, preparing for later interrupt virtualization.
Signed-off-by: SignKirigami <[email protected]> Signed-off-by: Hengyu Yu <[email protected]> --- target/loongarch/cpu.h | 22 +++++++++++++++++++++- target/loongarch/tcg/tcg_cpu.c | 3 +++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h index 05309336d2..ff22cde702 100644 --- a/target/loongarch/cpu.h +++ b/target/loongarch/cpu.h @@ -324,7 +324,8 @@ typedef struct CPUTimerState { } CPUTimerState; #define VM_LEVEL0 0 -#define VM_LEVELS 1 +#define VM_LEVEL1 1 +#define VM_LEVELS 2 #define CPU_VENDOR_LOONGSON "Loongson" #define CPU_MODEL_3A5000 "3A5000" @@ -448,6 +449,7 @@ typedef struct CPUArchState { #endif int vm_level; unsigned int irq_nr; + bool vm_exit; } CPULoongArchState; typedef struct LoongArchCPUTopo { @@ -520,6 +522,11 @@ static inline CPUSysState *env_sys(CPULoongArchState *env) return &env->sys_states[env->vm_level]; } +static inline int env_vm_level(CPULoongArchState *env) +{ + return env_sys(env) - env->sys_states; +} + static inline void set_sys(CPULoongArchState *env, int vm_level) { if (vm_level >= 0 && vm_level < VM_LEVELS) { @@ -537,6 +544,18 @@ static inline bool cpu_has_lvz(CPULoongArchState *env) return FIELD_EX32(env->cpucfg[2], CPUCFG2, LVZ); } +static inline void trigger_vm_exit(CPULoongArchState *env) +{ + CPUSysState *host = get_sys(env, VM_LEVEL0); + + if (env_vm_level(env) != VM_LEVEL1) { + return; + } + + host->CSR_GSTAT = FIELD_DP64(host->CSR_GSTAT, CSR_GSTAT, PVM, 1); + env->vm_exit = true; +} + static inline CPUTimerState *env_timer(CPULoongArchState *env) { return &env->sys_states[0].timer_state; @@ -583,6 +602,7 @@ static inline void set_pc(CPULoongArchState *env, uint64_t value) #define HW_FLAGS_CRMD_PG R_CSR_CRMD_PG_MASK /* 0x10 */ #define HW_FLAGS_VA32 0x20 #define HW_FLAGS_EUEN_ASXE 0x40 +#define HW_FLAGS_GUEST_MODE 0x80 #define CPU_RESOLVING_TYPE TYPE_LOONGARCH_CPU diff --git a/target/loongarch/tcg/tcg_cpu.c b/target/loongarch/tcg/tcg_cpu.c index 0549506035..c2792c8db1 100644 --- a/target/loongarch/tcg/tcg_cpu.c +++ b/target/loongarch/tcg/tcg_cpu.c @@ -239,6 +239,9 @@ static TCGTBCPUState loongarch_get_tb_cpu_state(CPUState *cs) uint32_t flags; flags = sys->CSR_CRMD & (R_CSR_CRMD_PLV_MASK | R_CSR_CRMD_PG_MASK); + if (env_vm_level(env) == VM_LEVEL1) { + flags |= HW_FLAGS_GUEST_MODE; + } flags |= FIELD_EX64(sys->CSR_EUEN, CSR_EUEN, FPE) * HW_FLAGS_EUEN_FPE; flags |= FIELD_EX64(sys->CSR_EUEN, CSR_EUEN, SXE) * HW_FLAGS_EUEN_SXE; flags |= FIELD_EX64(sys->CSR_EUEN, CSR_EUEN, ASXE) * HW_FLAGS_EUEN_ASXE; -- 2.56.0
