Commit c7637c04 authored by Andrew Jones's avatar Andrew Jones Committed by Peter Maydell
Browse files

hw/arm/virt: fdt: generate distance-map when needed 



This is based on patch Shannon Zhao originally posted.

Cc: Shannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: default avatarAndrew Jones <drjones@redhat.com>
Reviewed-by: default avatarShannon Zhao <shannon.zhao@linaro.org>
Message-id: 20170529173751.3443-3-drjones@redhat.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 94a66456

hw/arm/virt.c

+21 −0
Original line number Diff line number Diff line
@@ -219,6 +219,27 @@ static void create_fdt(VirtMachineState *vms) 
                                "clk24mhz");

    qemu_fdt_setprop_cell(fdt, "/apb-pclk", "phandle", vms->clock_phandle);



    if (have_numa_distance) {

        int size = nb_numa_nodes * nb_numa_nodes * 3 * sizeof(uint32_t);

        uint32_t *matrix = g_malloc0(size);

        int idx, i, j;



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

            for (j = 0; j < nb_numa_nodes; j++) {

                idx = (i * nb_numa_nodes + j) * 3;

                matrix[idx + 0] = cpu_to_be32(i);

                matrix[idx + 1] = cpu_to_be32(j);

                matrix[idx + 2] = cpu_to_be32(numa_info[i].distance[j]);

            }

        }



        qemu_fdt_add_subnode(fdt, "/distance-map");

        qemu_fdt_setprop_string(fdt, "/distance-map", "compatible",

                                "numa-distance-map-v1");

        qemu_fdt_setprop(fdt, "/distance-map", "distance-matrix",

                         matrix, size);

        g_free(matrix);

    }

}



static void fdt_add_psci_node(const VirtMachineState *vms)