From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754355AbbCCDLG (ORCPT ); Mon, 2 Mar 2015 22:11:06 -0500 Received: from mail-oi0-f46.google.com ([209.85.218.46]:45517 "EHLO mail-oi0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751610AbbCCDLD (ORCPT ); Mon, 2 Mar 2015 22:11:03 -0500 Date: Mon, 2 Mar 2015 21:10:59 -0600 From: Bjorn Helgaas To: Yijing Wang Cc: Jiang Liu , linux-pci@vger.kernel.org, Yinghai Lu , linux-kernel@vger.kernel.org, Marc Zyngier , linux-arm-kernel@lists.infradead.org, Russell King , x86@kernel.org, Thomas Gleixner , Benjamin Herrenschmidt , Rusty Russell , Tony Luck , linux-ia64@vger.kernel.org, "David S. Miller" , Guan Xuetao , linux-alpha@vger.kernel.org, linux-m68k@vger.kernel.org, Liviu Dudau , Arnd Bergmann , Geert Uytterhoeven , sparclinux@vger.kernel.org Subject: Re: [PATCH v4 20/30] PCI/sparc: Use pci_scan_root_bridge() for simplicity Message-ID: <20150303031059.GJ11978@google.com> References: <1424938344-4017-1-git-send-email-wangyijing@huawei.com> <1424938344-4017-21-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1424938344-4017-21-git-send-email-wangyijing@huawei.com> 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 Thu, Feb 26, 2015 at 04:12:14PM +0800, Yijing Wang wrote: > Now we could use pci_scan_root_bridge() to scan > pci buses, provide sparc specific pci_host_bridge_ops. > > Signed-off-by: Yijing Wang > CC: "David S. Miller" > CC: sparclinux@vger.kernel.org > --- > arch/sparc/kernel/pci.c | 32 ++++++++++++++++++++++---------- > 1 files changed, 22 insertions(+), 10 deletions(-) > > diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c > index 0af7c58..03e7376 100644 > --- a/arch/sparc/kernel/pci.c > +++ b/arch/sparc/kernel/pci.c > @@ -650,12 +650,25 @@ static void pci_claim_bus_resources(struct pci_bus *bus) > pci_claim_bus_resources(child_bus); > } > > +static void pci_host_bridge_of_scan_bus( > + struct pci_host_bridge *host) > +{ > + struct pci_pbm_info *pbm = dev_get_drvdata(&host->dev); > + struct device_node *node = pbm->op->dev.of_node; > + > + pci_of_scan_bus(pbm, node, host->bus); > +} > + > +static struct pci_host_bridge_ops phb_ops = { > + .phb_of_scan_bus = pci_host_bridge_of_scan_bus, > +}; > + > struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm, > struct device *parent) > { > LIST_HEAD(resources); > struct device_node *node = pbm->op->dev.of_node; > - struct pci_bus *bus; > + struct pci_host_bridge *host; > > printk("PCI: Scanning PBM %s\n", node->full_name); > > @@ -667,23 +680,22 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm, > pbm->busn.end = pbm->pci_last_busno; > pbm->busn.flags = IORESOURCE_BUS; > pci_add_resource(&resources, &pbm->busn); > - bus = pci_create_root_bus(parent, > + host = pci_scan_root_bridge(parent, > PCI_DOMBUS(pbm->index, pbm->pci_first_busno), > - pbm->pci_ops, pbm, &resources); > - if (!bus) { > - printk(KERN_ERR "Failed to create bus for %s\n", > + pbm->pci_ops, pbm, &resources, &phb_ops); > + if (!host) { > + printk(KERN_ERR "Failed to create host bridge for %s\n", > node->full_name); > pci_free_resource_list(&resources); > return NULL; > } > > - pci_of_scan_bus(pbm, node, bus); > - pci_bus_add_devices(bus); > - pci_bus_register_of_sysfs(bus); > + pci_bus_add_devices(host->bus); > + pci_bus_register_of_sysfs(host->bus); > > - pci_claim_bus_resources(bus); > + pci_claim_bus_resources(host->bus); Isn't this a case where pci_claim_bus_resources() should be done before pci_bus_add_devices()? You didn't introduce this problem, but since you're fixing similar issues, seems like we should fix this one, too. In a patch of its own, of course. > > - return bus; > + return host->bus; > } > > void pcibios_fixup_bus(struct pci_bus *pbus) > -- > 1.7.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/