Commit 52774076 authored by Lorenzo Pieralisi's avatar Lorenzo Pieralisi Committed by Bjorn Helgaas

PCI: iproc: 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 iproc host code to pci_scan_root_bus_bridge() to improve the
PCI root bus scanning interface.
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Scott Branden <sbranden@broadcom.com>
Cc: Ray Jui <rjui@broadcom.com>
Cc: Jon Mason <jonmason@broadcom.com>
parent 90634e85
...@@ -45,12 +45,15 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev) ...@@ -45,12 +45,15 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev)
struct device *dev = &bdev->dev; struct device *dev = &bdev->dev;
struct iproc_pcie *pcie; struct iproc_pcie *pcie;
LIST_HEAD(resources); LIST_HEAD(resources);
struct pci_host_bridge *bridge;
int ret; int ret;
pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL); bridge = devm_pci_alloc_host_bridge(dev, sizeof(*pcie));
if (!pcie) if (!bridge)
return -ENOMEM; return -ENOMEM;
pcie = pci_host_bridge_priv(bridge);
pcie->dev = dev; pcie->dev = dev;
pcie->type = IPROC_PCIE_PAXB_BCMA; pcie->type = IPROC_PCIE_PAXB_BCMA;
......
...@@ -52,12 +52,15 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev) ...@@ -52,12 +52,15 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev)
struct resource reg; struct resource reg;
resource_size_t iobase = 0; resource_size_t iobase = 0;
LIST_HEAD(resources); LIST_HEAD(resources);
struct pci_host_bridge *bridge;
int ret; int ret;
pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL); bridge = devm_pci_alloc_host_bridge(dev, sizeof(*pcie));
if (!pcie) if (!bridge)
return -ENOMEM; return -ENOMEM;
pcie = pci_host_bridge_priv(bridge);
pcie->dev = dev; pcie->dev = dev;
pcie->type = (enum iproc_pcie_type) of_device_get_match_data(dev); pcie->type = (enum iproc_pcie_type) of_device_get_match_data(dev);
......
...@@ -1259,7 +1259,8 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) ...@@ -1259,7 +1259,8 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res)
struct device *dev; struct device *dev;
int ret; int ret;
void *sysdata; void *sysdata;
struct pci_bus *bus, *child; struct pci_bus *child;
struct pci_host_bridge *host = pci_host_bridge_from_priv(pcie);
dev = pcie->dev; dev = pcie->dev;
...@@ -1306,18 +1307,10 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) ...@@ -1306,18 +1307,10 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res)
sysdata = pcie; sysdata = pcie;
#endif #endif
bus = pci_create_root_bus(dev, 0, &iproc_pcie_ops, sysdata, res);
if (!bus) {
dev_err(dev, "unable to create PCI root bus\n");
ret = -ENOMEM;
goto err_power_off_phy;
}
pcie->root_bus = bus;
ret = iproc_pcie_check_link(pcie); ret = iproc_pcie_check_link(pcie);
if (ret) { if (ret) {
dev_err(dev, "no PCIe EP device detected\n"); dev_err(dev, "no PCIe EP device detected\n");
goto err_rm_root_bus; goto err_power_off_phy;
} }
iproc_pcie_enable(pcie); iproc_pcie_enable(pcie);
...@@ -1326,23 +1319,32 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) ...@@ -1326,23 +1319,32 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res)
if (iproc_pcie_msi_enable(pcie)) if (iproc_pcie_msi_enable(pcie))
dev_info(dev, "not using iProc MSI\n"); dev_info(dev, "not using iProc MSI\n");
pci_scan_child_bus(bus); list_splice_init(res, &host->windows);
pci_assign_unassigned_bus_resources(bus); host->busnr = 0;
host->dev.parent = dev;
host->ops = &iproc_pcie_ops;
host->sysdata = sysdata;
ret = pci_scan_root_bus_bridge(host);
if (ret < 0) {
dev_err(dev, "failed to scan host: %d\n", ret);
goto err_power_off_phy;
}
if (pcie->map_irq) if (pcie->map_irq)
pci_fixup_irqs(pci_common_swizzle, pcie->map_irq); pci_fixup_irqs(pci_common_swizzle, pcie->map_irq);
list_for_each_entry(child, &bus->children, node) pci_assign_unassigned_bus_resources(host->bus);
pcie->root_bus = host->bus;
list_for_each_entry(child, &host->bus->children, node)
pcie_bus_configure_settings(child); pcie_bus_configure_settings(child);
pci_bus_add_devices(bus); pci_bus_add_devices(host->bus);
return 0; return 0;
err_rm_root_bus:
pci_stop_root_bus(bus);
pci_remove_root_bus(bus);
err_power_off_phy: err_power_off_phy:
phy_power_off(pcie->phy); phy_power_off(pcie->phy);
err_exit_phy: err_exit_phy:
......
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