SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/riscv/kvm: add kvm_riscv_reset_regs_csr()

Browse Source 
We're setting reset vals for KVM csrs during kvm_riscv_reset_vcpu(), but
in no particular order and missing some of them (like env->mstatus).

Create a helper to do that, unclogging reset_vcpu(), and initialize
env->mstatus as well. Keep the regs in the same order they appear in
struct kvm_riscv_csr from the KVM UAPI, similar to what
kvm_riscv_(get|put)_regs_csr are doing. This will make a bit easier to
add new KVM CSRs and to verify which values we're writing back to KVM
during vcpu reset.

Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-ID: <20250224123120.1644186-3-dbarboza@ventanamicro.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Daniel Henrique Barboza 2025-02-24 09:31:19 -03:00 committed by Alistair Francis
parent 1a65210876
commit a1e61fc44b
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
target/riscv/kvm/kvm-cpu.c
View File

@ -613,6 +613,19 @@ static int kvm_riscv_put_regs_core(CPUState *cs)
return ret; return ret;
} }
static void kvm_riscv_reset_regs_csr(CPURISCVState *env)
{
env->mstatus = 0;
env->mie = 0;
env->stvec = 0;
env->sscratch = 0;
env->sepc = 0;
env->scause = 0;
env->stval = 0;
env->mip = 0;
env->satp = 0;
}
static int kvm_riscv_get_regs_csr(CPUState *cs) static int kvm_riscv_get_regs_csr(CPUState *cs)
{ {
CPURISCVState *env = &RISCV_CPU(cs)->env; CPURISCVState *env = &RISCV_CPU(cs)->env;
@ -1617,14 +1630,8 @@ void kvm_riscv_reset_vcpu(RISCVCPU *cpu)
env->pc = cpu->env.kernel_addr; env->pc = cpu->env.kernel_addr;
env->gpr[10] = kvm_arch_vcpu_id(CPU(cpu)); /* a0 */ env->gpr[10] = kvm_arch_vcpu_id(CPU(cpu)); /* a0 */
env->gpr[11] = cpu->env.fdt_addr; /* a1 */ env->gpr[11] = cpu->env.fdt_addr; /* a1 */
env->satp = 0;
env->mie = 0; kvm_riscv_reset_regs_csr(env);
env->stvec = 0;
env->sscratch = 0;
env->sepc = 0;
env->scause = 0;
env->stval = 0;
env->mip = 0;
} }
void kvm_riscv_set_irq(RISCVCPU *cpu, int irq, int level) void kvm_riscv_set_irq(RISCVCPU *cpu, int irq, int level)