Commit 02f98731 authored by Pavel Fedin's avatar Pavel Fedin Committed by Peter Maydell
Browse files

arm/virt: Add ITS to the virt board 



If supported by the configuration, ITS will be added automatically.

This patch also renames v2m_phandle to msi_phandle because it's now used
by both MSI implementations.

Signed-off-by: default avatarPavel Fedin <p.fedin@samsung.com>
Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-id: 1474616617-366-7-git-send-email-eric.auger@redhat.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 0c9f302e

hw/arm/virt.c

+41 −6
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ typedef struct VirtBoardInfo { 
    int fdt_size;

    uint32_t clock_phandle;

    uint32_t gic_phandle;

    uint32_t v2m_phandle;

    uint32_t msi_phandle;

    bool using_psci;

} VirtBoardInfo;
@@ -423,9 +423,22 @@ static void fdt_add_cpu_nodes(const VirtBoardInfo *vbi) 
    }

}



static void fdt_add_its_gic_node(VirtBoardInfo *vbi)

{

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

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

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

                            "arm,gic-v3-its");

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

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

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

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

    qemu_fdt_setprop_cell(vbi->fdt, "/intc/its", "phandle", vbi->msi_phandle);

}



static void fdt_add_v2m_gic_node(VirtBoardInfo *vbi)

{

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

    vbi->msi_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");
@@ -433,7 +446,7 @@ static void fdt_add_v2m_gic_node(VirtBoardInfo *vbi) 
    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);

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

}



static void fdt_add_gic_node(VirtBoardInfo *vbi, int type)
@@ -500,6 +513,26 @@ static void fdt_add_pmu_nodes(const VirtBoardInfo *vbi, int gictype) 
    }

}



static void create_its(VirtBoardInfo *vbi, DeviceState *gicdev)

{

    const char *itsclass = its_class_name();

    DeviceState *dev;



    if (!itsclass) {

        /* Do nothing if not supported */

        return;

    }



    dev = qdev_create(NULL, itsclass);



    object_property_set_link(OBJECT(dev), OBJECT(gicdev), "parent-gicv3",

                             &error_abort);

    qdev_init_nofail(dev);

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



    fdt_add_its_gic_node(vbi);

}



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

{

    int i;
@@ -583,7 +616,9 @@ static void create_gic(VirtBoardInfo *vbi, qemu_irq *pic, int type, bool secure) 


    fdt_add_gic_node(vbi, type);



    if (type == 2) {

    if (type == 3) {

        create_its(vbi, gicdev);

    } else {

        create_v2m(vbi, pic);

    }

}
@@ -1025,9 +1060,9 @@ static void create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic, 
                           nr_pcie_buses - 1);

    qemu_fdt_setprop(vbi->fdt, nodename, "dma-coherent", NULL, 0);



    if (vbi->v2m_phandle) {

    if (vbi->msi_phandle) {

        qemu_fdt_setprop_cells(vbi->fdt, nodename, "msi-parent",

                               vbi->v2m_phandle);

                               vbi->msi_phandle);

    }



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