Commit 74fdb781 authored by Alex Bennée's avatar Alex Bennée Committed by Peter Maydell
Browse files

hw/intc: arm_gic_kvm.c restore config first 



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: default avatarAlex Bennée <alex.bennee@linaro.org>
Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 1a1753f7

hw/intc/arm_gic_kvm.c

+5 −2
Original line number Diff line number Diff line
@@ -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 configuration registers 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);