diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2019-09-30 12:35:06 +1000 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2019-10-24 09:36:55 +1100 |
| commit | 05289273c06de4bc6ece85a8bf672e588e34f36b (patch) | |
| tree | 24ec1a36d1438515f73c4cb4742dab5b04c81b33 /hw/intc/xics_spapr.c | |
| parent | 328d8eb24db8ec415260ee7243adf2e3d7e81bad (diff) | |
spapr, xics, xive: Move dt_populate from SpaprIrq to SpaprInterruptController
This method depends only on the active irq controller. Now that we've
formalized the notion of active controller we can dispatch directly
through that, rather than dispatching via SpaprIrq with the dual
version having to do a second conditional dispatch.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Diffstat (limited to 'hw/intc/xics_spapr.c')
| -rw-r--r-- | hw/intc/xics_spapr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 415defe394..4eabafc7e1 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -308,8 +308,8 @@ static void ics_spapr_realize(DeviceState *dev, Error **errp) spapr_register_hypercall(H_IPOLL, h_ipoll); } -void spapr_dt_xics(SpaprMachineState *spapr, uint32_t nr_servers, void *fdt, - uint32_t phandle) +static void xics_spapr_dt(SpaprInterruptController *intc, uint32_t nr_servers, + void *fdt, uint32_t phandle) { uint32_t interrupt_server_ranges_prop[] = { 0, cpu_to_be32(nr_servers), @@ -408,6 +408,7 @@ static void ics_spapr_class_init(ObjectClass *klass, void *data) sicc->free_irq = xics_spapr_free_irq; sicc->set_irq = xics_spapr_set_irq; sicc->print_info = xics_spapr_print_info; + sicc->dt = xics_spapr_dt; } static const TypeInfo ics_spapr_info = { |