From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752098AbdGBVMT (ORCPT ); Sun, 2 Jul 2017 17:12:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:52626 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751894AbdGBVMS (ORCPT ); Sun, 2 Jul 2017 17:12:18 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4AB6922BE1 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: Sun, 2 Jul 2017 16:12:14 -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: <20170702211214.GC18324@bhelgaas-glaptop.roam.corp.google.com> 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> <20170701135457.GB8977@red-moon> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170701135457.GB8977@red-moon> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Jul 01, 2017 at 02:54:57PM +0100, Lorenzo Pieralisi wrote: > 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. Folded into pci/irq-fixups, thanks! > -- >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); > } > > -- > 2.10.0 >