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

Commit a91d1855 authored by Jintack Lim's avatar Jintack Lim Committed by Marc Zyngier
Browse files

KVM: arm/arm64: Initialize the emulated EL1 physical timer 



Initialize the emulated EL1 physical timer with the default irq number.

Signed-off-by: default avatarJintack Lim <jintack@cs.columbia.edu>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 009a5701

arch/arm/kvm/reset.c

+8 −1
Original line number Diff line number Diff line
@@ -37,6 +37,11 @@ static struct kvm_regs cortexa_regs_reset = { 
	.usr_regs.ARM_cpsr = SVC_MODE | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT,

};



static const struct kvm_irq_level cortexa_ptimer_irq = {

	{ .irq = 30 },

	.level = 1,

};



static const struct kvm_irq_level cortexa_vtimer_irq = {

	{ .irq = 27 },

	.level = 1,
@@ -58,6 +63,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) 
{

	struct kvm_regs *reset_regs;

	const struct kvm_irq_level *cpu_vtimer_irq;

	const struct kvm_irq_level *cpu_ptimer_irq;



	switch (vcpu->arch.target) {

	case KVM_ARM_TARGET_CORTEX_A7:
@@ -65,6 +71,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) 
		reset_regs = &cortexa_regs_reset;

		vcpu->arch.midr = read_cpuid_id();

		cpu_vtimer_irq = &cortexa_vtimer_irq;

		cpu_ptimer_irq = &cortexa_ptimer_irq;

		break;

	default:

		return -ENODEV;
@@ -77,5 +84,5 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) 
	kvm_reset_coprocs(vcpu);



	/* Reset arch_timer context */

	return kvm_timer_vcpu_reset(vcpu, cpu_vtimer_irq);

	return kvm_timer_vcpu_reset(vcpu, cpu_vtimer_irq, cpu_ptimer_irq);

}

arch/arm64/kvm/reset.c

+8 −1
Original line number Diff line number Diff line
@@ -46,6 +46,11 @@ static const struct kvm_regs default_regs_reset32 = { 
			COMPAT_PSR_I_BIT | COMPAT_PSR_F_BIT),

};



static const struct kvm_irq_level default_ptimer_irq = {

	.irq	= 30,

	.level	= 1,

};



static const struct kvm_irq_level default_vtimer_irq = {

	.irq	= 27,

	.level	= 1,
@@ -104,6 +109,7 @@ int kvm_arch_dev_ioctl_check_extension(struct kvm *kvm, long ext) 
int kvm_reset_vcpu(struct kvm_vcpu *vcpu)

{

	const struct kvm_irq_level *cpu_vtimer_irq;

	const struct kvm_irq_level *cpu_ptimer_irq;

	const struct kvm_regs *cpu_reset;



	switch (vcpu->arch.target) {
@@ -117,6 +123,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) 
		}



		cpu_vtimer_irq = &default_vtimer_irq;

		cpu_ptimer_irq = &default_ptimer_irq;

		break;

	}
@@ -130,5 +137,5 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) 
	kvm_pmu_vcpu_reset(vcpu);



	/* Reset timer */

	return kvm_timer_vcpu_reset(vcpu, cpu_vtimer_irq);

	return kvm_timer_vcpu_reset(vcpu, cpu_vtimer_irq, cpu_ptimer_irq);

}

include/kvm/arm_arch_timer.h

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ struct arch_timer_cpu { 
int kvm_timer_hyp_init(void);

int kvm_timer_enable(struct kvm_vcpu *vcpu);

int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu,

			 const struct kvm_irq_level *irq);

			 const struct kvm_irq_level *virt_irq,

			 const struct kvm_irq_level *phys_irq);

void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu);

void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu);

void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu);

virt/kvm/arm/arch_timer.c

+7 −2
Original line number Diff line number Diff line
@@ -327,9 +327,11 @@ void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) 
}



int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu,

			 const struct kvm_irq_level *irq)

			 const struct kvm_irq_level *virt_irq,

			 const struct kvm_irq_level *phys_irq)

{

	struct arch_timer_context *vtimer = vcpu_vtimer(vcpu);

	struct arch_timer_context *ptimer = vcpu_ptimer(vcpu);



	/*

	 * The vcpu timer irq number cannot be determined in
@@ -337,7 +339,8 @@ int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, 
	 * kvm_vcpu_set_target(). To handle this, we determine

	 * vcpu timer irq number when the vcpu is reset.

	 */

	vtimer->irq.irq = irq->irq;

	vtimer->irq.irq = virt_irq->irq;

	ptimer->irq.irq = phys_irq->irq;



	/*

	 * The bits in CNTV_CTL are architecturally reset to UNKNOWN for ARMv8
@@ -346,6 +349,7 @@ int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, 
	 * the ARMv7 architecture.

	 */

	vtimer->cnt_ctl = 0;

	ptimer->cnt_ctl = 0;

	kvm_timer_update_state(vcpu);



	return 0;
@@ -376,6 +380,7 @@ void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) 


	/* Synchronize cntvoff across all vtimers of a VM. */

	update_vtimer_cntvoff(vcpu, kvm_phys_timer_read());

	vcpu_ptimer(vcpu)->cntvoff = 0;



	INIT_WORK(&timer->expired, kvm_timer_inject_irq_work);

	hrtimer_init(&timer->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);