KVM: arm/arm64: Initialize the emulated EL1 physical timer
Initialize the emulated EL1 physical timer with the default irq number. Signed-off-by: Jintack Lim <jintack@cs.columbia.edu> Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
This commit is contained in:
parent
009a5701bb
commit
a91d18551e
|
@ -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,
|
.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 = {
|
static const struct kvm_irq_level cortexa_vtimer_irq = {
|
||||||
{ .irq = 27 },
|
{ .irq = 27 },
|
||||||
.level = 1,
|
.level = 1,
|
||||||
|
@ -58,6 +63,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
|
||||||
{
|
{
|
||||||
struct kvm_regs *reset_regs;
|
struct kvm_regs *reset_regs;
|
||||||
const struct kvm_irq_level *cpu_vtimer_irq;
|
const struct kvm_irq_level *cpu_vtimer_irq;
|
||||||
|
const struct kvm_irq_level *cpu_ptimer_irq;
|
||||||
|
|
||||||
switch (vcpu->arch.target) {
|
switch (vcpu->arch.target) {
|
||||||
case KVM_ARM_TARGET_CORTEX_A7:
|
case KVM_ARM_TARGET_CORTEX_A7:
|
||||||
|
@ -65,6 +71,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
|
||||||
reset_regs = &cortexa_regs_reset;
|
reset_regs = &cortexa_regs_reset;
|
||||||
vcpu->arch.midr = read_cpuid_id();
|
vcpu->arch.midr = read_cpuid_id();
|
||||||
cpu_vtimer_irq = &cortexa_vtimer_irq;
|
cpu_vtimer_irq = &cortexa_vtimer_irq;
|
||||||
|
cpu_ptimer_irq = &cortexa_ptimer_irq;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
@ -77,5 +84,5 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
|
||||||
kvm_reset_coprocs(vcpu);
|
kvm_reset_coprocs(vcpu);
|
||||||
|
|
||||||
/* Reset arch_timer context */
|
/* 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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,6 +46,11 @@ static const struct kvm_regs default_regs_reset32 = {
|
||||||
COMPAT_PSR_I_BIT | COMPAT_PSR_F_BIT),
|
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 = {
|
static const struct kvm_irq_level default_vtimer_irq = {
|
||||||
.irq = 27,
|
.irq = 27,
|
||||||
.level = 1,
|
.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)
|
int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
|
||||||
{
|
{
|
||||||
const struct kvm_irq_level *cpu_vtimer_irq;
|
const struct kvm_irq_level *cpu_vtimer_irq;
|
||||||
|
const struct kvm_irq_level *cpu_ptimer_irq;
|
||||||
const struct kvm_regs *cpu_reset;
|
const struct kvm_regs *cpu_reset;
|
||||||
|
|
||||||
switch (vcpu->arch.target) {
|
switch (vcpu->arch.target) {
|
||||||
|
@ -117,6 +123,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
|
||||||
}
|
}
|
||||||
|
|
||||||
cpu_vtimer_irq = &default_vtimer_irq;
|
cpu_vtimer_irq = &default_vtimer_irq;
|
||||||
|
cpu_ptimer_irq = &default_ptimer_irq;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -130,5 +137,5 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
|
||||||
kvm_pmu_vcpu_reset(vcpu);
|
kvm_pmu_vcpu_reset(vcpu);
|
||||||
|
|
||||||
/* Reset timer */
|
/* Reset timer */
|
||||||
return kvm_timer_vcpu_reset(vcpu, cpu_vtimer_irq);
|
return kvm_timer_vcpu_reset(vcpu, cpu_vtimer_irq, cpu_ptimer_irq);
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,7 +58,8 @@ struct arch_timer_cpu {
|
||||||
int kvm_timer_hyp_init(void);
|
int kvm_timer_hyp_init(void);
|
||||||
int kvm_timer_enable(struct kvm_vcpu *vcpu);
|
int kvm_timer_enable(struct kvm_vcpu *vcpu);
|
||||||
int kvm_timer_vcpu_reset(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_vcpu_init(struct kvm_vcpu *vcpu);
|
||||||
void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu);
|
void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu);
|
||||||
void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu);
|
void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu);
|
||||||
|
|
|
@ -327,9 +327,11 @@ void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu)
|
||||||
}
|
}
|
||||||
|
|
||||||
int kvm_timer_vcpu_reset(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 *vtimer = vcpu_vtimer(vcpu);
|
||||||
|
struct arch_timer_context *ptimer = vcpu_ptimer(vcpu);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The vcpu timer irq number cannot be determined in
|
* 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
|
* kvm_vcpu_set_target(). To handle this, we determine
|
||||||
* vcpu timer irq number when the vcpu is reset.
|
* 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
|
* 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.
|
* the ARMv7 architecture.
|
||||||
*/
|
*/
|
||||||
vtimer->cnt_ctl = 0;
|
vtimer->cnt_ctl = 0;
|
||||||
|
ptimer->cnt_ctl = 0;
|
||||||
kvm_timer_update_state(vcpu);
|
kvm_timer_update_state(vcpu);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -376,6 +380,7 @@ void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu)
|
||||||
|
|
||||||
/* Synchronize cntvoff across all vtimers of a VM. */
|
/* Synchronize cntvoff across all vtimers of a VM. */
|
||||||
update_vtimer_cntvoff(vcpu, kvm_phys_timer_read());
|
update_vtimer_cntvoff(vcpu, kvm_phys_timer_read());
|
||||||
|
vcpu_ptimer(vcpu)->cntvoff = 0;
|
||||||
|
|
||||||
INIT_WORK(&timer->expired, kvm_timer_inject_irq_work);
|
INIT_WORK(&timer->expired, kvm_timer_inject_irq_work);
|
||||||
hrtimer_init(&timer->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
|
hrtimer_init(&timer->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
|
||||||
|
|
Loading…
Reference in a new issue