From 2cd908d0add803886c310084145fecc93f080a63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Mon, 27 Feb 2017 15:29:17 +0100 Subject: ppc/xics: use the QOM interface to resend irqs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: David Gibson --- hw/intc/xics.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'hw/intc/xics.c') 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); } -- cgit v1.1