From nobody Tue Feb 10 04:16:37 2026 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 15102347056641001.7991154464802; Thu, 9 Nov 2017 05:38:25 -0800 (PST) Received: from localhost ([::1]:36949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCn26-000748-JD for importer@patchew.org; Thu, 09 Nov 2017 08:38:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCmum-0000yr-0O for qemu-devel@nongnu.org; Thu, 09 Nov 2017 08:30:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCmuh-0005kx-On for qemu-devel@nongnu.org; Thu, 09 Nov 2017 08:30:40 -0500 Received: from 6.mo68.mail-out.ovh.net ([46.105.63.100]:41052) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eCmuh-0005kZ-F9 for qemu-devel@nongnu.org; Thu, 09 Nov 2017 08:30:35 -0500 Received: from player750.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo68.mail-out.ovh.net (Postfix) with ESMTP id 38CCC9B916 for ; Thu, 9 Nov 2017 14:30:34 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-2231-173.w90-76.abo.wanadoo.fr [90.76.52.173]) (Authenticated sender: clg@kaod.org) by player750.ha.ovh.net (Postfix) with ESMTPSA id AA797181B8C; Thu, 9 Nov 2017 11:15:46 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson , Greg Kurz , Benjamin Herrenschmidt Date: Thu, 9 Nov 2017 11:14:36 +0100 Message-Id: <20171109101439.390-10-clg@kaod.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171109101439.390-1-clg@kaod.org> References: <20171109101439.390-1-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 3087217546870688595 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedttddriedugdegiecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 46.105.63.100 Subject: [Qemu-devel] [PATCH for-2.12 v2 09/12] spapr: introduce a XICSFabric irq_is_lsi() operation 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: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= 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" It will be used later on to distinguish the allocation of an LSI interrupt from an MSI and also to reduce the use of the ICSIRQState array of the ICSState object, which is on our way to introduce XIVE. The 'irq' parameter continues to refer to the global IRQ number space. On PowerNV, only the PSI controller interrupts are handled and they are all LSIs. Signed-off-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 26 +++++++++++++++++--------- hw/intc/xics_kvm.c | 4 ++-- hw/ppc/pnv.c | 16 ++++++++++++++++ hw/ppc/spapr.c | 9 +++++++++ include/hw/ppc/xics.h | 2 ++ 5 files changed, 46 insertions(+), 11 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 2c4899f278e2..42880e736697 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -33,6 +33,7 @@ #include "trace.h" #include "qemu/timer.h" #include "hw/ppc/xics.h" +#include "hw/ppc/spapr.h" #include "qemu/error-report.h" #include "qapi/visitor.h" #include "monitor/monitor.h" @@ -70,8 +71,7 @@ void ics_pic_print_info(ICSState *ics, Monitor *mon) } monitor_printf(mon, " %4x %s %02x %02x\n", ics->offset + i, - (irq->flags & XICS_FLAGS_IRQ_LSI) ? - "LSI" : "MSI", + ics_is_lsi(ics, i) ? "LSI" : "MSI", irq->priority, irq->status); } } @@ -377,6 +377,14 @@ static const TypeInfo icp_info =3D { /* * ICS: Source layer */ +bool ics_is_lsi(ICSState *ics, int srcno) +{ + XICSFabric *xi =3D ics->xics; + XICSFabricClass *xic =3D XICS_FABRIC_GET_CLASS(xi); + + return xic->irq_is_lsi(xi, srcno + ics->offset); +} + static void ics_simple_resend_msi(ICSState *ics, int srcno) { ICSIRQState *irq =3D ics->irqs + srcno; @@ -435,7 +443,7 @@ static void ics_simple_set_irq(void *opaque, int srcno,= int val) { ICSState *ics =3D (ICSState *)opaque; =20 - if (ics->irqs[srcno].flags & XICS_FLAGS_IRQ_LSI) { + if (ics_is_lsi(ics, srcno)) { ics_simple_set_irq_lsi(ics, srcno, val); } else { ics_simple_set_irq_msi(ics, srcno, val); @@ -472,7 +480,7 @@ void ics_simple_write_xive(ICSState *ics, int srcno, in= t server, trace_xics_ics_simple_write_xive(ics->offset + srcno, srcno, server, priority); =20 - if (ics->irqs[srcno].flags & XICS_FLAGS_IRQ_LSI) { + if (ics_is_lsi(ics, srcno)) { ics_simple_write_xive_lsi(ics, srcno); } else { ics_simple_write_xive_msi(ics, srcno); @@ -484,10 +492,10 @@ static void ics_simple_reject(ICSState *ics, uint32_t= nr) ICSIRQState *irq =3D ics->irqs + nr - ics->offset; =20 trace_xics_ics_simple_reject(nr, nr - ics->offset); - if (irq->flags & XICS_FLAGS_IRQ_MSI) { - irq->status |=3D XICS_STATUS_REJECTED; - } else if (irq->flags & XICS_FLAGS_IRQ_LSI) { + if (ics_is_lsi(ics, nr - ics->offset)) { irq->status &=3D ~XICS_STATUS_SENT; + } else { + irq->status |=3D XICS_STATUS_REJECTED; } } =20 @@ -497,7 +505,7 @@ static void ics_simple_resend(ICSState *ics) =20 for (i =3D 0; i < ics->nr_irqs; i++) { /* FIXME: filter by server#? */ - if (ics->irqs[i].flags & XICS_FLAGS_IRQ_LSI) { + if (ics_is_lsi(ics, i)) { ics_simple_resend_lsi(ics, i); } else { ics_simple_resend_msi(ics, i); @@ -512,7 +520,7 @@ static void ics_simple_eoi(ICSState *ics, uint32_t nr) =20 trace_xics_ics_simple_eoi(nr); =20 - if (ics->irqs[srcno].flags & XICS_FLAGS_IRQ_LSI) { + if (ics_is_lsi(ics, srcno)) { irq->status &=3D ~XICS_STATUS_SENT; } } diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 3091ad3ac2c8..2f10637c9f7c 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -258,7 +258,7 @@ static int ics_set_kvm_state(ICSState *ics, int version= _id) state |=3D KVM_XICS_MASKED; } =20 - if (ics->irqs[i].flags & XICS_FLAGS_IRQ_LSI) { + if (ics_is_lsi(ics, i)) { state |=3D KVM_XICS_LEVEL_SENSITIVE; if (irq->status & XICS_STATUS_ASSERTED) { state |=3D KVM_XICS_PENDING; @@ -293,7 +293,7 @@ static void ics_kvm_set_irq(void *opaque, int srcno, in= t val) int rc; =20 args.irq =3D srcno + ics->offset; - if (ics->irqs[srcno].flags & XICS_FLAGS_IRQ_MSI) { + if (!ics_is_lsi(ics, srcno)) { if (!val) { return; } diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 8288940ef9d7..958223376b4c 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -1035,6 +1035,21 @@ static bool pnv_irq_test(XICSFabric *xi, int irq) return false; } =20 +static bool pnv_irq_is_lsi(XICSFabric *xi, int irq) +{ + PnvMachineState *pnv =3D POWERNV_MACHINE(xi); + int i; + + /* PowerNV machine only has PSI interrupts which are all LSIs */ + for (i =3D 0; i < pnv->num_chips; i++) { + ICSState *ics =3D &pnv->chips[i]->psi.ics; + if (ics_valid_irq(ics, irq)) { + return true; + } + } + return false; +} + static void pnv_pic_print_info(InterruptStatsProvider *obj, Monitor *mon) { @@ -1120,6 +1135,7 @@ static void powernv_machine_class_init(ObjectClass *o= c, void *data) xic->ics_get =3D pnv_ics_get; xic->ics_resend =3D pnv_ics_resend; xic->irq_test =3D pnv_irq_test; + xic->irq_is_lsi =3D pnv_irq_is_lsi; ispc->print_info =3D pnv_pic_print_info; =20 powernv_machine_class_props_init(oc); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 0c6a4c8bffc0..86d5e310e85f 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3633,6 +3633,14 @@ static void spapr_irq_free_block(XICSFabric *xi, int= irq, int num) } } =20 +static bool spapr_irq_is_lsi(XICSFabric *xi, int irq) +{ + sPAPRMachineState *spapr =3D SPAPR_MACHINE(xi); + int srcno =3D irq - spapr->irq_base; + + return spapr->ics->irqs[srcno].flags & XICS_FLAGS_IRQ_LSI; +} + static void spapr_pic_print_info(InterruptStatsProvider *obj, Monitor *mon) { @@ -3731,6 +3739,7 @@ static void spapr_machine_class_init(ObjectClass *oc,= void *data) xic->irq_test =3D spapr_irq_test; xic->irq_alloc_block =3D spapr_irq_alloc_block; xic->irq_free_block =3D spapr_irq_free_block; + xic->irq_is_lsi =3D spapr_irq_is_lsi; =20 ispc->print_info =3D spapr_pic_print_info; /* Force NUMA node memory size to be a multiple of diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 30e7f2e0a7dd..478f8e510179 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -179,6 +179,7 @@ typedef struct XICSFabricClass { bool (*irq_test)(XICSFabric *xi, int irq); int (*irq_alloc_block)(XICSFabric *xi, int count, int align); void (*irq_free_block)(XICSFabric *xi, int irq, int num); + bool (*irq_is_lsi)(XICSFabric *xi, int irq); } XICSFabricClass; =20 #define XICS_IRQS_SPAPR 1024 @@ -205,6 +206,7 @@ void ics_simple_write_xive(ICSState *ics, int nr, int s= erver, void ics_set_irq_type(ICSState *ics, int srcno, bool lsi); void icp_pic_print_info(ICPState *icp, Monitor *mon); void ics_pic_print_info(ICSState *ics, Monitor *mon); +bool ics_is_lsi(ICSState *ics, int srno); =20 void ics_resend(ICSState *ics); void icp_resend(ICPState *ss); --=20 2.13.6