commit e4f04b1997082a93d8c7d58fe6666168c58b692c
author Marc Zyngier <marc.zyngier@arm.com> Mon Jun 13 14:09:45 2016
committer Will Deacon <will.deacon@arm.com> Tue Jun 14 09:26:34 2016
tree b3bdff29924d8015fb9a123e550514bb6d08b04a
parent 289c5e5a98d93be55d2e23d9e745a925ac2630cb

kvmtool/arm: Fix timer trigger

KVM exposes a level triggered timer to the guest, and yet kvmtool
presents it as being edge-triggered in the DT. Let's fix it and
match what the kernel exposes.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

arm/timer.c

diff --git a/arm/timer.c b/arm/timer.c
index 29991da..71bfe8d 100644
--- a/arm/timer.c
+++ b/arm/timer.c
@@ -15,19 +15,19 @@
 	u32 irq_prop[] = {
 		cpu_to_fdt32(GIC_FDT_IRQ_TYPE_PPI),
 		cpu_to_fdt32(irqs[0]),
-		cpu_to_fdt32(cpu_mask | IRQ_TYPE_EDGE_RISING),
+		cpu_to_fdt32(cpu_mask | IRQ_TYPE_LEVEL_LOW),
 
 		cpu_to_fdt32(GIC_FDT_IRQ_TYPE_PPI),
 		cpu_to_fdt32(irqs[1]),
-		cpu_to_fdt32(cpu_mask | IRQ_TYPE_EDGE_RISING),
+		cpu_to_fdt32(cpu_mask | IRQ_TYPE_LEVEL_LOW),
 
 		cpu_to_fdt32(GIC_FDT_IRQ_TYPE_PPI),
 		cpu_to_fdt32(irqs[2]),
-		cpu_to_fdt32(cpu_mask | IRQ_TYPE_EDGE_RISING),
+		cpu_to_fdt32(cpu_mask | IRQ_TYPE_LEVEL_LOW),
 
 		cpu_to_fdt32(GIC_FDT_IRQ_TYPE_PPI),
 		cpu_to_fdt32(irqs[3]),
-		cpu_to_fdt32(cpu_mask | IRQ_TYPE_EDGE_RISING),
+		cpu_to_fdt32(cpu_mask | IRQ_TYPE_LEVEL_LOW),
 	};
 
 	_FDT(fdt_begin_node(fdt, "timer"));