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

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: default avatarAndrew Jones <ajones@ventanamicro.com>
Reviewed-by: default avatarHaibo Xu <haibo1.xu@intel.com>
Reviewed-by: default avatarAnup Patel <anup@brainfault.org>
Signed-off-by: default avatarAnup Patel <anup@brainfault.org>
parent c19829ba

arch/riscv/kvm/vcpu_onereg.c

+2 −34
Original line number Diff line number Diff line
@@ -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();

}