Commit dd5f313a authored by Andrew Jones's avatar Andrew Jones Committed by Wentao Guan
Browse files

riscv: KVM: Fix SBI TIME error generation 

stable inclusion
from stable-v6.6.81
commit 2e06f42e88fc84f357bb14d58b93ffb93e992fcb
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBYZED

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2e06f42e88fc84f357bb14d58b93ffb93e992fcb



--------------------------------

[ Upstream commit b901484852992cf3d162a5eab72251cc813ca624 ]

When an invalid function ID of an SBI extension is used we should
return not-supported, not invalid-param.

Fixes: 5f862df5 ("RISC-V: KVM: Add v0.1 replacement SBI extensions defined in v0.2")
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-11-ajones@ventanamicro.com


Signed-off-by: default avatarAnup Patel <anup@brainfault.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
(cherry picked from commit 2e06f42e88fc84f357bb14d58b93ffb93e992fcb)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent 980f9ce4

arch/riscv/kvm/vcpu_sbi_replace.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static int kvm_sbi_ext_time_handler(struct kvm_vcpu *vcpu, struct kvm_run *run, 
	u64 next_cycle;



	if (cp->a6 != SBI_EXT_TIME_SET_TIMER) {

		retdata->err_val = SBI_ERR_INVALID_PARAM;

		retdata->err_val = SBI_ERR_NOT_SUPPORTED;

		return 0;

	}