Commit c7db342e authored by Andrew Jones's avatar Andrew Jones Committed by Anup Patel
Browse files

riscv: KVM: Fix hart suspend status check 



"Not stopped" means started or suspended so we need to check for
a single state in order to have a chance to check for each state.
Also, we need to use target_vcpu when checking for the suspend
state.

Fixes: 763c8bed ("RISC-V: KVM: Implement SBI HSM suspend call")
Signed-off-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Reviewed-by: default avatarAnup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/20250217084506.18763-8-ajones@ventanamicro.com


Signed-off-by: default avatarAnup Patel <anup@brainfault.org>
parent 0ad2507d

arch/riscv/kvm/vcpu_sbi_hsm.c

+4 −4
Original line number Diff line number Diff line
@@ -79,12 +79,12 @@ static int kvm_sbi_hsm_vcpu_get_status(struct kvm_vcpu *vcpu) 
	target_vcpu = kvm_get_vcpu_by_id(vcpu->kvm, target_vcpuid);

	if (!target_vcpu)

		return SBI_ERR_INVALID_PARAM;

	if (!kvm_riscv_vcpu_stopped(target_vcpu))

		return SBI_HSM_STATE_STARTED;

	else if (vcpu->stat.generic.blocking)

	if (kvm_riscv_vcpu_stopped(target_vcpu))

		return SBI_HSM_STATE_STOPPED;

	else if (target_vcpu->stat.generic.blocking)

		return SBI_HSM_STATE_SUSPENDED;

	else

		return SBI_HSM_STATE_STOPPED;

		return SBI_HSM_STATE_STARTED;

}



static int kvm_sbi_ext_hsm_handler(struct kvm_vcpu *vcpu, struct kvm_run *run,