Commit b8768042 authored by Cédric Le Goater's avatar Cédric Le Goater Committed by David Gibson
Browse files

spapr: populate device tree depending on XIVE_EXPLOIT option 



When XIVE is supported, the device tree should be populated
accordingly and the XIVE memory regions mapped to activate MMIOs.

Depending on the design we choose, we could also allocate different
ICS and ICP objects, or switch between objects. This needs to be
discussed.

Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent f2b14e3a

hw/ppc/spapr.c

+6 −4
Original line number Diff line number Diff line
@@ -778,6 +778,11 @@ static int spapr_dt_cas_updates(sPAPRMachineState *spapr, void *fdt, 
        }

    }



    /* /interrupt controller */

    if (!spapr_ovec_test(ov5_updates, OV5_XIVE_EXPLOIT)) {

        spapr_dt_xics(xics_max_server_number(), fdt, PHANDLE_XICP);

    }



    offset = fdt_path_offset(fdt, "/chosen");

    if (offset < 0) {

        offset = fdt_add_subnode(fdt, 0, "chosen");
@@ -801,7 +806,7 @@ int spapr_h_cas_compose_response(sPAPRMachineState *spapr, 


    size -= sizeof(hdr);



    /* Create sceleton */

    /* Create skeleton */

    fdt_skel = g_malloc0(size);

    _FDT((fdt_create(fdt_skel, size)));

    _FDT((fdt_begin_node(fdt_skel, "")));
@@ -1069,9 +1074,6 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, 
    _FDT(fdt_setprop_cell(fdt, 0, "#address-cells", 2));

    _FDT(fdt_setprop_cell(fdt, 0, "#size-cells", 2));



    /* /interrupt controller */

    spapr_dt_xics(xics_max_server_number(), fdt, PHANDLE_XICP);



    ret = spapr_populate_memory(spapr, fdt);

    if (ret < 0) {

        error_report("couldn't setup memory nodes in fdt");