From b52b81e44f7d087a7b06217eb83cd79f8bf2fb05 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Fri, 29 Aug 2014 15:00:29 +0100 Subject: hw/intc/arm_gic: honor target mask in gic_update() Take IRQ target mask into account when determining the highest priority pending interrupt. Signed-off-by: Sergey Fedorov Acked-by: Christoffer Dall Message-id: 1407947471-26981-1-git-send-email-serge.fdrv@gmail.com Signed-off-by: Peter Maydell --- hw/intc/arm_gic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/intc') diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index 55019c9..db9110c 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -66,7 +66,8 @@ void gic_update(GICState *s) best_prio = 0x100; best_irq = 1023; for (irq = 0; irq < s->num_irq; irq++) { - if (GIC_TEST_ENABLED(irq, cm) && gic_test_pending(s, irq, cm)) { + if (GIC_TEST_ENABLED(irq, cm) && gic_test_pending(s, irq, cm) && + (irq < GIC_INTERNAL || GIC_TARGET(irq) & cm)) { if (GIC_GET_PRIORITY(irq, cpu) < best_prio) { best_prio = GIC_GET_PRIORITY(irq, cpu); best_irq = irq; -- cgit v1.1