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

target-arm: Extend the gic node properties 



In preparation for adding the GICv2m which requires address specifiers
and is a subnode of the gic, we extend the gic DT definition to specify
the #address-cells and #size-cells properties and add an empty ranges
property properties of the DT node, since this is required to add the
v2m node as a child of the gic node.

Note that we must also expand the irq-map to reference the gic with the
right address-cells as a consequence of this change.

Reviewed-by: default avatarEric Auger <eric.auger@linaro.org>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Message-id: 1432897270-7780-4-git-send-email-christoffer.dall@linaro.org
Suggested-by: default avatarShanker Donthineni <shankerd@codeaurora.org>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 770c58f8

hw/arm/virt.c

+7 −4
Original line number Diff line number Diff line
@@ -317,6 +317,9 @@ static void fdt_add_gic_node(VirtBoardInfo *vbi) 
                                     2, vbi->memmap[VIRT_GIC_DIST].size,

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

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

    qemu_fdt_setprop_cell(vbi->fdt, "/intc", "#address-cells", 0x2);

    qemu_fdt_setprop_cell(vbi->fdt, "/intc", "#size-cells", 0x2);

    qemu_fdt_setprop(vbi->fdt, "/intc", "ranges", NULL, 0);

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

}
@@ -585,7 +588,7 @@ static void create_pcie_irq_map(const VirtBoardInfo *vbi, uint32_t gic_phandle, 
                                int first_irq, const char *nodename)

{

    int devfn, pin;

    uint32_t full_irq_map[4 * 4 * 8] = { 0 };

    uint32_t full_irq_map[4 * 4 * 10] = { 0 };

    uint32_t *irq_map = full_irq_map;



    for (devfn = 0; devfn <= 0x18; devfn += 0x8) {
@@ -598,13 +601,13 @@ static void create_pcie_irq_map(const VirtBoardInfo *vbi, uint32_t gic_phandle, 
            uint32_t map[] = {

                devfn << 8, 0, 0,                           /* devfn */

                pin + 1,                                    /* PCI pin */

                gic_phandle, irq_type, irq_nr, irq_level }; /* GIC irq */

                gic_phandle, 0, 0, irq_type, irq_nr, irq_level }; /* GIC irq */



            /* Convert map to big endian */

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

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

                irq_map[i] = cpu_to_be32(map[i]);

            }

            irq_map += 8;

            irq_map += 10;

        }

    }