diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2018-05-06 00:05:31 +0300 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2018-05-06 00:05:31 +0300 |
| commit | f3351c609bbdcf3c519ff5c5451103aa48a5b804 (patch) | |
| tree | 5ec6d02df85f89340139d37307c321db39fe72bb /virt/kvm/arm/vgic/vgic-mmio.c | |
| parent | 6da6c0db5316275015e8cc2959f12a17584aeb64 (diff) | |
| parent | b220244d41798c6592e7d17843256eb0bae456a0 (diff) | |
| download | linux-f3351c609bbdcf3c519ff5c5451103aa48a5b804.tar.xz | |
Merge tag 'kvmarm-fixes-for-4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
KVM/arm fixes for 4.17, take #2
- Fix proxying of GICv2 CPU interface accesses
- Fix crash when switching to BE
- Track source vcpu git GICv2 SGIs
- Fix an outdated bit of documentation
Diffstat (limited to 'virt/kvm/arm/vgic/vgic-mmio.c')
| -rw-r--r-- | virt/kvm/arm/vgic/vgic-mmio.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/virt/kvm/arm/vgic/vgic-mmio.c b/virt/kvm/arm/vgic/vgic-mmio.c index dbe99d635c80..ff9655cfeb2f 100644 --- a/virt/kvm/arm/vgic/vgic-mmio.c +++ b/virt/kvm/arm/vgic/vgic-mmio.c @@ -289,10 +289,16 @@ static void vgic_mmio_change_active(struct kvm_vcpu *vcpu, struct vgic_irq *irq, irq->vcpu->cpu != -1) /* VCPU thread is running */ cond_resched_lock(&irq->irq_lock); - if (irq->hw) + if (irq->hw) { vgic_hw_irq_change_active(vcpu, irq, active, !requester_vcpu); - else + } else { + u32 model = vcpu->kvm->arch.vgic.vgic_model; + irq->active = active; + if (model == KVM_DEV_TYPE_ARM_VGIC_V2 && + active && vgic_irq_is_sgi(irq->intid)) + irq->active_source = requester_vcpu->vcpu_id; + } if (irq->active) vgic_queue_irq_unlock(vcpu->kvm, irq, flags); |