openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This reverts commit b87680427e.

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: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2017-07-28 13:38:50 +10:00
parent bf26ae32a9
commit fc7e0765fc
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/ppc/spapr.c
View File

@ -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"); offset = fdt_path_offset(fdt, "/chosen");
if (offset < 0) { if (offset < 0) {
offset = fdt_add_subnode(fdt, 0, "chosen"); offset = fdt_add_subnode(fdt, 0, "chosen");
@ -804,7 +799,7 @@ int spapr_h_cas_compose_response(sPAPRMachineState *spapr,
size -= sizeof(hdr); size -= sizeof(hdr);
/* Create skeleton */ /* Create sceleton */
fdt_skel = g_malloc0(size); fdt_skel = g_malloc0(size);
_FDT((fdt_create(fdt_skel, size))); _FDT((fdt_create(fdt_skel, size)));
_FDT((fdt_begin_node(fdt_skel, ""))); _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, "#address-cells", 2));
_FDT(fdt_setprop_cell(fdt, 0, "#size-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); ret = spapr_populate_memory(spapr, fdt);
if (ret < 0) { if (ret < 0) {
error_report("couldn't setup memory nodes in fdt"); error_report("couldn't setup memory nodes in fdt");