Commit bd204e63 authored by Christoffer Dall's avatar Christoffer Dall Committed by Peter Maydell
Browse files

target-arm: Add the GICv2m to the virt board 



Add a GICv2m device to the virt board to enable MSIs on the generic PCI
host controller.  We allocate 64 SPIs in the IRQ space for now (this can
be increased/decreased later) and map the GICv2m right after the GIC in
the memory map.

Reviewed-by: default avatarEric Auger <eric.auger@linaro.org>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Message-id: 1432897270-7780-5-git-send-email-christoffer.dall@linaro.org
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent dfd90a87

hw/arm/virt.c

+39 −1
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ typedef struct VirtBoardInfo { 
    int fdt_size;

    uint32_t clock_phandle;

    uint32_t gic_phandle;

    uint32_t v2m_phandle;

} VirtBoardInfo;



typedef struct {
@@ -109,6 +110,7 @@ static const MemMapEntry a15memmap[] = { 
    /* GIC distributor and CPU interfaces sit inside the CPU peripheral space */

    [VIRT_GIC_DIST] =   { 0x08000000, 0x00010000 },

    [VIRT_GIC_CPU] =    { 0x08010000, 0x00010000 },

    [VIRT_GIC_V2M] =    { 0x08020000, 0x00001000 },

    [VIRT_UART] =       { 0x09000000, 0x00001000 },

    [VIRT_RTC] =        { 0x09010000, 0x00001000 },

    [VIRT_FW_CFG] =     { 0x09020000, 0x0000000a },
@@ -125,6 +127,7 @@ static const int a15irqmap[] = { 
    [VIRT_RTC] = 2,

    [VIRT_PCIE] = 3, /* ... to 6 */

    [VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */

    [VIRT_GIC_V2M] = 48, /* ...to 48 + NUM_GICV2M_SPIS - 1 */

};



static VirtBoardInfo machines[] = {
@@ -300,9 +303,21 @@ static void fdt_add_cpu_nodes(const VirtBoardInfo *vbi) 
    }

}



static void fdt_add_gic_node(VirtBoardInfo *vbi)

static void fdt_add_v2m_gic_node(VirtBoardInfo *vbi)

{

    vbi->v2m_phandle = qemu_fdt_alloc_phandle(vbi->fdt);

    qemu_fdt_add_subnode(vbi->fdt, "/intc/v2m");

    qemu_fdt_setprop_string(vbi->fdt, "/intc/v2m", "compatible",

                            "arm,gic-v2m-frame");

    qemu_fdt_setprop(vbi->fdt, "/intc/v2m", "msi-controller", NULL, 0);

    qemu_fdt_setprop_sized_cells(vbi->fdt, "/intc/v2m", "reg",

                                 2, vbi->memmap[VIRT_GIC_V2M].base,

                                 2, vbi->memmap[VIRT_GIC_V2M].size);

    qemu_fdt_setprop_cell(vbi->fdt, "/intc/v2m", "phandle", vbi->v2m_phandle);

}



static void fdt_add_gic_node(VirtBoardInfo *vbi)

{

    vbi->gic_phandle = qemu_fdt_alloc_phandle(vbi->fdt);

    qemu_fdt_setprop_cell(vbi->fdt, "/", "interrupt-parent", vbi->gic_phandle);
@@ -323,6 +338,25 @@ static void fdt_add_gic_node(VirtBoardInfo *vbi) 
    qemu_fdt_setprop_cell(vbi->fdt, "/intc", "phandle", vbi->gic_phandle);

}



static void create_v2m(VirtBoardInfo *vbi, qemu_irq *pic)

{

    int i;

    int irq = vbi->irqmap[VIRT_GIC_V2M];

    DeviceState *dev;



    dev = qdev_create(NULL, "arm-gicv2m");

    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, vbi->memmap[VIRT_GIC_V2M].base);

    qdev_prop_set_uint32(dev, "base-spi", irq);

    qdev_prop_set_uint32(dev, "num-spi", NUM_GICV2M_SPIS);

    qdev_init_nofail(dev);



    for (i = 0; i < NUM_GICV2M_SPIS; i++) {

        sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, pic[irq + i]);

    }



    fdt_add_v2m_gic_node(vbi);

}



static void create_gic(VirtBoardInfo *vbi, qemu_irq *pic)

{

    /* We create a standalone GIC v2 */
@@ -373,6 +407,8 @@ static void create_gic(VirtBoardInfo *vbi, qemu_irq *pic) 
    }



    fdt_add_gic_node(vbi);



    create_v2m(vbi, pic);

}



static void create_uart(const VirtBoardInfo *vbi, qemu_irq *pic)
@@ -676,6 +712,8 @@ static void create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic) 
    qemu_fdt_setprop_cells(vbi->fdt, nodename, "bus-range", 0,

                           nr_pcie_buses - 1);



    qemu_fdt_setprop_cells(vbi->fdt, nodename, "msi-parent", vbi->v2m_phandle);



    qemu_fdt_setprop_sized_cells(vbi->fdt, nodename, "reg",

                                 2, base_ecam, 2, size_ecam);

    qemu_fdt_setprop_sized_cells(vbi->fdt, nodename, "ranges",

include/hw/arm/virt.h

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


#include "qemu-common.h"



#define NUM_GICV2M_SPIS       64

#define NUM_VIRTIO_TRANSPORTS 32



#define ARCH_TIMER_VIRT_IRQ   11
@@ -53,6 +54,7 @@ enum { 
    VIRT_PCIE_MMIO,

    VIRT_PCIE_PIO,

    VIRT_PCIE_ECAM,

    VIRT_GIC_V2M,

};



typedef struct MemMapEntry {