From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bqxdq-0007bF-Rb for qemu-devel@nongnu.org; Mon, 03 Oct 2016 03:26:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bqxdm-0003fE-DE for qemu-devel@nongnu.org; Mon, 03 Oct 2016 03:26:25 -0400 Received: from 3.mo68.mail-out.ovh.net ([46.105.58.60]:51073) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bqxdm-0003ei-1n for qemu-devel@nongnu.org; Mon, 03 Oct 2016 03:26:22 -0400 Received: from player711.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo68.mail-out.ovh.net (Postfix) with ESMTP id 92F861000591 for ; Mon, 3 Oct 2016 09:26:21 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Mon, 3 Oct 2016 09:24:48 +0200 Message-Id: <1475479496-16158-13-git-send-email-clg@kaod.org> In-Reply-To: <1475479496-16158-1-git-send-email-clg@kaod.org> References: <1475479496-16158-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 12/20] ppc/xics: Add xics to the monitor "info pic" command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc@nongnu.org Cc: David Gibson , Benjamin Herrenschmidt , qemu-devel@nongnu.org, Cedric Le Goater From: Benjamin Herrenschmidt Useful to debug interrupt problems. Signed-off-by: Benjamin Herrenschmidt [clg: - updated for qemu-2.7 - added a test on ->irqs as it is not necessarily allocated (PHB3_MSI) - removed static variable g_xics and replace with a loop on all children to find the xics objects. ] Signed-off-by: C=C3=A9dric Le Goater --- hmp-commands-info.hx | 2 ++ hw/intc/xics.c | 52 +++++++++++++++++++++++++++++++++++++++++++++= ++++++ hw/ppc/ppc.c | 14 ++++++++++++++ include/hw/ppc/ppc.h | 2 ++ include/hw/ppc/xics.h | 2 ++ monitor.c | 4 ++++ 6 files changed, 76 insertions(+) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 19729e55aea2..ab11eaf54348 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -203,6 +203,8 @@ ETEXI .cmd =3D sun4m_hmp_info_pic, #elif defined(TARGET_LM32) .cmd =3D lm32_hmp_info_pic, +#elif defined(TARGET_PPC) + .cmd =3D ppc_hmp_info_pic, #else .cmd =3D hmp_info_pic, #endif diff --git a/hw/intc/xics.c b/hw/intc/xics.c index f40b00003a45..3bbbcc847791 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -35,6 +35,7 @@ #include "hw/ppc/xics.h" #include "qemu/error-report.h" #include "qapi/visitor.h" +#include "monitor/monitor.h" =20 int xics_get_cpu_index_by_dt_id(int cpu_dt_id) { @@ -633,6 +634,57 @@ static int ics_simple_dispatch_post_load(void *opaqu= e, int version_id) return 0; } =20 +static int xics_hmp_info_pic_child(Object *child, void *opaque) +{ + Monitor *mon =3D opaque; + + if (object_dynamic_cast(child, TYPE_XICS_COMMON)) { + XICSState *xics =3D XICS_COMMON(child); + ICSState *ics; + uint32_t i; + + for (i =3D 0; i < xics->nr_servers; i++) { + ICPState *icp =3D &xics->ss[i]; + + if (!icp->output) { + continue; + } + monitor_printf(mon, "CPU %d XIRR=3D%08x (%p) PP=3D%02x MFRR=3D= %02x\n", + i, icp->xirr, icp->xirr_owner, + icp->pending_priority, icp->mfrr); + } + + QLIST_FOREACH(ics, &xics->ics, list) { + monitor_printf(mon, "ICS %4x..%4x %p\n", + ics->offset, ics->offset + ics->nr_irqs - 1, = ics); + + if (!ics->irqs) { + continue; + } + + for (i =3D 0; i < ics->nr_irqs; i++) { + ICSIRQState *irq =3D 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); + } + } + } + return 0; +} + +void xics_hmp_info_pic(Monitor *mon, const QDict *qdict) +{ + object_child_foreach_recursive(OBJECT(qdev_get_machine()), + xics_hmp_info_pic_child, mon); +} + static const VMStateDescription vmstate_ics_simple_irq =3D { .name =3D "ics/irq", .version_id =3D 2, diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 89458690097f..bc734281f509 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -27,6 +27,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" @@ -39,6 +40,10 @@ #include "kvm_ppc.h" #include "trace.h" =20 +#if defined(TARGET_PPC64) +#include "hw/ppc/xics.h" +#endif + //#define PPC_DEBUG_IRQ //#define PPC_DEBUG_TB =20 @@ -1376,3 +1381,12 @@ void ppc_cpu_parse_features(const char *cpu_model) cc->parse_features(typename, model_pieces[1], &error_fatal); g_strfreev(model_pieces); } + +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 00c1fb1e720a..b36024a1213c 100644 --- a/include/hw/ppc/ppc.h +++ b/include/hw/ppc/ppc.h @@ -3,6 +3,8 @@ =20 #include "target-ppc/cpu-qom.h" =20 +void ppc_hmp_info_pic(Monitor *mon, const QDict *qdict); + void ppc_set_irq(PowerPCCPU *cpu, int n_IRQ, int level); =20 /* PowerPC hardware exceptions management helpers */ diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 66ae55ded387..ca9f8da542e0 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -205,4 +205,6 @@ void ics_set_irq_type(ICSState *ics, int srcno, bool = lsi); =20 ICSState *xics_find_source(XICSState *icp, int irq); =20 +void xics_hmp_info_pic(Monitor *mon, const QDict *qdict); + #endif /* XICS_H */ diff --git a/monitor.c b/monitor.c index 83c4edfce08e..70e17fa9f1fd 100644 --- a/monitor.c +++ b/monitor.c @@ -91,6 +91,10 @@ #include "hw/s390x/storage-keys.h" #endif =20 +#if defined(TARGET_PPC) +#include "hw/ppc/ppc.h" +#endif + /* * Supported types: * --=20 2.7.4