Merge tag 'kvmarm-fixes-5.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

bonzini · bonzini · commit ed343aa85718 · 2022-02-11T12:10:57.000-05:00
KVM/arm64 fixes for 5.17, take #3 - Fix pending state read of a HW interrupt
diff --git a/arch/arm64/kvm/vgic/vgic-mmio.c b/arch/arm64/kvm/vgic/vgic-mmio.c
@@ -248,6 +248,8 @@ unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu,
 						    IRQCHIP_STATE_PENDING,
 						    &val);
 			WARN_RATELIMIT(err, "IRQ %d", irq->host_irq);
+		} else if (vgic_irq_is_mapped_level(irq)) {
+			val = vgic_get_phys_line_level(irq);
 		} else {
 			val = irq_is_pending(irq);
 		}

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,8 @@ unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu,`
`248`	`248`	`IRQCHIP_STATE_PENDING,`
`249`	`249`	`&val);`
`250`	`250`	`WARN_RATELIMIT(err, "IRQ %d", irq->host_irq);`
	`251`	`+ } else if (vgic_irq_is_mapped_level(irq)) {`
	`252`	`+ val = vgic_get_phys_line_level(irq);`
`251`	`253`	`} else {`
`252`	`254`	`val = irq_is_pending(irq);`
`253`	`255`	`}`