From patchwork Wed Nov 11 00:27:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Herrenschmidt X-Patchwork-Id: 542696 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5FF4C1402B0 for ; Wed, 11 Nov 2015 11:47:03 +1100 (AEDT) Received: from localhost ([::1]:36572 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwJYz-0007GY-1W for incoming@patchwork.ozlabs.org; Tue, 10 Nov 2015 19:47:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwJJ4-0002en-8s for qemu-devel@nongnu.org; Tue, 10 Nov 2015 19:30:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZwJIz-0004V2-VR for qemu-devel@nongnu.org; Tue, 10 Nov 2015 19:30:33 -0500 Received: from gate.crashing.org ([63.228.1.57]:48662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwJIz-0004Un-Lg; Tue, 10 Nov 2015 19:30:29 -0500 Received: from pasglop.ozlabs.ibm.com. (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.13.8) with ESMTP id tAB0Sb2r024031; Tue, 10 Nov 2015 18:30:17 -0600 From: Benjamin Herrenschmidt To: qemu-ppc@nongnu.org Date: Wed, 11 Nov 2015 11:27:52 +1100 Message-Id: <1447201710-10229-40-git-send-email-benh@kernel.crashing.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1447201710-10229-1-git-send-email-benh@kernel.crashing.org> References: <1447201710-10229-1-git-send-email-benh@kernel.crashing.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 63.228.1.57 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 39/77] ppc/xics: Add xics to the monitor "info pic" command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Useful to debug interrupt problems. Signed-off-by: Benjamin Herrenschmidt --- hmp-commands-info.hx | 2 ++ hw/intc/xics.c | 38 ++++++++++++++++++++++++++++++++++++++ hw/ppc/ppc.c | 14 ++++++++++++++ include/hw/ppc/ppc.h | 2 ++ include/hw/ppc/xics.h | 2 ++ monitor.c | 3 +++ 6 files changed, 61 insertions(+) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 9b71351..2f1dc86 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -203,6 +203,8 @@ ETEXI .mhandler.cmd = sun4m_hmp_info_pic, #elif defined(TARGET_LM32) .mhandler.cmd = lm32_hmp_info_pic, +#elif defined(TARGET_PPC) + .mhandler.cmd = ppc_hmp_info_pic, #else .mhandler.cmd = hmp_info_pic, #endif diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 4b33e6d..d027a24 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -31,6 +31,9 @@ #include "hw/ppc/xics.h" #include "qemu/error-report.h" #include "qapi/visitor.h" +#include "monitor/monitor.h" + +static XICSState *g_xics; int get_cpu_index_by_dt_id(int cpu_dt_id) { @@ -170,6 +173,9 @@ static void xics_common_initfn(Object *obj) object_property_add(obj, "nr_servers", "int", xics_prop_get_nr_servers, xics_prop_set_nr_servers, NULL, NULL, NULL); + + /* For exclusive use of monitor command */ + g_xics = XICS_COMMON(obj); } static void xics_common_class_init(ObjectClass *oc, void *data) @@ -614,6 +620,38 @@ static int ics_dispatch_post_load(void *opaque, int version_id) return 0; } +void xics_hmp_info_pic(Monitor *mon, const QDict *qdict) +{ + ICSState *ics; + uint32_t i; + + for (i = 0; i < g_xics->nr_servers; i++) { + ICPState *icp = &g_xics->ss[i]; + + if (!icp->output) { + continue; + } + monitor_printf(mon, "CPU %d XIRR=%08x (%p) PP=%02x MFRR=%02x\n", + i, icp->xirr, icp->xirr_owner, + icp->pending_priority, icp->mfrr); + } + QLIST_FOREACH(ics, &g_xics->ics, list) { + monitor_printf(mon, "ICS %4x..%4x %p\n", + ics->offset, ics->offset + ics->nr_irqs - 1, ics); + for (i = 0; i < ics->nr_irqs; i++) { + ICSIRQState *irq = ics->irqs + i; + + if (!(irq->flags & XICS_FLAGS_IRQ_MASK)) { + continue; + } + monitor_printf(mon, " %4x %s %02x %02x\n", + ics->offset + i, + (irq->flags & XICS_FLAGS_IRQ_LSI) ? "LSI" : "MSI", + irq->priority, irq->status); + } + } +} + static const VMStateDescription vmstate_ics_simple_irq = { .name = "ics/irq", .version_id = 2, diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 2c604ef..3b14f09 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -24,6 +24,7 @@ #include "hw/hw.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc_e500.h" +#include "hw/i386/pc.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "sysemu/cpus.h" @@ -35,6 +36,10 @@ #include "kvm_ppc.h" #include "trace.h" +#if defined(TARGET_PPC64) +#include "hw/ppc/xics.h" +#endif + //#define PPC_DEBUG_IRQ //#define PPC_DEBUG_TB @@ -1337,3 +1342,12 @@ PowerPCCPU *ppc_get_vcpu_by_dt_id(int cpu_dt_id) return NULL; } + +void ppc_hmp_info_pic(Monitor *mon, const QDict *qdict) +{ + /* Call in turn every PIC around. OpenPIC doesn't have one yet */ +#ifdef TARGET_PPC64 + xics_hmp_info_pic(mon, qdict); +#endif + hmp_info_pic(mon, qdict); +} diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h index 14efd0c..d5c648d 100644 --- a/include/hw/ppc/ppc.h +++ b/include/hw/ppc/ppc.h @@ -1,6 +1,8 @@ #ifndef HW_PPC_H #define HW_PPC_H 1 +void ppc_hmp_info_pic(Monitor *mon, const QDict *qdict); + void ppc_set_irq(PowerPCCPU *cpu, int n_IRQ, int level); /* PowerPC hardware exceptions management helpers */ diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index f32f409..1cf7037 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -213,4 +213,6 @@ void xics_set_nr_servers(XICSState *icp, uint32_t nr_servers, Error **errp); ICSState *xics_find_source(XICSState *icp, int irq); void xics_add_ics(XICSState *xics, ICSState *ics); +void xics_hmp_info_pic(Monitor *mon, const QDict *qdict); + #endif /* __XICS_H__ */ diff --git a/monitor.c b/monitor.c index 3295840..988477e 100644 --- a/monitor.c +++ b/monitor.c @@ -76,6 +76,9 @@ #include "qapi-event.h" #include "qmp-introspect.h" #include "sysemu/block-backend.h" +#if defined(TARGET_PPC) +#include "hw/ppc/ppc.h" +#endif /* for hmp_info_irq/pic */ #if defined(TARGET_SPARC)