Commit a517c1ad authored by James Hogan's avatar James Hogan
Browse files

KVM: MIPS: Init timer frequency from callback 



Currently the software emulated timer is initialised to a frequency of
100MHz by kvm_mips_init_count(), but this isn't suitable for VZ where
the frequency of the guest timer matches that of the host.

Add a count_hz argument so the caller can specify the default frequency,
and move the call from kvm_arch_vcpu_create() to the implementation
specific vcpu_setup() callback, so that VZ can specify a different
frequency.

Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
parent 578fd61d

arch/mips/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ extern enum emulation_result kvm_mips_complete_mmio_load(struct kvm_vcpu *vcpu, 
u32 kvm_mips_read_count(struct kvm_vcpu *vcpu);

void kvm_mips_write_count(struct kvm_vcpu *vcpu, u32 count);

void kvm_mips_write_compare(struct kvm_vcpu *vcpu, u32 compare, bool ack);

void kvm_mips_init_count(struct kvm_vcpu *vcpu);

void kvm_mips_init_count(struct kvm_vcpu *vcpu, unsigned long count_hz);

int kvm_mips_set_count_ctl(struct kvm_vcpu *vcpu, s64 count_ctl);

int kvm_mips_set_count_resume(struct kvm_vcpu *vcpu, s64 count_resume);

int kvm_mips_set_count_hz(struct kvm_vcpu *vcpu, s64 count_hz);

arch/mips/kvm/emulate.c

+6 −7
Original line number Diff line number Diff line
@@ -543,16 +543,15 @@ void kvm_mips_write_count(struct kvm_vcpu *vcpu, u32 count) 
/**

 * kvm_mips_init_count() - Initialise timer.

 * @vcpu:	Virtual CPU.

 * @count_hz:	Frequency of timer.

 *

 * Initialise the timer to a sensible frequency, namely 100MHz, zero it, and set

 * it going if it's enabled.

 * Initialise the timer to the specified frequency, zero it, and set it going if

 * it's enabled.

 */

void kvm_mips_init_count(struct kvm_vcpu *vcpu)

void kvm_mips_init_count(struct kvm_vcpu *vcpu, unsigned long count_hz)

{

	/* 100 MHz */

	vcpu->arch.count_hz = 100*1000*1000;

	vcpu->arch.count_period = div_u64((u64)NSEC_PER_SEC << 32,

					  vcpu->arch.count_hz);

	vcpu->arch.count_hz = count_hz;

	vcpu->arch.count_period = div_u64((u64)NSEC_PER_SEC << 32, count_hz);

	vcpu->arch.count_dyn_bias = 0;



	/* Starting at 0 */

arch/mips/kvm/mips.c

+0 −3
Original line number Diff line number Diff line
@@ -372,9 +372,6 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) 
	/* Init */

	vcpu->arch.last_sched_cpu = -1;



	/* Start off the timer */

	kvm_mips_init_count(vcpu);



	return vcpu;



out_free_gebase:

arch/mips/kvm/trap_emul.c

+3 −0
Original line number Diff line number Diff line
@@ -565,6 +565,9 @@ static int kvm_trap_emul_vcpu_setup(struct kvm_vcpu *vcpu) 
	u32 config, config1;

	int vcpu_id = vcpu->vcpu_id;



	/* Start off the timer at 100 MHz */

	kvm_mips_init_count(vcpu, 100*1000*1000);



	/*

	 * Arch specific stuff, set up config registers properly so that the

	 * guest will come up as expected