diff options
author | Paolo Bonzini | 2019-08-09 16:53:50 +0200 |
---|---|---|
committer | Paolo Bonzini | 2019-08-09 16:53:50 +0200 |
commit | a738b5e75b4c13be3485c82eb62c30047aa9f164 (patch) | |
tree | f47fca53ee79938be283e13cf5d48def68f9dad2 /virt/kvm/arm/vgic/vgic-v2.c | |
parent | Merge tag 'kvmarm-fixes-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
parent | KVM: arm/arm64: vgic: Reevaluate level sensitive interrupts on enable (diff) | |
download | kernel-qcow2-linux-a738b5e75b4c13be3485c82eb62c30047aa9f164.tar.gz kernel-qcow2-linux-a738b5e75b4c13be3485c82eb62c30047aa9f164.tar.xz kernel-qcow2-linux-a738b5e75b4c13be3485c82eb62c30047aa9f164.zip |
Merge tag 'kvmarm-fixes-for-5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm fixes for 5.3, take #2
- Fix our system register reset so that we stop writing
non-sensical values to them, and track which registers
get reset instead.
- Sync VMCR back from the GIC on WFI so that KVM has an
exact vue of PMR.
- Reevaluate state of HW-mapped, level triggered interrupts
on enable.
Diffstat (limited to 'virt/kvm/arm/vgic/vgic-v2.c')
-rw-r--r-- | virt/kvm/arm/vgic/vgic-v2.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/virt/kvm/arm/vgic/vgic-v2.c b/virt/kvm/arm/vgic/vgic-v2.c index 6dd5ad706c92..96aab77d0471 100644 --- a/virt/kvm/arm/vgic/vgic-v2.c +++ b/virt/kvm/arm/vgic/vgic-v2.c @@ -484,10 +484,17 @@ void vgic_v2_load(struct kvm_vcpu *vcpu) kvm_vgic_global_state.vctrl_base + GICH_APR); } -void vgic_v2_put(struct kvm_vcpu *vcpu) +void vgic_v2_vmcr_sync(struct kvm_vcpu *vcpu) { struct vgic_v2_cpu_if *cpu_if = &vcpu->arch.vgic_cpu.vgic_v2; cpu_if->vgic_vmcr = readl_relaxed(kvm_vgic_global_state.vctrl_base + GICH_VMCR); +} + +void vgic_v2_put(struct kvm_vcpu *vcpu) +{ + struct vgic_v2_cpu_if *cpu_if = &vcpu->arch.vgic_cpu.vgic_v2; + + vgic_v2_vmcr_sync(vcpu); cpu_if->vgic_apr = readl_relaxed(kvm_vgic_global_state.vctrl_base + GICH_APR); } |