RISC-V: KVM: Don't add SBI multi regs in get-reg-list

The multi regs are derived from the single registers. Only list the
single registers in get-reg-list. This also makes the SBI extension
register listing consistent with the ISA extension register listing.

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

diff --git a/arch/riscv/kvm/vcpu_onereg.c b/arch/riscv/kvm/vcpu_onereg.c
index f8c9fa0c03c5abbd8a8035f255455e7d5d1c9288..f9bfa8a5db21146a3eaa44ef1a9175930cc86e51 100644 (file)
--- a/arch/riscv/kvm/vcpu_onereg.c
+++ b/arch/riscv/kvm/vcpu_onereg.c
@@ -933,20 +933,12 @@ static inline unsigned long num_isa_ext_regs(const struct kvm_vcpu *vcpu)
 
 static inline unsigned long num_sbi_ext_regs(void)
 {
-       /*
-        * number of KVM_REG_RISCV_SBI_SINGLE +
-        * 2 x (number of KVM_REG_RISCV_SBI_MULTI)
-        */
-       return KVM_RISCV_SBI_EXT_MAX + 2*(KVM_REG_RISCV_SBI_MULTI_REG_LAST+1);
+       return KVM_RISCV_SBI_EXT_MAX;
 }
 
 static int copy_sbi_ext_reg_indices(u64 __user *uindices)
 {
-       int n;
-
-       /* copy KVM_REG_RISCV_SBI_SINGLE */
-       n = KVM_RISCV_SBI_EXT_MAX;
-       for (int i = 0; i < n; i++) {
+       for (int i = 0; i < KVM_RISCV_SBI_EXT_MAX; i++) {
                u64 size = IS_ENABLED(CONFIG_32BIT) ?
                           KVM_REG_SIZE_U32 : KVM_REG_SIZE_U64;
                u64 reg = KVM_REG_RISCV | size | KVM_REG_RISCV_SBI_EXT |
@@ -959,30 +951,6 @@ static int copy_sbi_ext_reg_indices(u64 __user *uindices)
                }
        }
 
-       /* copy KVM_REG_RISCV_SBI_MULTI */
-       n = KVM_REG_RISCV_SBI_MULTI_REG_LAST + 1;
-       for (int i = 0; i < n; i++) {
-               u64 size = IS_ENABLED(CONFIG_32BIT) ?
-                          KVM_REG_SIZE_U32 : KVM_REG_SIZE_U64;
-               u64 reg = KVM_REG_RISCV | size | KVM_REG_RISCV_SBI_EXT |
-                         KVM_REG_RISCV_SBI_MULTI_EN | i;
-
-               if (uindices) {
-                       if (put_user(reg, uindices))
-                               return -EFAULT;
-                       uindices++;
-               }
-
-               reg = KVM_REG_RISCV | size | KVM_REG_RISCV_SBI_EXT |
-                         KVM_REG_RISCV_SBI_MULTI_DIS | i;
-
-               if (uindices) {
-                       if (put_user(reg, uindices))
-                               return -EFAULT;
-                       uindices++;
-               }
-       }
-
        return num_sbi_ext_regs();
 }