Message ID | 1407947471-26981-1-git-send-email-serge.fdrv@gmail.com |
---|---|
State | New |
Headers | show |
On Wed, Aug 13, 2014 at 08:31:11PM +0400, Sergey Fedorov wrote: > Take IRQ target mask into account when determining the highest priority > pending interrupt. > > Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com> > --- > hw/intc/arm_gic.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c > index 1532ef9..a5ad7b9 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; > -- > 1.9.1 > Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Ping. On 13.08.2014 20:31, Sergey Fedorov wrote: > Take IRQ target mask into account when determining the highest priority > pending interrupt. > > Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com> > --- > hw/intc/arm_gic.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c > index 1532ef9..a5ad7b9 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;
On 13 August 2014 17:31, Sergey Fedorov <serge.fdrv@gmail.com> wrote: > Take IRQ target mask into account when determining the highest priority > pending interrupt. > > Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com> Thanks, applied to target-arm.next. -- PMM
diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index 1532ef9..a5ad7b9 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;
Take IRQ target mask into account when determining the highest priority pending interrupt. Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com> --- hw/intc/arm_gic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)