From mboxrd@z Thu Jan 1 00:00:00 1970 From: lorenzo.pieralisi@arm.com (Lorenzo Pieralisi) Date: Fri, 15 Dec 2017 13:32:04 +0000 Subject: [PATCH] PCI: xgene: Remove leftover pci_scan_child_bus() call In-Reply-To: References: <20171121154931.7724-1-lorenzo.pieralisi@arm.com> Message-ID: <20171215133204.GC30737@red-moon> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, Dec 08, 2017 at 10:32:52AM -0800, Khuong Dinh wrote: > Hi Lorenzo, > > On Tue, Nov 21, 2017 at 7:49 AM, Lorenzo Pieralisi > wrote: > > The changes in commit 9af275be15f7 ("PCI: xgene: Convert PCI scan API to > > pci_scan_root_bus_bridge()") converted the xgene PCI host driver to > > the new pci_scan_root_bus_bridge() bus scanning API but erroneously left > > the existing pci_scan_child_bus() call in place which resulted in duplicate > > PCI bus enumerations. > > > > Remove the leftover pci_scan_child_bus() call to properly complete the API > > conversion. > > > > Fixes: 9af275be15f7 ("PCI: xgene: Convert PCI scan API to pci_scan_root_bus_bridge()") > > Signed-off-by: Lorenzo Pieralisi > > Cc: Bjorn Helgaas > > Cc: Tanmay Inamdar > > --- > > drivers/pci/host/pci-xgene.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c > > index 465aa2a..e60c457 100644 > > --- a/drivers/pci/host/pci-xgene.c > > +++ b/drivers/pci/host/pci-xgene.c > > @@ -668,7 +668,6 @@ static int xgene_pcie_probe(struct platform_device *pdev) > > > > bus = bridge->bus; > > > > - pci_scan_child_bus(bus); > > pci_assign_unassigned_bus_resources(bus); > > list_for_each_entry(child, &bus->children, node) > > pcie_bus_configure_settings(child); > > -- > > 2.9.5 > > > > It is good with X-Gene > > Tested-by: Khuong Dinh Thank you. Bjorn, I will queue this for v4.16 - I would add a stable tag since we have v4.13+ kernels scanning the bus twice on xgene, I am not too happy about this. Thanks, Lorenzo