[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/6] arm_gic_kvm.c: restore config before pending IR
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH 2/6] arm_gic_kvm.c: restore config before pending IRQs |
Date: |
Wed, 25 Feb 2015 16:02:34 +0000 |
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>
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.0
- [Qemu-devel] [PATCH 0/6] QEMU ARM64 Migration Fixes, Alex Bennée, 2015/02/25
- [Qemu-devel] [PATCH 3/6] hw/char/pl011: don't keep setting the IRQ if nothing changed, Alex Bennée, 2015/02/25
- [Qemu-devel] [PATCH 2/6] arm_gic_kvm.c: restore config before pending IRQs,
Alex Bennée <=
- [Qemu-devel] [PATCH 1/6] target-arm: kvm: save/restore mp state, Alex Bennée, 2015/02/25
- [Qemu-devel] [PATCH 4/6] target-arm/kvm64.c: sync FP register state, Alex Bennée, 2015/02/25
- [Qemu-devel] [PATCH 5/6] target-arm/kvm64: fix save/restore of SPSR regs, Alex Bennée, 2015/02/25
- [Qemu-devel] [PATCH 5/6] target-arm/kvm64: fix save/restore of SPSR registers, Alex Bennée, 2015/02/25
- [Qemu-devel] [PATCH 6/6] target-arm/cpu.h: document why env->spsr exists, Alex Bennée, 2015/02/25