Commit 9af275be authored by Lorenzo Pieralisi's avatar Lorenzo Pieralisi Committed by Bjorn Helgaas

PCI: xgene: Convert PCI scan API to pci_scan_root_bus_bridge()

The introduction of pci_scan_root_bus_bridge() provides a PCI core API to
scan a PCI root bus backed by an already initialized struct pci_host_bridge
object, which simplifies the bus scan interface and makes the PCI scan root
bus interface easier to generalize as members are added to the struct
pci_host_bridge.

Convert PCI xgene host code to pci_scan_root_bus_bridge() to improve the
PCI root bus scanning interface.

Tested-by: Khuong Dinh <kdinh@apm.com>	# with e1000e
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Tanmay Inamdar <tinamdar@apm.com>
parent 8c790a82
...@@ -636,13 +636,16 @@ static int xgene_pcie_probe_bridge(struct platform_device *pdev) ...@@ -636,13 +636,16 @@ static int xgene_pcie_probe_bridge(struct platform_device *pdev)
struct xgene_pcie_port *port; struct xgene_pcie_port *port;
resource_size_t iobase = 0; resource_size_t iobase = 0;
struct pci_bus *bus, *child; struct pci_bus *bus, *child;
struct pci_host_bridge *bridge;
int ret; int ret;
LIST_HEAD(res); LIST_HEAD(res);
port = devm_kzalloc(dev, sizeof(*port), GFP_KERNEL); bridge = devm_pci_alloc_host_bridge(dev, sizeof(*port));
if (!port) if (!bridge)
return -ENOMEM; return -ENOMEM;
port = pci_host_bridge_priv(bridge);
port->node = of_node_get(dn); port->node = of_node_get(dn);
port->dev = dev; port->dev = dev;
...@@ -670,11 +673,17 @@ static int xgene_pcie_probe_bridge(struct platform_device *pdev) ...@@ -670,11 +673,17 @@ static int xgene_pcie_probe_bridge(struct platform_device *pdev)
if (ret) if (ret)
goto error; goto error;
bus = pci_create_root_bus(dev, 0, &xgene_pcie_ops, port, &res); list_splice_init(&res, &bridge->windows);
if (!bus) { bridge->dev.parent = dev;
ret = -ENOMEM; bridge->sysdata = port;
bridge->busnr = 0;
bridge->ops = &xgene_pcie_ops;
ret = pci_scan_root_bus_bridge(bridge);
if (ret < 0)
goto error; goto error;
}
bus = bridge->bus;
pci_scan_child_bus(bus); pci_scan_child_bus(bus);
pci_assign_unassigned_bus_resources(bus); pci_assign_unassigned_bus_resources(bus);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment