From patchwork Fri Nov 27 16:33:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mel Gorman X-Patchwork-Id: 39631 X-Patchwork-Delegate: benh@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 67C401009F0 for ; Sat, 28 Nov 2009 03:34:18 +1100 (EST) Received: by ozlabs.org (Postfix) id 3306E1007D2; Sat, 28 Nov 2009 03:34:08 +1100 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from gir.skynet.ie (gir.skynet.ie [193.1.99.77]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8A74D1007D1 for ; Sat, 28 Nov 2009 03:34:07 +1100 (EST) Received: from skynet.skynet.ie (skynet.skynet.ie [193.1.99.74]) by gir.skynet.ie (Postfix) with ESMTP id 3386C122F3; Fri, 27 Nov 2009 16:32:00 +0000 (GMT) Received: by skynet.skynet.ie (Postfix, from userid 2391) id 9E3845012F; Fri, 27 Nov 2009 16:33:58 +0000 (GMT) Date: Fri, 27 Nov 2009 16:33:58 +0000 From: Mel Gorman To: Benjamin Herrenschmidt Subject: [PATCH] powerpc: Add Kconfig dependency on PCI_MSI for XICS and select for PSERIES Message-ID: <20091127163358.GP13095@csn.ul.ie> References: <1258459659-11770-1-git-send-email-mel@csn.ul.ie> <1258524332.2140.663.camel@pasglop> <20091118170510.GA1119@csn.ul.ie> <1259289626.2076.1.camel@pasglop> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1259289626.2076.1.camel@pasglop> User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Cc: linuxppc-dev@ozlabs.org, Paul Mackerras , linux-kernel@vger.kernel.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org On Fri, Nov 27, 2009 at 01:40:26PM +1100, Benjamin Herrenschmidt wrote: > On Wed, 2009-11-18 at 17:05 +0000, Mel Gorman wrote: > > > > > diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig > > index 04a8061..a82c470 100644 > > --- a/arch/powerpc/platforms/Kconfig > > +++ b/arch/powerpc/platforms/Kconfig > > @@ -52,9 +52,9 @@ config PPC_UDBG_BEAT > > default n > > > > config XICS > > - depends on PPC_PSERIES > > + depends on PCI_MSI > > bool > > - default y > > + default n > > Why the above ? XICS only exist on PSERIES and select bypass depends in > nasty ways anyways. > You're right. When I made that change, I assumed that a "select foo" would also resolve the dependencies. It doesn't but I failed to back this out as being unnecessary. > > config IPIC > > bool > > diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig > > index f0e6f28..81c2289 100644 > > --- a/arch/powerpc/platforms/pseries/Kconfig > > +++ b/arch/powerpc/platforms/pseries/Kconfig > > @@ -5,6 +5,8 @@ config PPC_PSERIES > > select PPC_I8259 > > select PPC_RTAS > > select RTAS_ERROR_LOGGING > > + select PCI_MSI > > + select XICS > > select PPC_UDBG_16550 > > select PPC_NATIVE > > select PPC_PCI_CHOICE if EMBEDDED > > The above bits look plenty enough. Can you also stick it next to the > MPIC one ? > They are. I can. ==== CUT HERE ==== powerpc: Add Kconfig dependency on PCI_MSI for XICS and select for PSERIES It's possible to set CONFIG_XICS without CONFIG_PCI_MSI. When that happens, the kernel fails to build with arch/powerpc/platforms/built-in.o: In function `.xics_startup': xics.c:(.text+0x12f60): undefined reference to `.unmask_msi_irq' make: *** [.tmp_vmlinux1] Error 1 Furthermore, as noted by Benjamin Herrenschmidt, "CONFIG_XICS should be made invisible and selected by PSERIES." This patch adds the dependency in KConfig for XICS on PCI_MSI. When PSERIES support is being configured, both options are silently selected. Signed-off-by: Mel Gorman --- arch/powerpc/platforms/pseries/Kconfig | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig index f0e6f28..60d53ed 100644 --- a/arch/powerpc/platforms/pseries/Kconfig +++ b/arch/powerpc/platforms/pseries/Kconfig @@ -2,6 +2,8 @@ config PPC_PSERIES depends on PPC64 && PPC_BOOK3S bool "IBM pSeries & new (POWER5-based) iSeries" select MPIC + select PCI_MSI + select XICS select PPC_I8259 select PPC_RTAS select RTAS_ERROR_LOGGING