From patchwork Thu Oct 11 11:47:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 190883 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D72AE2C0086 for ; Thu, 11 Oct 2012 23:05:19 +1100 (EST) Received: from localhost ([::1]:33548 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMHEi-00079z-Ia for incoming@patchwork.ozlabs.org; Thu, 11 Oct 2012 07:47:32 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMHE9-0005ou-HL for qemu-devel@nongnu.org; Thu, 11 Oct 2012 07:47:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TMHDz-0002ZA-2j for qemu-devel@nongnu.org; Thu, 11 Oct 2012 07:46:57 -0400 Received: from ozlabs.org ([203.10.76.45]:42569) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMHDy-0002Yd-NU; Thu, 11 Oct 2012 07:46:46 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 384DD2C0091; Thu, 11 Oct 2012 22:46:43 +1100 (EST) From: David Gibson To: agraf@suse.de Date: Thu, 11 Oct 2012 21:47:39 +1000 Message-Id: <1349956064-26709-4-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1349956064-26709-1-git-send-email-david@gibson.dropbear.id.au> References: <1349956064-26709-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 203.10.76.45 Cc: Michael Ellerman , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH 3/8] pseries: Use #define for XICS base irq number 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 From: Ben Herrenschmidt Currently the lowest "real" irq number for the XICS irq controller (as opposed to numbers reserved for IPIs and other special purposes) is hard coded as 16 in two places - in xics_system_init() and in spapr.c. As well as being generally bad practice, we're going to need to change this number soon to fit in with the in-kernel XICS implementation. This patch adds a #define for this number to avoid future breakage. Signed-off-by: Michael Ellerman Signed-off-by: Ben Herrenschmidt Signed-off-by: David Gibson --- hw/spapr.c | 2 +- hw/xics.c | 2 +- hw/xics.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/spapr.c b/hw/spapr.c index 64c35a8..789c941 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -798,7 +798,7 @@ static void ppc_spapr_init(ram_addr_t ram_size, /* Set up Interrupt Controller */ spapr->icp = xics_system_init(XICS_IRQS); - spapr->next_irq = 16; + spapr->next_irq = XICS_IRQ_BASE; /* Set up EPOW events infrastructure */ spapr_events_init(spapr); diff --git a/hw/xics.c b/hw/xics.c index 7a899dd..db01fe3 100644 --- a/hw/xics.c +++ b/hw/xics.c @@ -548,7 +548,7 @@ struct icp_state *xics_system_init(int nr_irqs) ics = g_malloc0(sizeof(*ics)); ics->nr_irqs = nr_irqs; - ics->offset = 16; + ics->offset = XICS_IRQ_BASE; ics->irqs = g_malloc0(nr_irqs * sizeof(struct ics_irq_state)); icp->ics = ics; diff --git a/hw/xics.h b/hw/xics.h index 6817268..c3bf008 100644 --- a/hw/xics.h +++ b/hw/xics.h @@ -28,6 +28,7 @@ #define __XICS_H__ #define XICS_IPI 0x2 +#define XICS_IRQ_BASE 0x10 struct icp_state;