From patchwork Fri Mar 14 04:18:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Kardashevskiy X-Patchwork-Id: 330178 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 72FDB2C00F0 for ; Fri, 14 Mar 2014 15:19:20 +1100 (EST) Received: from localhost ([::1]:42628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOJaX-000759-DM for incoming@patchwork.ozlabs.org; Fri, 14 Mar 2014 00:19:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOJZp-00073F-EA for qemu-devel@nongnu.org; Fri, 14 Mar 2014 00:18:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WOJZf-0004Sd-6T for qemu-devel@nongnu.org; Fri, 14 Mar 2014 00:18:33 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:41645) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOJZe-0004J1-Eq for qemu-devel@nongnu.org; Fri, 14 Mar 2014 00:18:23 -0400 Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 14 Mar 2014 14:18:16 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp09.au.ibm.com (202.81.31.206) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 14 Mar 2014 14:18:14 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id CFADD2BB0054; Fri, 14 Mar 2014 15:18:13 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s2E3w0gY1507718; Fri, 14 Mar 2014 14:58:00 +1100 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s2E4ID4U027248; Fri, 14 Mar 2014 15:18:13 +1100 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.190.163.12]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s2E4IDMj027242; Fri, 14 Mar 2014 15:18:13 +1100 Received: from bran.ozlabs.ibm.com (haven.au.ibm.com [9.190.164.82]) by ozlabs.au.ibm.com (Postfix) with ESMTP id CFFA1A0247; Fri, 14 Mar 2014 15:18:12 +1100 (EST) Received: from ka1.ozlabs.ibm.com (ka1.ozlabs.ibm.com [10.61.145.11]) by bran.ozlabs.ibm.com (Postfix) with ESMTP id B1AB416A994; Fri, 14 Mar 2014 15:18:11 +1100 (EST) From: Alexey Kardashevskiy To: qemu-devel@nongnu.org Date: Fri, 14 Mar 2014 15:18:04 +1100 Message-Id: <1394770689-29039-4-git-send-email-aik@ozlabs.ru> X-Mailer: git-send-email 1.8.4.rc4 In-Reply-To: <1394770689-29039-1-git-send-email-aik@ozlabs.ru> References: <1394770689-29039-1-git-send-email-aik@ozlabs.ru> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14031404-3568-0000-0000-0000051929A7 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.142 Cc: Alexey Kardashevskiy , qemu-ppc@nongnu.org, Alexander Graf , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 3/8] xics: add find_server 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 PAPR allows having multiple interrupr servers. However now we only support one. This adds a server lookup function and makes use of it. At the moment no change is expected. Signed-off-by: Alexey Kardashevskiy --- hw/intc/xics.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 7eac85a..88ef9ef 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -635,14 +635,30 @@ static const TypeInfo ics_info = { /* * Exported functions */ +static int xics_find_server(XICSState *icp, int irq) +{ + int server; + + for (server = 0; server < icp->nr_servers; ++server) { + ICSState *ics = &icp->ics[server]; + if (ics_valid_irq(ics, irq)) { + return server; + } + } + + return -1; +} qemu_irq xics_get_qirq(XICSState *icp, int irq) { - if (!ics_valid_irq(icp->ics, irq)) { - return NULL; + int server = xics_find_server(icp, irq); + + if (server >= 0) { + ICSState *ics = &icp->ics[server]; + return ics->qirqs[irq - ics->offset]; } - return icp->ics->qirqs[irq - icp->ics->offset]; + return NULL; } static void ics_set_irq_type(ICSState *ics, int irq, bool lsi) @@ -653,9 +669,10 @@ static void ics_set_irq_type(ICSState *ics, int irq, bool lsi) void xics_set_irq_type(XICSState *icp, int irq, bool lsi) { - assert(ics_valid_irq(icp->ics, irq)); + int server = xics_find_server(icp, irq); - ics_set_irq_type(icp->ics, irq, lsi); + assert(server >= 0); + ics_set_irq_type(&icp->ics[server], irq, lsi); } /*