From patchwork Tue Jun 27 23:11:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 9813247 X-Patchwork-Delegate: bhelgaas@google.com 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 21EB160329 for ; Tue, 27 Jun 2017 23:11:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0501F25223 for ; Tue, 27 Jun 2017 23:11:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D83E42684F; Tue, 27 Jun 2017 23:11: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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55E9425223 for ; Tue, 27 Jun 2017 23:11:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753935AbdF0XLr (ORCPT ); Tue, 27 Jun 2017 19:11:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:52174 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753880AbdF0XLq (ORCPT ); Tue, 27 Jun 2017 19:11:46 -0400 Received: from localhost (unknown [69.71.4.159]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 90709214E2; Tue, 27 Jun 2017 23:11:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 90709214E2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=helgaas@kernel.org Date: Tue, 27 Jun 2017 18:11:43 -0500 From: Bjorn Helgaas To: Lorenzo Pieralisi Cc: Arnd Bergmann , Andrew Lunn , Jason Cooper , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Gregory Clement , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth Subject: Re: [PATCH 2/4] ARM/PCI: mv78xx0: pass pci_ops correctly again Message-ID: <20170627231143.GI17844@bhelgaas-glaptop.roam.corp.google.com> References: <20170621215323.3921382-1-arnd@arndb.de> <20170621215323.3921382-2-arnd@arndb.de> <20170622093855.GA23310@red-moon> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170622093855.GA23310@red-moon> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c index 2b406e909a43..f793ebbd7539 100644 --- a/arch/arm/mach-mv78xx0/pcie.c +++ b/arch/arm/mach-mv78xx0/pcie.c @@ -201,6 +201,7 @@ static int __init mv78xx0_pcie_scan_bus(int nr, struct pci_host_bridge *bridge) return -EINVAL; } + bridge->ops = &pcie_ops; return pci_scan_root_bus_bridge(bridge); }