From patchwork Sat Jul 1 13:54:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Pieralisi X-Patchwork-Id: 9820883 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 60E5960375 for ; Sat, 1 Jul 2017 13:53:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F47428517 for ; Sat, 1 Jul 2017 13:53:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 43BC328535; Sat, 1 Jul 2017 13:53:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E379228517 for ; Sat, 1 Jul 2017 13:53:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vJEqxr7WS5c/EqxEFAFpcoeIjpAH9b5fwEnvZWDRnSs=; b=dkLw50le/CiTk9 5aA2Sop4hXLqhkmCPkHNHRH1Iwn9plRXz/+o8IRidkbngOWvR6DewTfjFB5rLp9rJcoyv+zMvapPY +v71+WoZhDXuhXPtZ0cmXV0ebIZU97LFWz9EFdlkI1lTZ0f0GUic3i/Bio/skrEffHWtstKydANQ8 Cfj956xwFgemJ0PXW6DLaEl0FWRpp3xuDSn1Q4lKg9r2prDdisRRebZfXT1S2NsNMSyGZ0cF+iZIC jPHUchzk8hefRh/wpbgYOS0RePtfGzwWLL8giBLsT5UaJQPUM0/2p7UdCkAfbm0/lR/ukpSKW/mDb gXUKrcuQT/edfs78D2FA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dRIqJ-0004Eh-KL; Sat, 01 Jul 2017 13:53:47 +0000 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dRIqG-00048i-KF for linux-arm-kernel@lists.infradead.org; Sat, 01 Jul 2017 13:53:46 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7AE022B; Sat, 1 Jul 2017 06:53:23 -0700 (PDT) Received: from red-moon (red-moon.cambridge.arm.com [10.1.206.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DDAEB3F581; Sat, 1 Jul 2017 06:53:21 -0700 (PDT) Date: Sat, 1 Jul 2017 14:54:57 +0100 From: Lorenzo Pieralisi To: Bjorn Helgaas Subject: Re: [PATCH 2/4] ARM/PCI: mv78xx0: pass pci_ops correctly again Message-ID: <20170701135457.GB8977@red-moon> References: <20170621215323.3921382-1-arnd@arndb.de> <20170621215323.3921382-2-arnd@arndb.de> <20170622093855.GA23310@red-moon> <20170627231143.GI17844@bhelgaas-glaptop.roam.corp.google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170627231143.GI17844@bhelgaas-glaptop.roam.corp.google.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170701_065344_693678_139AAFAA X-CRM114-Status: GOOD ( 24.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Lunn , Jason Cooper , Arnd Bergmann , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas , Gregory Clement , linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Bjorn, On Tue, Jun 27, 2017 at 06:11:43PM -0500, Bjorn Helgaas wrote: > On Thu, Jun 22, 2017 at 10:38:55AM +0100, Lorenzo Pieralisi wrote: > > On Wed, Jun 21, 2017 at 11:53:00PM +0200, Arnd Bergmann wrote: > > > We used to pass the operations when calling pci_scan_root_bus, but > > > that argument was removed: > > > > > > arch/arm/mach-mv78xx0/pcie.c:175:23: error: 'pcie_ops' defined but not used [-Werror=unused-variable] > > > > > > Setting it in pci_hw should address this. > > > > No unfortunately it does not. The way I structured the code the > > bridge set-up is carried out in the struct hw_pci.scan() callback and > > for mv78xx0 it was not done properly. > > > > As said in the other thread we need a pci_fixup_irqs() removal v3 to > > address these issues, given that on some host bridges v2 it is still > > untested. > > > > Lorenzo > > > > > Fixes: ace27646da8e ("ARM/PCI: Convert PCI scan API to pci_scan_root_bus_bridge()") > > > Signed-off-by: Arnd Bergmann > > > --- > > > arch/arm/mach-mv78xx0/pcie.c | 1 + > > > 1 file changed, 1 insertion(+) > > > > > > diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c > > > index 2b406e909a43..cb7f95c9d8eb 100644 > > > --- a/arch/arm/mach-mv78xx0/pcie.c > > > +++ b/arch/arm/mach-mv78xx0/pcie.c > > > @@ -214,6 +214,7 @@ static int __init mv78xx0_pcie_map_irq(const struct pci_dev *dev, u8 slot, > > > } > > > > > > static struct hw_pci mv78xx0_pci __initdata = { > > > + .ops = &pcie_ops, > > > .nr_controllers = 8, > > > .preinit = mv78xx0_pcie_preinit, > > > .setup = mv78xx0_pcie_setup, > > I provisionally made the following change for mv78xx0, based on similar > hunks for dove, iop13xx, and orion5x. > > This is on my pci/enumeration branch: > > https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git/commit/?h=pci/enumeration&id=31ddd0eab68e19cf3dfc14321c99ff0b95cda4ad > > Please take a look and see if it makes sense. It makes code compile but it is missing some initializations. Patch below, to be folded in commit e592c4a52cb8 ("ARM/PCI: Convert PCI scan API to pci_scan_root_bus_bridge()") in your pci/irq-fixups branch, I did that and recompiled (I can't test this code) and everything seems fine. Thanks a lot ! Lorenzo -- >8 -- diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c index f793ebb..636d84b 100644 --- a/arch/arm/mach-mv78xx0/pcie.c +++ b/arch/arm/mach-mv78xx0/pcie.c @@ -196,12 +196,19 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup); static int __init mv78xx0_pcie_scan_bus(int nr, struct pci_host_bridge *bridge) { + struct pci_sys_data *sys = pci_host_bridge_priv(bridge); + if (nr >= num_pcie_ports) { BUG(); return -EINVAL; } + list_splice_init(&sys->resources, &bridge->windows); + bridge->dev.parent = NULL; + bridge->sysdata = sys; + bridge->busnr = sys->busnr; bridge->ops = &pcie_ops; + return pci_scan_root_bus_bridge(bridge); }