RISC-V: KVM: Convert extension_disabled[] to ext_status[]

Change the boolean extension_disabled[] array to an array of enums,
ext_status[]. For now, the enum only has two states, which correspond
to the previous boolean states, so this patch has no intended
functional change. The next patch will add another state, expanding
the purpose of ext_status[].

Signed-off-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Signed-off-by: Anup Patel <anup@brainfault.org>

diff --git a/arch/riscv/include/asm/kvm_vcpu_sbi.h b/arch/riscv/include/asm/kvm_vcpu_sbi.h
index 4278125a38a52750e04f5030ac173df1cb00922b..ad1588d6064b41dfaa5634148755b526a99ba5d6 100644 (file)
--- a/arch/riscv/include/asm/kvm_vcpu_sbi.h
+++ b/arch/riscv/include/asm/kvm_vcpu_sbi.h
@@ -14,9 +14,14 @@
 #define KVM_SBI_VERSION_MAJOR 1
 #define KVM_SBI_VERSION_MINOR 0
 
+enum kvm_riscv_sbi_ext_status {
+       KVM_RISCV_SBI_EXT_AVAILABLE,
+       KVM_RISCV_SBI_EXT_UNAVAILABLE,
+};
+
 struct kvm_vcpu_sbi_context {
        int return_handled;
-       bool extension_disabled[KVM_RISCV_SBI_EXT_MAX];
+       enum kvm_riscv_sbi_ext_status ext_status[KVM_RISCV_SBI_EXT_MAX];
 };
 
 struct kvm_vcpu_sbi_return {

diff --git a/arch/riscv/kvm/vcpu_sbi.c b/arch/riscv/kvm/vcpu_sbi.c
index 6aa15f1b97d945b6fe15068c4941a1d1be48d244..28e55ba023dc44473d2b1e8b82ddedf13e2eb330 100644 (file)
--- a/arch/riscv/kvm/vcpu_sbi.c
+++ b/arch/riscv/kvm/vcpu_sbi.c
@@ -155,7 +155,8 @@ static int riscv_vcpu_set_sbi_ext_single(struct kvm_vcpu *vcpu,
        if (!sext)
                return -ENOENT;
 
-       scontext->extension_disabled[sext->ext_idx] = !reg_val;
+       scontext->ext_status[sext->ext_idx] = reg_val ?
+               KVM_RISCV_SBI_EXT_AVAILABLE : KVM_RISCV_SBI_EXT_UNAVAILABLE;
 
        return 0;
 }
@@ -180,7 +181,8 @@ static int riscv_vcpu_get_sbi_ext_single(struct kvm_vcpu *vcpu,
        if (!sext)
                return -ENOENT;
 
-       *reg_val = !scontext->extension_disabled[sext->ext_idx];
+       *reg_val = scontext->ext_status[sext->ext_idx] ==
+                               KVM_RISCV_SBI_EXT_AVAILABLE;
 
        return 0;
 }
@@ -316,7 +318,8 @@ const struct kvm_vcpu_sbi_extension *kvm_vcpu_sbi_find_ext(
                if (sext->ext_ptr->extid_start <= extid &&
                    sext->ext_ptr->extid_end >= extid) {
                        if (sext->ext_idx < KVM_RISCV_SBI_EXT_MAX &&
-                           scontext->extension_disabled[sext->ext_idx])
+                           scontext->ext_status[sext->ext_idx] ==
+                                               KVM_RISCV_SBI_EXT_UNAVAILABLE)
                                return NULL;
                        return sbi_ext[i].ext_ptr;
                }