From patchwork Wed Jul 5 17:13:38 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: 784793 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 3x2p6t3rYQz9s4s for ; Thu, 6 Jul 2017 03:40:22 +1000 (AEST) Received: from localhost ([::1]:47404 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSoHk-0000OE-85 for incoming@patchwork.ozlabs.org; Wed, 05 Jul 2017 13:40:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSnum-0005HH-N0 for qemu-devel@nongnu.org; Wed, 05 Jul 2017 13:16:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSnui-0004US-NE for qemu-devel@nongnu.org; Wed, 05 Jul 2017 13:16:36 -0400 Received: from 20.mo3.mail-out.ovh.net ([178.33.47.94]:41814) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dSnui-0004Td-Gs for qemu-devel@nongnu.org; Wed, 05 Jul 2017 13:16:32 -0400 Received: from player158.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo3.mail-out.ovh.net (Postfix) with ESMTP id 77FCEFCDB3 for ; Wed, 5 Jul 2017 19:16:31 +0200 (CEST) Received: from zorba.kaod.org.com (LFbn-1-10652-153.w90-89.abo.wanadoo.fr [90.89.238.153]) (Authenticated sender: clg@kaod.org) by player158.ha.ovh.net (Postfix) with ESMTPSA id 4E5F962007C; Wed, 5 Jul 2017 19:16:25 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Wed, 5 Jul 2017 19:13:38 +0200 Message-Id: <1499274819-15607-26-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.5 In-Reply-To: <1499274819-15607-1-git-send-email-clg@kaod.org> References: <1499274819-15607-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 2229000344041065446 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelkedrudeigdduuddtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 178.33.47.94 Subject: [Qemu-devel] [RFC PATCH 25/26] spapr: print the XIVE interrupt source for IPIs in the monitor 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?= , qemu-ppc@nongnu.org, Alexander Graf , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Cédric Le Goater --- hw/intc/xive_spapr.c | 5 +++++ hw/ppc/spapr.c | 4 ++++ include/hw/ppc/xive.h | 1 + 3 files changed, 10 insertions(+) diff --git a/hw/intc/xive_spapr.c b/hw/intc/xive_spapr.c index eb8a5c081e51..4f689f8b97c0 100644 --- a/hw/intc/xive_spapr.c +++ b/hw/intc/xive_spapr.c @@ -36,6 +36,11 @@ ICSState *xive_ics_get(XIVE *x, uint32_t lisn) return ics_valid_irq(ics, lisn) ? ics : NULL; } +void xive_ics_pic_print_info(XIVE *x, Monitor *mon) +{ + ics_pic_print_info(ICS_BASE(&x->ipi_xs), mon); +} + static XiveICSState *xive_ics_find(sPAPRMachineState *spapr, uint32_t lisn) { XICSFabricClass *xic = XICS_FABRIC_GET_CLASS(spapr); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 816661f4c9ad..ca3a6bc2ea16 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3399,6 +3399,10 @@ static void spapr_pic_print_info(InterruptStatsProvider *obj, icp_pic_print_info(ICP(cpu->intc), mon); } + if (spapr_ovec_test(spapr->ov5_cas, OV5_XIVE_EXPLOIT)) { + xive_ics_pic_print_info(spapr->xive, mon); + } + ics_pic_print_info(spapr->ics, mon); } diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h index dc5309264422..ee9b32d8c884 100644 --- a/include/hw/ppc/xive.h +++ b/include/hw/ppc/xive.h @@ -75,5 +75,6 @@ void xive_ics_create(XiveICSState *xs, XIVE *x, uint32_t offset, uint32_t nr_irqs, uint32_t shift, uint32_t flags, Error **errp); ICSState *xive_ics_get(XIVE *x, uint32_t lisn); +void xive_ics_pic_print_info(XIVE *x, Monitor *mon); #endif /* PPC_XIVE_H */