From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56159) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bux5X-00077i-2i for qemu-devel@nongnu.org; Fri, 14 Oct 2016 03:39:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bux5K-0007ev-VF for qemu-devel@nongnu.org; Fri, 14 Oct 2016 03:39:30 -0400 Received: from 2.mo1.mail-out.ovh.net ([178.32.119.250]:32881) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bux5K-0007eK-KK for qemu-devel@nongnu.org; Fri, 14 Oct 2016 03:39:18 -0400 Received: from player726.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo1.mail-out.ovh.net (Postfix) with ESMTP id 2FC57F690 for ; Fri, 14 Oct 2016 09:39:16 +0200 (CEST) References: <1475479496-16158-1-git-send-email-clg@kaod.org> <1475479496-16158-13-git-send-email-clg@kaod.org> <20161014053043.GL28562@umbus> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= Message-ID: Date: Fri, 14 Oct 2016 09:39:12 +0200 MIME-Version: 1.0 In-Reply-To: <20161014053043.GL28562@umbus> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Subject: Re: [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: David Gibson Cc: qemu-ppc@nongnu.org, Benjamin Herrenschmidt , qemu-devel@nongnu.org On 10/14/2016 07:30 AM, David Gibson wrote: > On Mon, Oct 03, 2016 at 09:24:48AM +0200, C=E9dric Le Goater wrote: >> 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=E9dric Le Goater >=20 > So, this is fine in principle. However info pic has recently been > reworked to better allow different PICs to add stuff in there. Your > patches will need to be reworked on top of that. >=20 > See 61b97833 and surrounding commits. Missed that. It seems I can get rid of the loop I introduced. I will=20 rework. Thanks, C. >> --- >> 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 *op= aque, 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 MF= RR=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_mod= el) >> 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, bo= ol 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