Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3be836d authored by Dave Martin's avatar Dave Martin Committed by Marc Zyngier
Browse files

KVM: arm/arm64: Demote kvm_arm_init_arch_resources() to just set up SVE 



The introduction of kvm_arm_init_arch_resources() looks like
premature factoring, since nothing else uses this hook yet and it
is not clear what will use it in the future.

For now, let's not pretend that this is a general thing:

This patch simply renames the function to kvm_arm_init_sve(),
retaining the arm stub version under the new name.

Suggested-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarDave Martin <Dave.Martin@arm.com>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 624835ab

arch/arm/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 


DECLARE_STATIC_KEY_FALSE(userspace_irqchip_in_use);



static inline int kvm_arm_init_arch_resources(void) { return 0; }

static inline int kvm_arm_init_sve(void) { return 0; }



u32 *kvm_vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num, u32 mode);

int __attribute_const__ kvm_target_cpu(void);

arch/arm64/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
DECLARE_STATIC_KEY_FALSE(userspace_irqchip_in_use);



extern unsigned int kvm_sve_max_vl;

int kvm_arm_init_arch_resources(void);

int kvm_arm_init_sve(void);



int __attribute_const__ kvm_target_cpu(void);

int kvm_reset_vcpu(struct kvm_vcpu *vcpu);

arch/arm64/kvm/reset.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ int kvm_arch_vm_ioctl_check_extension(struct kvm *kvm, long ext) 


unsigned int kvm_sve_max_vl;



int kvm_arm_init_arch_resources(void)

int kvm_arm_init_sve(void)

{

	if (system_supports_sve()) {

		kvm_sve_max_vl = sve_max_virtualisable_vl;

virt/kvm/arm/arm.c

+1 −1
Original line number Diff line number Diff line
@@ -1682,7 +1682,7 @@ int kvm_arch_init(void *opaque) 
	if (err)

		return err;



	err = kvm_arm_init_arch_resources();

	err = kvm_arm_init_sve();

	if (err)

		return err;