From patchwork Fri Feb 24 10:18:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 732083 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vV7805GX3z9s7t for ; Fri, 24 Feb 2017 21:46:40 +1100 (AEDT) Received: from localhost ([::1]:36075 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDOY-00005C-8O for incoming@patchwork.ozlabs.org; Fri, 24 Feb 2017 05:46:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chCyp-00067A-Lu for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chCyl-0007i5-Li for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:20:03 -0500 Received: from 8.mo5.mail-out.ovh.net ([178.32.116.78]:58922) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chCyl-0007gi-Eb for qemu-devel@nongnu.org; Fri, 24 Feb 2017 05:19:59 -0500 Received: from player734.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with ESMTP id 75AE0D9687 for ; Fri, 24 Feb 2017 11:19:58 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-10647-27.w90-89.abo.wanadoo.fr [90.89.233.27]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 97BA02800BA; Fri, 24 Feb 2017 11:19:53 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 24 Feb 2017 11:18:13 +0100 Message-Id: <1487931503-10607-15-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487931503-10607-1-git-send-email-clg@kaod.org> References: <1487931503-10607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 634444598401469414 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrvddtgdduvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 178.32.116.78 Subject: [Qemu-devel] [PATCH v3 14/24] ppc/xics: extend the QOM interface to handle ICPs 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: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Let's add two new handlers for ICPs. One is to get an ICP object from a server number and a second is to resend the irqs when needed. Signed-off-by: Cédric Le Goater --- hw/intc/xics.c | 2 +- hw/ppc/spapr.c | 20 ++++++++++++++++++++ include/hw/ppc/xics.h | 3 +++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 2dd0c3165609..05922a040fb5 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -216,7 +216,7 @@ static void icp_check_ipi(ICPState *ss) qemu_irq_raise(ss->output); } -static void icp_resend(XICSFabric *xi, ICPState *ss) +void icp_resend(XICSFabric *xi, ICPState *ss) { XICSFabricClass *xic = XICS_FABRIC_GET_CLASS(xi); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f2528255c9e9..fa589d5d260c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2923,6 +2923,24 @@ static void spapr_ics_resend(XICSFabric *dev) ics_resend(spapr->ics); } +static ICPState *spapr_icp_get(XICSFabric *xi, int server) +{ + sPAPRMachineState *spapr = SPAPR_MACHINE(xi); + + return (server < spapr->xics->nr_servers) ? &spapr->xics->ss[server] : + NULL; +} + +static void spapr_icp_resend(XICSFabric *xi) +{ + sPAPRMachineState *spapr = SPAPR_MACHINE(xi); + int i; + + for (i = 0; i < spapr->xics->nr_servers; i++) { + icp_resend(xi, &spapr->xics->ss[i]); + } +} + static void spapr_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -2967,6 +2985,8 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) vhc->hypercall = emulate_spapr_hypercall; xic->ics_get = spapr_ics_get; xic->ics_resend = spapr_ics_resend; + xic->icp_get = spapr_icp_get; + xic->icp_resend = spapr_icp_resend; } static const TypeInfo spapr_machine_info = { diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index f333500b473d..814f7ebe2246 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -191,6 +191,8 @@ typedef struct XICSFabricClass { InterfaceClass parent; ICSState *(*ics_get)(XICSFabric *xi, int irq); void (*ics_resend)(XICSFabric *xi); + ICPState *(*icp_get)(XICSFabric *xi, int server); + void (*icp_resend)(XICSFabric *xi); } XICSFabricClass; #define XICS_IRQS_SPAPR 1024 @@ -221,5 +223,6 @@ void ics_simple_write_xive(ICSState *ics, int nr, int server, void ics_set_irq_type(ICSState *ics, int srcno, bool lsi); void ics_resend(ICSState *ics); +void icp_resend(XICSFabric *xi, ICPState *ss); #endif /* XICS_H */