From patchwork Wed Nov 18 17:05:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mel Gorman X-Patchwork-Id: 38763 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 65835100934 for ; Thu, 19 Nov 2009 04:05:29 +1100 (EST) Received: by ozlabs.org (Postfix) id AB27DB6EEE; Thu, 19 Nov 2009 04:05:19 +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 0BEFCB7B9F for ; Thu, 19 Nov 2009 04:05:18 +1100 (EST) Received: from skynet.skynet.ie (skynet.skynet.ie [193.1.99.74]) by gir.skynet.ie (Postfix) with ESMTP id 552531010E; Wed, 18 Nov 2009 17:03:43 +0000 (GMT) Received: by skynet.skynet.ie (Postfix, from userid 2391) id EFE645017E; Wed, 18 Nov 2009 17:05:10 +0000 (GMT) Date: Wed, 18 Nov 2009 17:05:10 +0000 From: Mel Gorman To: Benjamin Herrenschmidt Subject: Re: [PATCH 0/4] powerpc: Fix minor build issues on 2.6.32-rc7 without CONFIG_XICS set Message-ID: <20091118170510.GA1119@csn.ul.ie> References: <1258459659-11770-1-git-send-email-mel@csn.ul.ie> <1258524332.2140.663.camel@pasglop> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1258524332.2140.663.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 Wed, Nov 18, 2009 at 05:05:32PM +1100, Benjamin Herrenschmidt wrote: > On Tue, 2009-11-17 at 12:07 +0000, Mel Gorman wrote: > > KConfig doesn't require CONFIG_XICS to be set with CONFIG_PSERIES but if > > it's not set, there are numerous small build errors. This is a small series > > of patches to allow CONFIG_XICS to be unset in the config. > > > > XICS appears to be some sort of interrupt controller but I'm not sure how > > common it is on systems that require CONFIG_PSERIES. If CONFIG_PSERIES > > universally requires CONFIG_XICS, the better path might be to force it to > > be set. > > > > Testing was building with make oldconfig a configuration from 2.6.31 on > > a PPC970. > > CONFIG_XICS should be made invisible and selected by PSERIES. > Like so? ==== 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/Kconfig | 4 ++-- arch/powerpc/platforms/pseries/Kconfig | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) 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 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