diff options
| author | Cédric Le Goater <clg@kaod.org> | 2017-02-27 15:29:17 +0100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2017-03-01 11:23:39 +1100 |
| commit | 2cd908d0add803886c310084145fecc93f080a63 (patch) | |
| tree | f42a461eff00fe978e9462705da17a628e3208e3 | |
| parent | f7759e4331ed04b2128af36efd395e55e3076406 (diff) | |
| download | qemu-2cd908d0add803886c310084145fecc93f080a63.zip qemu-2cd908d0add803886c310084145fecc93f080a63.tar.gz qemu-2cd908d0add803886c310084145fecc93f080a63.tar.bz2 | |
ppc/xics: use the QOM interface to resend irqs
Also change the ICPState 'xics' backlink to be a XICSFabric, this
removes the need of using qdev_get_machine() to get the QOM interface
in some of the routines.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| -rw-r--r-- | hw/intc/xics.c | 20 | ||||
| -rw-r--r-- | hw/ppc/spapr.c | 3 | ||||
| -rw-r--r-- | include/hw/ppc/xics.h | 3 |
3 files changed, 15 insertions, 11 deletions
diff --git a/hw/intc/xics.c b/hw/intc/xics.c index e3dbe63..23e45a8 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -231,14 +231,14 @@ static void icp_check_ipi(ICPState *ss) static void icp_resend(ICPState *ss) { - ICSState *ics; + XICSFabric *xi = ss->xics; + XICSFabricClass *xic = XICS_FABRIC_GET_CLASS(xi); if (ss->mfrr < CPPR(ss)) { icp_check_ipi(ss); } - QLIST_FOREACH(ics, &ss->xics->ics, list) { - ics_resend(ics); - } + + xic->ics_resend(xi); } void icp_set_cppr(ICPState *ss, uint8_t cppr) @@ -299,6 +299,8 @@ uint32_t icp_ipoll(ICPState *ss, uint32_t *mfrr) void icp_eoi(ICPState *ss, uint32_t xirr) { + XICSFabric *xi = ss->xics; + XICSFabricClass *xic = XICS_FABRIC_GET_CLASS(xi); ICSState *ics; uint32_t irq; @@ -306,10 +308,10 @@ void icp_eoi(ICPState *ss, uint32_t xirr) ss->xirr = (ss->xirr & ~CPPR_MASK) | (xirr & CPPR_MASK); trace_xics_icp_eoi(ss->cs->cpu_index, xirr, ss->xirr); irq = xirr & XISR_MASK; - QLIST_FOREACH(ics, &ss->xics->ics, list) { - if (ics_valid_irq(ics, irq)) { - ics_eoi(ics, irq); - } + + ics = xic->ics_get(xi, irq); + if (ics) { + ics_eoi(ics, irq); } if (!XISR(ss)) { icp_resend(ss); @@ -401,7 +403,7 @@ static void icp_realize(DeviceState *dev, Error **errp) return; } - icp->xics = XICS_COMMON(obj); + icp->xics = XICS_FABRIC(obj); } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c6cef04..a4e4b86 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -100,6 +100,7 @@ static XICSState *try_create_xics(sPAPRMachineState *spapr, const char *type_icp, int nr_servers, int nr_irqs, Error **errp) { + XICSFabric *xi = XICS_FABRIC(spapr); Error *err = NULL, *local_err = NULL; XICSState *xics; ICSState *ics = NULL; @@ -131,7 +132,7 @@ static XICSState *try_create_xics(sPAPRMachineState *spapr, object_initialize(icp, sizeof(*icp), type_icp); object_property_add_child(OBJECT(xics), "icp[*]", OBJECT(icp), NULL); - object_property_add_const_link(OBJECT(icp), "xics", OBJECT(xics), NULL); + object_property_add_const_link(OBJECT(icp), "xics", OBJECT(xi), NULL); object_property_set_bool(OBJECT(icp), true, "realized", &err); if (err) { goto error; diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 094756d..b880715 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -69,6 +69,7 @@ typedef struct ICPState ICPState; typedef struct ICSStateClass ICSStateClass; typedef struct ICSState ICSState; typedef struct ICSIRQState ICSIRQState; +typedef struct XICSFabric XICSFabric; struct XICSStateClass { DeviceClass parent_class; @@ -115,7 +116,7 @@ struct ICPState { qemu_irq output; bool cap_irq_xics_enabled; - XICSState *xics; + XICSFabric *xics; }; #define TYPE_ICS_BASE "ics-base" |