diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2018-03-15 21:45:37 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-03-15 21:45:37 +0100 |
| commit | bb9b4dbe0d6b7eda355cad7c57b36f37fdac6235 (patch) | |
| tree | 1097028058dfc732ab5b1e19b104c559f62cf588 /virt/kvm/arm/hyp/vgic-v3-sr.c | |
| parent | e2c15aff5f353ba80bd3bb49840837f65fa5cc43 (diff) | |
| parent | 27e91ad1e746e341ca2312f29bccb9736be7b476 (diff) | |
| download | linux-bb9b4dbe0d6b7eda355cad7c57b36f37fdac6235.tar.gz | |
Merge tag 'kvm-arm-fixes-for-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
kvm/arm fixes for 4.16, take 2
- Peace of mind locking fix in vgic_mmio_read_pending
- Allow hw-mapped interrupts to be reset when the VM resets
- Fix GICv2 multi-source SGI injection
- Fix MMIO synchronization for GICv2 on v3 emulation
- Remove excess verbosity on the console
Diffstat (limited to 'virt/kvm/arm/hyp/vgic-v3-sr.c')
| -rw-r--r-- | virt/kvm/arm/hyp/vgic-v3-sr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/virt/kvm/arm/hyp/vgic-v3-sr.c b/virt/kvm/arm/hyp/vgic-v3-sr.c index f5c3d6d7019e..b89ce5432214 100644 --- a/virt/kvm/arm/hyp/vgic-v3-sr.c +++ b/virt/kvm/arm/hyp/vgic-v3-sr.c @@ -215,7 +215,8 @@ void __hyp_text __vgic_v3_save_state(struct kvm_vcpu *vcpu) * are now visible to the system register interface. */ if (!cpu_if->vgic_sre) { - dsb(st); + dsb(sy); + isb(); cpu_if->vgic_vmcr = read_gicreg(ICH_VMCR_EL2); } |