PCI: xgene: Remove leftover pci_scan_child_bus() call

PATCH New Lorenzo Pieralisi 2 participants 4 messages Nov 21, 2017 – Dec 15, 2017 PCI

Share & tools

Lorenzo Pieralisi

author

2017-11-21 15:49 UTC #0 lore raw

PATCH 1/1 PCI: xgene: Remove leftover pci_scan_child_bus() call

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 <[email protected]>

Cc Bjorn Helgaas <[email protected]>

Cc Tanmay Inamdar <[email protected]>

---
 drivers/pci/host/pci-xgene.c | 1 -
 1 file changed, 1 deletion(-)

drivers/pci/host/pci-xgene.c +0 -1

index 465aa2a..e60c457 100644
@@ -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);

Signature · 1 line

2.9.5

Lorenzo Pieralisi

author

2017-12-08 11:23 UTC #1 lore raw

PATCH 1/1 PCI: xgene: Remove leftover pci_scan_child_bus() call

Hi Tanmay,

Quoted 9 lines · Lorenzo Pieralisi

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.

Quoted 7 lines

Fixes 9af275be15f7 ("PCI: xgene: Convert PCI scan API to pci_scan_root_bus_bridge()")
Signed-off-by Lorenzo Pieralisi <[email protected]>
Cc Bjorn Helgaas <[email protected]>
Cc Tanmay Inamdar <[email protected]>
---
 drivers/pci/host/pci-xgene.c | 1 -
 1 file changed, 1 deletion(-)

Would you mind testing this fix and tag accordingly so that I can ask Bjorn to pull it please ?

Thanks,
Lorenzo

Quoted 15 lines

drivers/pci/host/pci-xgene.c +0 -1

index 465aa2a..e60c457 100644
@@ -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);

Signature · 1 line

2.9.5

Khuong Dinh

2017-12-08 18:32 UTC #2 lore raw

PATCH 1/1 PCI: xgene: Remove leftover pci_scan_child_bus() call

In reply to Lorenzo Pieralisi

Hi Lorenzo,

Quoted 30 lines · Lorenzo Pieralisi

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 <[email protected]>
Cc Bjorn Helgaas <[email protected]>
Cc Tanmay Inamdar <[email protected]>
---
 drivers/pci/host/pci-xgene.c | 1 -
 1 file changed, 1 deletion(-)
drivers/pci/host/pci-xgene.c +0 -2
index 465aa2a..e60c457 100644
@@ -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);
--

Quoted 2 lines

2.9.5

It is good with X-Gene

Tested-by Khuong Dinh <[email protected]>

Lorenzo Pieralisi

author

2017-12-15 13:32 UTC #3 lore raw

PATCH 1/1 PCI: xgene: Remove leftover pci_scan_child_bus() call

Quoted 39 lines · Khuong Dinh

Hi Lorenzo,
Quoted 30 lines · Lorenzo Pieralisi
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 <[email protected]>
Cc Bjorn Helgaas <[email protected]>
Cc Tanmay Inamdar <[email protected]>
---
 drivers/pci/host/pci-xgene.c | 1 -
 1 file changed, 1 deletion(-)
drivers/pci/host/pci-xgene.c +0 -2
index 465aa2a..e60c457 100644
@@ -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);
--
Quoted 2 lines
2.9.5
It is good with X-Gene

Quoted 1 line

Tested-by Khuong Dinh <[email protected]>

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