From patchwork Thu Jun 23 17:47:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nikunj A. Dadhania" X-Patchwork-Id: 9195711 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9C0006075F for ; Thu, 23 Jun 2016 18:02:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F75A28467 for ; Thu, 23 Jun 2016 18:02:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 821922846C; Thu, 23 Jun 2016 18:02:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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 mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2C3AE28467 for ; Thu, 23 Jun 2016 18:02:19 +0000 (UTC) Received: from localhost ([::1]:38478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG8xF-00076O-KZ for patchwork-qemu-devel@patchwork.kernel.org; Thu, 23 Jun 2016 14:02:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG8kX-0000h5-9D for qemu-devel@nongnu.org; Thu, 23 Jun 2016 13:49:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bG8kU-0004qA-UV for qemu-devel@nongnu.org; Thu, 23 Jun 2016 13:49:08 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:20577 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bG8kU-0004px-PD for qemu-devel@nongnu.org; Thu, 23 Jun 2016 13:49:06 -0400 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u5NHhx1u121220 for ; Thu, 23 Jun 2016 13:49:06 -0400 Received: from e23smtp07.au.ibm.com (e23smtp07.au.ibm.com [202.81.31.140]) by mx0b-001b2d01.pphosted.com with ESMTP id 23rj7h5dbe-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 23 Jun 2016 13:49:06 -0400 Received: from localhost by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 24 Jun 2016 03:49:03 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp07.au.ibm.com (202.81.31.204) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 24 Jun 2016 03:49:01 +1000 X-IBM-Helo: d23dlp01.au.ibm.com X-IBM-MailFrom: nikunj@linux.vnet.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org;qemu-ppc@nongnu.org Received: from d23relay06.au.ibm.com (d23relay06.au.ibm.com [9.185.63.219]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 5CB462CE8054; Fri, 24 Jun 2016 03:49:01 +1000 (EST) Received: from d23av05.au.ibm.com (d23av05.au.ibm.com [9.190.234.119]) by d23relay06.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u5NHn1F435586148; Fri, 24 Jun 2016 03:49:01 +1000 Received: from d23av05.au.ibm.com (localhost [127.0.0.1]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u5NHn0uM010783; Fri, 24 Jun 2016 03:49:01 +1000 Received: from abhimanyu.in.ibm.com ([9.77.204.240]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u5NHluPE009735; Fri, 24 Jun 2016 03:48:58 +1000 From: Nikunj A Dadhania To: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au Date: Thu, 23 Jun 2016 23:17:30 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1466704050-15108-1-git-send-email-nikunj@linux.vnet.ibm.com> References: <1466704050-15108-1-git-send-email-nikunj@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16062317-0044-0000-0000-000001B94224 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16062317-0045-0000-0000-000004FEBD02 Message-Id: <1466704050-15108-12-git-send-email-nikunj@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-06-23_08:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1606230185 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH v1 11/11] ppc/xics: Add xics to the monitor "info pic" command 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-devel@nongnu.org, nikunj@linux.vnet.ibm.com, clg@kaod.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Benjamin Herrenschmidt Useful to debug interrupt problems. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Nikunj A Dadhania --- hmp-commands-info.hx | 2 ++ hw/intc/xics.c | 38 ++++++++++++++++++++++++++++++++++++++ hw/ppc/ppc.c | 14 ++++++++++++++ include/hw/ppc/ppc.h | 1 + include/hw/ppc/xics.h | 2 ++ monitor.c | 4 ++++ 6 files changed, 61 insertions(+) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 7da9e6c..e4b90b9 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 e2aa48d..19eeea9 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -35,6 +35,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) { @@ -192,6 +195,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) @@ -636,6 +642,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_irq = { .name = "ics/irq", .version_id = 2, diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 1bcf740..f3ee1d6 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" @@ -38,6 +39,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 @@ -1343,3 +1348,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 5617dc4..8076797 100644 --- a/include/hw/ppc/ppc.h +++ b/include/hw/ppc/ppc.h @@ -3,6 +3,7 @@ #include "target-ppc/cpu-qom.h" +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 0e47ecb..1dbfa2c 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -218,4 +218,6 @@ void ics_set_irq_type(ICSState *ics, int srcno, bool lsi); ICSState *xics_find_source(XICSState *icp, int irq); void xics_add_ics(XICSState *xics); +void xics_hmp_info_pic(Monitor *mon, const QDict *qdict); + #endif /* __XICS_H__ */ diff --git a/monitor.c b/monitor.c index 6f960f1..66d682b 100644 --- a/monitor.c +++ b/monitor.c @@ -94,6 +94,10 @@ #include "hw/s390x/storage-keys.h" #endif +#if defined(TARGET_PPC) +#include "hw/ppc/ppc.h" +#endif + /* * Supported types: *