Merge tag 'kvm-riscv-fixes-6.15-1' of https://github.com/kvm-riscv/linux

into HEAD KVM/riscv fixes for 6.15, take #1 - Add missing reset of smstateen CSRs
mariux64 · May 10, 2025 · 6a74470 · 6a74470
2 parents 92a09c4 + 87ec7d5
commit 6a74470
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c
@@ -77,6 +77,8 @@ static void kvm_riscv_reset_vcpu(struct kvm_vcpu *vcpu)
 	memcpy(cntx, reset_cntx, sizeof(*cntx));
 	spin_unlock(&vcpu->arch.reset_cntx_lock);
 
+	memset(&vcpu->arch.smstateen_csr, 0, sizeof(vcpu->arch.smstateen_csr));
+
 	kvm_riscv_vcpu_fp_reset(vcpu);
 
 	kvm_riscv_vcpu_vector_reset(vcpu);