From nobody Thu Nov 6 19:12:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488344298212118.84771355128203; Tue, 28 Feb 2017 20:58:18 -0800 (PST) Received: from localhost ([::1]:38403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciwLA-0003Vo-UN for importer@patchew.org; Tue, 28 Feb 2017 23:58:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciw7r-00086g-0e for qemu-devel@nongnu.org; Tue, 28 Feb 2017 23:44:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ciw7o-00008h-1P for qemu-devel@nongnu.org; Tue, 28 Feb 2017 23:44:31 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:43783) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ciw7n-00005t-G6; Tue, 28 Feb 2017 23:44:27 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3vY2sT2mhQz9sNw; Wed, 1 Mar 2017 15:44:12 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1488343453; bh=VYfNiqEb8XBlhbB2X0+xqjjddWMCU+j5hbNLGr7ZxUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mkujsurv7cGd3JTjyctstv75/06PbQB9CeVjXhb0CUmbQaL4JWr3zwHpNPwhragaN dzER9FGfz6r/IJVSfhJwwk7zNTIRAFhSjwPPa8h1Vzf1YuW876rbr2dI7HDubMrgb0 9CAhweIPw0ZFQKyvX+FtBxBwwjlG85tPDoAwgFKQ= From: David Gibson To: peter.maydell@linaro.org Date: Wed, 1 Mar 2017 15:43:48 +1100 Message-Id: <20170301044405.1792-34-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170301044405.1792-1-david@gibson.dropbear.id.au> References: <20170301044405.1792-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 33/50] ppc/xics: use the QOM interface to resend irqs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, thuth@redhat.com, qemu-devel@nongnu.org, aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, agraf@suse.de, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: C=C3=A9dric Le Goater 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=C3=A9dric Le Goater Signed-off-by: David Gibson --- hw/intc/xics.c | 20 +++++++++++--------- hw/ppc/spapr.c | 3 ++- 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) =20 static void icp_resend(ICPState *ss) { - ICSState *ics; + XICSFabric *xi =3D ss->xics; + XICSFabricClass *xic =3D XICS_FABRIC_GET_CLASS(xi); =20 if (ss->mfrr < CPPR(ss)) { icp_check_ipi(ss); } - QLIST_FOREACH(ics, &ss->xics->ics, list) { - ics_resend(ics); - } + + xic->ics_resend(xi); } =20 void icp_set_cppr(ICPState *ss, uint8_t cppr) @@ -299,6 +299,8 @@ uint32_t icp_ipoll(ICPState *ss, uint32_t *mfrr) =20 void icp_eoi(ICPState *ss, uint32_t xirr) { + XICSFabric *xi =3D ss->xics; + XICSFabricClass *xic =3D XICS_FABRIC_GET_CLASS(xi); ICSState *ics; uint32_t irq; =20 @@ -306,10 +308,10 @@ void icp_eoi(ICPState *ss, uint32_t xirr) ss->xirr =3D (ss->xirr & ~CPPR_MASK) | (xirr & CPPR_MASK); trace_xics_icp_eoi(ss->cs->cpu_index, xirr, ss->xirr); irq =3D xirr & XISR_MASK; - QLIST_FOREACH(ics, &ss->xics->ics, list) { - if (ics_valid_irq(ics, irq)) { - ics_eoi(ics, irq); - } + + ics =3D 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; } =20 - icp->xics =3D XICS_COMMON(obj); + icp->xics =3D XICS_FABRIC(obj); } =20 =20 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 *sp= apr, const char *type_icp, int nr_servers, int nr_irqs, Error **errp) { + XICSFabric *xi =3D XICS_FABRIC(spapr); Error *err =3D NULL, *local_err =3D NULL; XICSState *xics; ICSState *ics =3D NULL; @@ -131,7 +132,7 @@ static XICSState *try_create_xics(sPAPRMachineState *sp= apr, =20 object_initialize(icp, sizeof(*icp), type_icp); object_property_add_child(OBJECT(xics), "icp[*]", OBJECT(icp), NUL= L); - object_property_add_const_link(OBJECT(icp), "xics", OBJECT(xics), = NULL); + object_property_add_const_link(OBJECT(icp), "xics", OBJECT(xi), NU= LL); 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; =20 struct XICSStateClass { DeviceClass parent_class; @@ -115,7 +116,7 @@ struct ICPState { qemu_irq output; bool cap_irq_xics_enabled; =20 - XICSState *xics; + XICSFabric *xics; }; =20 #define TYPE_ICS_BASE "ics-base" --=20 2.9.3