aboutsummaryrefslogtreecommitdiff
path: root/hw/ppc
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2016-10-20 15:56:48 +1100
committerDavid Gibson <david@gibson.dropbear.id.au>2016-10-28 09:38:26 +1100
commitffb1e275a67cfeb957d0d0df2ec1f0999e321f69 (patch)
tree2a2e147400798681a204cab9a0297c11a69b193e /hw/ppc
parent3f5dabceba246e502555a9046b98174d7548e696 (diff)
pseries: Move /event-sources construction to spapr_build_fdt()
The /event-sources device tree node is built from spapr_create_fdt_skel(). As part of consolidating device tree construction to reset time, this moves it to spapr_build_fdt(). Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'hw/ppc')
-rw-r--r--hw/ppc/spapr.c6
-rw-r--r--hw/ppc/spapr_events.c21
2 files changed, 13 insertions, 14 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 1b61de250d..048fb3d7cb 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -328,9 +328,6 @@ static void *spapr_create_fdt_skel(sPAPRMachineState *spapr)
_FDT((fdt_end_node(fdt)));
- /* event-sources */
- spapr_events_fdt_skel(fdt, spapr->check_exception_irq);
-
/* /hypervisor node */
if (kvm_enabled()) {
uint8_t hypercall[16];
@@ -983,6 +980,9 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr,
}
}
+ /* /event-sources */
+ spapr_dt_events(fdt, spapr->check_exception_irq);
+
/* /rtas */
spapr_dt_rtas(spapr, fdt);
diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c
index 6d3534541c..89aa5a7926 100644
--- a/hw/ppc/spapr_events.c
+++ b/hw/ppc/spapr_events.c
@@ -211,23 +211,22 @@ struct hp_log_full {
#define EVENT_MASK_HOTPLUG 0x10000000
#define EVENT_MASK_IO 0x08000000
-void spapr_events_fdt_skel(void *fdt, uint32_t check_exception_irq)
+void spapr_dt_events(void *fdt, uint32_t check_exception_irq)
{
+ int event_sources, epow_events;
uint32_t irq_ranges[] = {cpu_to_be32(check_exception_irq), cpu_to_be32(1)};
uint32_t interrupts[] = {cpu_to_be32(check_exception_irq), 0};
- _FDT((fdt_begin_node(fdt, "event-sources")));
+ _FDT(event_sources = fdt_add_subnode(fdt, 0, "event-sources"));
- _FDT((fdt_property(fdt, "interrupt-controller", NULL, 0)));
- _FDT((fdt_property_cell(fdt, "#interrupt-cells", 2)));
- _FDT((fdt_property(fdt, "interrupt-ranges",
- irq_ranges, sizeof(irq_ranges))));
+ _FDT(fdt_setprop(fdt, event_sources, "interrupt-controller", NULL, 0));
+ _FDT(fdt_setprop_cell(fdt, event_sources, "#interrupt-cells", 2));
+ _FDT(fdt_setprop(fdt, event_sources, "interrupt-ranges",
+ irq_ranges, sizeof(irq_ranges)));
- _FDT((fdt_begin_node(fdt, "epow-events")));
- _FDT((fdt_property(fdt, "interrupts", interrupts, sizeof(interrupts))));
- _FDT((fdt_end_node(fdt)));
-
- _FDT((fdt_end_node(fdt)));
+ _FDT(epow_events = fdt_add_subnode(fdt, event_sources, "epow-events"));
+ _FDT(fdt_setprop(fdt, epow_events, "interrupts",
+ interrupts, sizeof(interrupts)));
}
static void rtas_event_log_queue(int log_type, void *data, bool exception)