summaryrefslogtreecommitdiff
path: root/arch/riscv/kvm/vcpu_sbi_base.c
diff options
context:
space:
mode:
authorAtish Patra <atishp@rivosinc.com>2023-02-05 04:15:05 +0300
committerAnup Patel <anup@brainfault.org>2023-02-07 18:05:39 +0300
commit026bac4574b5da5aa8715bf60584679fa269eb14 (patch)
tree17b3c21a98509d1a5525e5eaa2e97de66a31986d /arch/riscv/kvm/vcpu_sbi_base.c
parent2723fb7b1e3d331fe6ce04629be6f66898a4cf3b (diff)
downloadlinux-026bac4574b5da5aa8715bf60584679fa269eb14.tar.xz
RISC-V: KVM: Define a probe function for SBI extension data structures
Currently the probe function just checks if an SBI extension is registered or not. However, the extension may not want to advertise itself depending on some other condition. An additional extension specific probe function will allow extensions to decide if they want to be advertised to the caller or not. Any extension that does not require additional dependency checks can avoid implementing this function. Reviewed-by: Anup Patel <anup@brainfault.org> Reviewed-by: Andrew Jones <ajones@ventanamicro.com> Signed-off-by: Atish Patra <atishp@rivosinc.com> Signed-off-by: Anup Patel <anup@brainfault.org>
Diffstat (limited to 'arch/riscv/kvm/vcpu_sbi_base.c')
-rw-r--r--arch/riscv/kvm/vcpu_sbi_base.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/riscv/kvm/vcpu_sbi_base.c b/arch/riscv/kvm/vcpu_sbi_base.c
index 5d65c634d301..66398065a6a6 100644
--- a/arch/riscv/kvm/vcpu_sbi_base.c
+++ b/arch/riscv/kvm/vcpu_sbi_base.c
@@ -19,6 +19,7 @@ static int kvm_sbi_ext_base_handler(struct kvm_vcpu *vcpu, struct kvm_run *run,
{
int ret = 0;
struct kvm_cpu_context *cp = &vcpu->arch.guest_context;
+ const struct kvm_vcpu_sbi_extension *sbi_ext;
switch (cp->a6) {
case SBI_EXT_BASE_GET_SPEC_VERSION:
@@ -43,8 +44,11 @@ static int kvm_sbi_ext_base_handler(struct kvm_vcpu *vcpu, struct kvm_run *run,
*/
kvm_riscv_vcpu_sbi_forward(vcpu, run);
*exit = true;
- } else
- *out_val = kvm_vcpu_sbi_find_ext(cp->a0) ? 1 : 0;
+ } else {
+ sbi_ext = kvm_vcpu_sbi_find_ext(cp->a0);
+ *out_val = sbi_ext && sbi_ext->probe ?
+ sbi_ext->probe(vcpu) : !!sbi_ext;
+ }
break;
case SBI_EXT_BASE_GET_MVENDORID:
*out_val = vcpu->arch.mvendorid;