diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-03-24 15:45:27 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-03-24 15:45:27 +0300 |
| commit | cc98702c1775a9ff3d943674c97d9561cf605fcd (patch) | |
| tree | fbc3f129b173e6f31343cb73a9fb4d79754f0d4c /virt/kvm/arm/vgic/vgic-debug.c | |
| parent | 76a5db107273b1ad01471e48c49635e2b944a7f4 (diff) | |
| parent | dab4fe3bf6dd87a7d6dbab2c929afd1ef62a120b (diff) | |
| download | linux-cc98702c1775a9ff3d943674c97d9561cf605fcd.tar.xz | |
Merge branch 'kvm-arm64/gic-v4.1' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'virt/kvm/arm/vgic/vgic-debug.c')
| -rw-r--r-- | virt/kvm/arm/vgic/vgic-debug.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/virt/kvm/arm/vgic/vgic-debug.c b/virt/kvm/arm/vgic/vgic-debug.c index cc12fe9b2df3..b13a9e3f99dd 100644 --- a/virt/kvm/arm/vgic/vgic-debug.c +++ b/virt/kvm/arm/vgic/vgic-debug.c @@ -178,6 +178,8 @@ static void print_irq_state(struct seq_file *s, struct vgic_irq *irq, struct kvm_vcpu *vcpu) { char *type; + bool pending; + if (irq->intid < VGIC_NR_SGIS) type = "SGI"; else if (irq->intid < VGIC_NR_PRIVATE_IRQS) @@ -190,6 +192,16 @@ static void print_irq_state(struct seq_file *s, struct vgic_irq *irq, if (irq->intid ==0 || irq->intid == VGIC_NR_PRIVATE_IRQS) print_header(s, irq, vcpu); + pending = irq->pending_latch; + if (irq->hw && vgic_irq_is_sgi(irq->intid)) { + int err; + + err = irq_get_irqchip_state(irq->host_irq, + IRQCHIP_STATE_PENDING, + &pending); + WARN_ON_ONCE(err); + } + seq_printf(s, " %s %4d " " %2d " "%d%d%d%d%d%d%d " @@ -201,7 +213,7 @@ static void print_irq_state(struct seq_file *s, struct vgic_irq *irq, "\n", type, irq->intid, (irq->target_vcpu) ? irq->target_vcpu->vcpu_id : -1, - irq->pending_latch, + pending, irq->line_level, irq->active, irq->enabled, |