[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/8] hw/intc: arm_gic_kvm.c restore config first
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 6/8] hw/intc: arm_gic_kvm.c restore config first |
Date: |
Wed, 1 Apr 2015 18:08:16 +0100 |
From: Alex Bennée <address@hidden>
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 <address@hidden>
Acked-by: Christoffer Dall <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/intc/arm_gic_kvm.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c
index 0d20750..e1952ad 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 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);
--
1.9.1
- [Qemu-devel] [PULL 0/8] target-arm queue, Peter Maydell, 2015/04/01
- [Qemu-devel] [PULL 2/8] hw/arm/vexpress: Fix memory leak reported by Coverity, Peter Maydell, 2015/04/01
- [Qemu-devel] [PULL 8/8] target-arm: kvm64 fix save/restore of SPSR regs, Peter Maydell, 2015/04/01
- [Qemu-devel] [PULL 6/8] hw/intc: arm_gic_kvm.c restore config first,
Peter Maydell <=
- [Qemu-devel] [PULL 7/8] target-arm: kvm64 sync FP register state, Peter Maydell, 2015/04/01
- [Qemu-devel] [PULL 4/8] target-arm: Store SPSR_EL1 state in banked_spsr[1] (SPSR_svc), Peter Maydell, 2015/04/01
- [Qemu-devel] [PULL 3/8] hw/arm/virt: Fix memory leak reported by Coverity, Peter Maydell, 2015/04/01
- [Qemu-devel] [PULL 5/8] target-arm: kvm: save/restore mp state, Peter Maydell, 2015/04/01
- [Qemu-devel] [PULL 1/8] hw/arm/highbank: Fix resource leak and wrong image loading, Peter Maydell, 2015/04/01
- Re: [Qemu-devel] [PULL 0/8] target-arm queue, Peter Maydell, 2015/04/01