[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/17] spapr: populate device tree depending on XIVE_
From: |
David Gibson |
Subject: |
[Qemu-devel] [PULL 17/17] spapr: populate device tree depending on XIVE_EXPLOIT option |
Date: |
Tue, 11 Jul 2017 14:39:17 +1000 |
From: Cédric Le Goater <address@hidden>
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: Cédric Le Goater <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index ff78a22..f4e011c 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -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");
--
2.9.4
- [Qemu-devel] [PULL 01/17] spapr: make spapr_populate_hotplug_cpu_dt() static, (continued)
- [Qemu-devel] [PULL 01/17] spapr: make spapr_populate_hotplug_cpu_dt() static, David Gibson, 2017/07/11
- [Qemu-devel] [PULL 07/17] spapr: Uniform DRC reset paths, David Gibson, 2017/07/11
- [Qemu-devel] [PULL 11/17] target/ppc: Refactor tcg radix mmu code, David Gibson, 2017/07/11
- [Qemu-devel] [PULL 03/17] spapr: fix bogus function name in comment, David Gibson, 2017/07/11
- [Qemu-devel] [PULL 12/17] target/ppc: Add debug function for radix mmu translation, David Gibson, 2017/07/11
- [Qemu-devel] [PULL 10/17] spapr: Use unplug_request for PCI hot unplug, David Gibson, 2017/07/11
- [Qemu-devel] [PULL 09/17] spapr: Remove unnecessary differences between hotplug and coldplug paths, David Gibson, 2017/07/11
- [Qemu-devel] [PULL 17/17] spapr: populate device tree depending on XIVE_EXPLOIT option,
David Gibson <=
- [Qemu-devel] [PULL 16/17] spapr: introduce the XIVE_EXPLOIT option in CAS, David Gibson, 2017/07/11
- [Qemu-devel] [PULL 14/17] spapr: Only report host/guest IOMMU page size mismatches on KVM, David Gibson, 2017/07/11
- [Qemu-devel] [PULL 13/17] spapr: fix memory hotplug error path, David Gibson, 2017/07/11
- [Qemu-devel] [PULL 15/17] ppc/kvm: have the "family" CPU alias to point to TYPE_HOST_POWERPC_CPU, David Gibson, 2017/07/11
- [Qemu-devel] [PULL 04/17] spapr: fix migration to pseries machine < 2.8, David Gibson, 2017/07/11
- [Qemu-devel] [PULL 05/17] target-ppc: SPR_BOOKE_ESR not set on FP exceptions, David Gibson, 2017/07/11
- [Qemu-devel] [PULL 02/17] spapr: refresh "platform-specific" hcalls comment, David Gibson, 2017/07/11
- [Qemu-devel] [PULL 08/17] spapr: Add DRC release method, David Gibson, 2017/07/11
- [Qemu-devel] [PULL 06/17] spapr: Leave DR-indicator management to the guest, David Gibson, 2017/07/11
- Re: [Qemu-devel] [PULL 00/17] ppc-for-2.10 queue 20170711, Peter Maydell, 2017/07/11