Commit 0be969a2 authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/arm/virt: fix pl011 and pl031 irq flags 



The pl011 and pl031 devices both use level triggered interrupts,
but the device tree we construct was incorrectly telling the
kernel to configure the GIC to treat them as edge triggered.
This meant that output from the pl011 would hang after a while.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-id: 1410274423-9461-1-git-send-email-peter.maydell@linaro.org
Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Cc: qemu-stable@nongnu.org
parent fa439fc5

hw/arm/virt.c

+2 −2
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ static void create_uart(const VirtBoardInfo *vbi, qemu_irq *pic) 
                                     2, base, 2, size);

    qemu_fdt_setprop_cells(vbi->fdt, nodename, "interrupts",

                               GIC_FDT_IRQ_TYPE_SPI, irq,

                               GIC_FDT_IRQ_FLAGS_EDGE_LO_HI);

                               GIC_FDT_IRQ_FLAGS_LEVEL_HI);

    qemu_fdt_setprop_cells(vbi->fdt, nodename, "clocks",

                               vbi->clock_phandle, vbi->clock_phandle);

    qemu_fdt_setprop(vbi->fdt, nodename, "clock-names",
@@ -399,7 +399,7 @@ static void create_rtc(const VirtBoardInfo *vbi, qemu_irq *pic) 
                                 2, base, 2, size);

    qemu_fdt_setprop_cells(vbi->fdt, nodename, "interrupts",

                           GIC_FDT_IRQ_TYPE_SPI, irq,

                           GIC_FDT_IRQ_FLAGS_EDGE_LO_HI);

                           GIC_FDT_IRQ_FLAGS_LEVEL_HI);

    qemu_fdt_setprop_cell(vbi->fdt, nodename, "clocks", vbi->clock_phandle);

    qemu_fdt_setprop_string(vbi->fdt, nodename, "clock-names", "apb_pclk");

    g_free(nodename);