request for 4.14-stable: 94b9d290b753 ("PCI: xgene: Remove leftover pci_scan_child_bus() call")

request for 4.14-stable: 94b9d290b753 ("PCI: xgene: Remove leftover pci_scan_child_bus() call")

[Sudip Mukherjee]

[-- Attachment #1: Type: text/plain, Size: 89 bytes --]

Hi Greg,

This was missing in 4.14-stable. Please apply to your queue.

--
Regards
Sudip

[-- Attachment #2: 0002-PCI-xgene-Remove-leftover-pci_scan_child_bus-call.patch --]
[-- Type: text/x-diff, Size: 1593 bytes --]

>From 1bdae61ffe132464b5d3040ba122709ab36e1224 Mon Sep 17 00:00:00 2001
From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Date: Tue, 21 Nov 2017 15:49:31 +0000
Subject: [PATCH] PCI: xgene: Remove leftover pci_scan_child_bus() call

commit 94b9d290b753cbbc87971ee134511245f5872a83 upstream

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()")
Tested-by: Khuong Dinh <kdinh@apm.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: <stable@vger.kernel.org> # 4.13+
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Tanmay Inamdar <tinamdar@apm.com>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
---
 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 087645116ecb..c78fd9c2cf8c 100644
--- a/drivers/pci/host/pci-xgene.c
+++ b/drivers/pci/host/pci-xgene.c
@@ -686,7 +686,6 @@ static int xgene_pcie_probe_bridge(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.11.0

Re: request for 4.14-stable: 94b9d290b753 ("PCI: xgene: Remove leftover pci_scan_child_bus() call")

[Greg Kroah-Hartman]

On Sun, Jul 29, 2018 at 06:56:54PM +0100, Sudip Mukherjee wrote:
> Hi Greg,
> 
> This was missing in 4.14-stable. Please apply to your queue.

Now applied, thanks.

greg k-h