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

Commit 728d577d authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

ARM: KVM: move kvm_target_cpu to guest.c 



guest.c already contains some target-specific checks. Let's move
kvm_target_cpu() over there so arm.c is mostly target agnostic.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent b4034bde

arch/arm/kvm/arm.c

+0 −17
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <asm/uaccess.h>

#include <asm/ptrace.h>

#include <asm/mman.h>

#include <asm/cputype.h>

#include <asm/tlbflush.h>

#include <asm/cacheflush.h>

#include <asm/virt.h>
@@ -301,22 +300,6 @@ int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) 
	return 0;

}



int __attribute_const__ kvm_target_cpu(void)

{

	unsigned long implementor = read_cpuid_implementor();

	unsigned long part_number = read_cpuid_part_number();



	if (implementor != ARM_CPU_IMP_ARM)

		return -EINVAL;



	switch (part_number) {

	case ARM_CPU_PART_CORTEX_A15:

		return KVM_ARM_TARGET_CORTEX_A15;

	default:

		return -EINVAL;

	}

}



int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)

{

	int ret;

arch/arm/kvm/guest.c

+17 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/module.h>

#include <linux/vmalloc.h>

#include <linux/fs.h>

#include <asm/cputype.h>

#include <asm/uaccess.h>

#include <asm/kvm.h>

#include <asm/kvm_asm.h>
@@ -180,6 +181,22 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, 
	return -EINVAL;

}



int __attribute_const__ kvm_target_cpu(void)

{

	unsigned long implementor = read_cpuid_implementor();

	unsigned long part_number = read_cpuid_part_number();



	if (implementor != ARM_CPU_IMP_ARM)

		return -EINVAL;



	switch (part_number) {

	case ARM_CPU_PART_CORTEX_A15:

		return KVM_ARM_TARGET_CORTEX_A15;

	default:

		return -EINVAL;

	}

}



int kvm_vcpu_set_target(struct kvm_vcpu *vcpu,

			const struct kvm_vcpu_init *init)

{