Commit fc7e0765 authored by David Gibson's avatar David Gibson
Browse files

Revert "spapr: populate device tree depending on XIVE_EXPLOIT option" 



This reverts commit b8768042.

I thought this was a harmless preliminary for XIVE enablement patches
we expect later on.  However, due to some subtle interactions between
qemu and SLOF (guest firmware) this breaks some things.  Revert it for
now, we'll work out how to fix it when the rest of the XIVE patches
are ready.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent bf26ae32

hw/ppc/spapr.c

+4 −6
Original line number Diff line number Diff line
@@ -776,11 +776,6 @@ 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");
@@ -804,7 +799,7 @@ int spapr_h_cas_compose_response(sPAPRMachineState *spapr, 


    size -= sizeof(hdr);



    /* Create skeleton */

    /* Create sceleton */

    fdt_skel = g_malloc0(size);

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

    _FDT((fdt_begin_node(fdt_skel, "")));
@@ -1077,6 +1072,9 @@ 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");