From patchwork Thu Apr 2 07:34:33 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 25519 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 28122DE172 for ; Thu, 2 Apr 2009 18:35:31 +1100 (EST) X-Original-To: cbe-oss-dev@ozlabs.org Delivered-To: cbe-oss-dev@ozlabs.org Received: from pophost.sonytel.be (vervifontaine.sonytel.be [80.88.33.193]) by ozlabs.org (Postfix) with ESMTP id 14E01DDEDD; Thu, 2 Apr 2009 18:34:38 +1100 (EST) Received: from vixen.sonytel.be (piraat.sonytel.be [43.221.60.197]) by pophost.sonytel.be (Postfix) with ESMTP id 1047744472; Thu, 2 Apr 2009 09:34:34 +0200 (CEST) Date: Thu, 2 Apr 2009 09:34:33 +0200 (CEST) From: Geert Uytterhoeven To: Benjamin Herrenschmidt In-Reply-To: <1238583750.17330.125.camel@pasglop> Message-ID: References: <1238579652.17330.124.camel@pasglop> <200904011245.01483.arnd@arndb.de> <1238583750.17330.125.camel@pasglop> User-Agent: Alpine 2.00 (LRH 1167 2008-08-23) MIME-Version: 1.0 Cc: linuxppc-dev@ozlabs.org, Cell Broadband Engine OSS Development , Arnd Bergmann Subject: Re: [Cbe-oss-dev] [PATCH] powerpc: PPC_CELL_NATIVE should select PCI X-BeenThere: cbe-oss-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Discussion about Open Source Software for the Cell Broadband Engine List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: cbe-oss-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org On Wed, 1 Apr 2009, Benjamin Herrenschmidt wrote: > On Wed, 2009-04-01 at 12:45 +0200, Arnd Bergmann wrote: > > On Wednesday 01 April 2009, Benjamin Herrenschmidt wrote: > > > On Wed, 2009-04-01 at 11:42 +0200, Geert Uytterhoeven wrote: > > > > PPC_CELL_NATIVE selects PPC_OF_PLATFORM_PCI, but not the underlying PCI, > > > > causing build failures if PCI is not set. > > > > > > Maybe it should only select it if PCI is enabled ? Is qpace using PCI ? > > > > No, QPACE does not have any PCI devices whatsoever. > > so something like select PPC_OF_PLATFORM_PCI if PCI would work you > think ? I gave it a try. Patch below. But that is still not sufficient: | arch/powerpc/platforms/built-in.o:(.toc1+0x4e8): undefined reference to `pci_io_base' due to arch/powerpc/platforms/cell/io-workarounds.c. I guess this file shouldn't be built when CONFIG_PCI=n? As I don't have the hardware to test anyway, I'll give up. With kind regards, Geert Uytterhoeven Software Architect Sony Techsoft Centre Europe The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium Phone: +32 (0)2 700 8453 Fax: +32 (0)2 700 8622 E-mail: Geert.Uytterhoeven@sonycom.com Internet: http://www.sony-europe.com/ A division of Sony Europe (Belgium) N.V. VAT BE 0413.825.160 · RPR Brussels Fortis · BIC GEBABEBB · IBAN BE41293037680010 Acked-by: Benjamin Krill diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig index 40e24c3..fa604b1 100644 --- a/arch/powerpc/platforms/cell/Kconfig +++ b/arch/powerpc/platforms/cell/Kconfig @@ -13,7 +13,7 @@ config PPC_CELL_COMMON config PPC_CELL_NATIVE bool select PPC_CELL_COMMON - select PPC_OF_PLATFORM_PCI + select PPC_OF_PLATFORM_PCI if PCI select MPIC select IBM_NEW_EMAC_EMAC4 select IBM_NEW_EMAC_RGMII diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c index 5930536..628b21f 100644 --- a/arch/powerpc/platforms/cell/setup.c +++ b/arch/powerpc/platforms/cell/setup.c @@ -81,6 +81,7 @@ static void cell_progress(char *s, unsigned short hex) printk("*** %04x : %s\n", hex, s ? s : ""); } +#ifdef CONFIG_PCI static void cell_fixup_pcie_rootcomplex(struct pci_dev *dev) { struct pci_controller *hose; @@ -141,6 +142,7 @@ static int __devinit cell_setup_phb(struct pci_controller *phb) return 0; } +#endif /* CONFIG_PCI */ static int __init cell_publish_devices(void) { @@ -287,5 +289,7 @@ define_machine(cell) { .calibrate_decr = generic_calibrate_decr, .progress = cell_progress, .init_IRQ = cell_init_irq, +#ifdef CONFIG_PCI .pci_setup_phb = cell_setup_phb, +#endif };