On Wed, Mar 4, 2015 at 8:35 AM, Alex Bennée <alex.bennee@xxxxxxxxxx> wrote: > As there is logic to deal with the difference between edge and level > triggered interrupts in the kernel we must ensure it knows the > configuration of the IRQs before we restore the pending state. > > Signed-off-by: Alex Bennée <alex.bennee@xxxxxxxxxx> > Acked-by: Christoffer Dall <christoffer.dall@xxxxxxxxxx> > > diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c > index 1ad3eb0..2f21ae7 100644 > --- a/hw/intc/arm_gic_kvm.c > +++ b/hw/intc/arm_gic_kvm.c > @@ -370,6 +370,11 @@ static void kvm_arm_gic_put(GICState *s) > * the appropriate CPU interfaces in the kernel) */ > kvm_dist_put(s, 0x800, 8, s->num_irq, translate_targets); > > + /* irq_state[n].trigger -> GICD_ICFGRn > + * (restore targets before pending IRQs so we treat level/edge > + * correctly */ > + kvm_dist_put(s, 0xc00, 2, s->num_irq, translate_trigger); > + > /* irq_state[n].pending + irq_state[n].level -> GICD_ISPENDRn */ > kvm_dist_put(s, 0x280, 1, s->num_irq, translate_clear); > kvm_dist_put(s, 0x200, 1, s->num_irq, translate_pending); > @@ -378,8 +383,6 @@ static void kvm_arm_gic_put(GICState *s) > kvm_dist_put(s, 0x380, 1, s->num_irq, translate_clear); > kvm_dist_put(s, 0x300, 1, s->num_irq, translate_active); > > - /* irq_state[n].trigger -> GICD_ICFRn */ > - kvm_dist_put(s, 0xc00, 2, s->num_irq, translate_trigger); > > /* s->priorityX[irq] -> ICD_IPRIORITYRn */ > kvm_dist_put(s, 0x400, 8, s->num_irq, translate_priority); > -- > 2.3.1 > > Reviewed-by: Greg Bellows <greg.bellows@xxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
