From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0Uhp-0003Ly-Ji for qemu-devel@nongnu.org; Fri, 27 Jun 2014 07:52:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X0Uhf-000865-35 for qemu-devel@nongnu.org; Fri, 27 Jun 2014 07:52:37 -0400 From: Alexander Graf Date: Fri, 27 Jun 2014 13:52:17 +0200 Message-Id: <1403869944-31927-26-git-send-email-agraf@suse.de> In-Reply-To: <1403869944-31927-1-git-send-email-agraf@suse.de> References: <1403869944-31927-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PULL 25/32] xics: Add xics_find_source() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc@nongnu.org Cc: Alexey Kardashevskiy , peter.maydell@linaro.org, qemu-devel@nongnu.org From: Alexey Kardashevskiy PAPR allows having multiple interrupt sources such as PHB. This adds a source lookup function and makes use of it. Since at the moment QEMU only supports a single source, no change in behaviour is expected. Signed-off-by: Alexey Kardashevskiy Signed-off-by: Alexander Graf --- hw/intc/xics.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 5220d4f..c02feaf 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -633,14 +633,32 @@ static const TypeInfo ics_info = { /* * Exported functions */ +static int xics_find_source(XICSState *icp, int irq) +{ + int sources = 1; + int src; + + /* FIXME: implement multiple sources */ + for (src = 0; src < sources; ++src) { + ICSState *ics = &icp->ics[src]; + if (ics_valid_irq(ics, irq)) { + return src; + } + } + + return -1; +} qemu_irq xics_get_qirq(XICSState *icp, int irq) { - if (!ics_valid_irq(icp->ics, irq)) { - return NULL; + int src = xics_find_source(icp, irq); + + if (src >= 0) { + ICSState *ics = &icp->ics[src]; + 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 srcno, bool lsi) @@ -653,10 +671,12 @@ static void ics_set_irq_type(ICSState *ics, int srcno, bool lsi) void xics_set_irq_type(XICSState *icp, int irq, bool lsi) { - ICSState *ics = icp->ics; + int src = xics_find_source(icp, irq); + ICSState *ics; - assert(ics_valid_irq(ics, irq)); + assert(src >= 0); + ics = &icp->ics[src]; ics_set_irq_type(ics, irq - ics->offset, lsi); } -- 1.8.1.4