Commit 81ce3cf4 authored by Rob Herring's avatar Rob Herring Committed by Lorenzo Pieralisi
Browse files

PCI: iproc: Use pci_host_probe() to register host 

The iproc host driver does the same host registration and bus scanning
calls as pci_host_probe, so let's use it instead.

The only difference is pci_assign_unassigned_bus_resources() was called
instead of pci_bus_size_bridges() and pci_bus_assign_resources(). This
should be the same.

Link: https://lore.kernel.org/r/20200522234832.954484-12-robh@kernel.org


Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarScott Branden <scott.branden@broadcom.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Ray Jui <rjui@broadcom.com>
Cc: Scott Branden <sbranden@broadcom.com>
Cc: bcm-kernel-feedback-list@broadcom.com
parent c63aed73

drivers/pci/controller/pcie-iproc.c

+5 −13
Original line number Diff line number Diff line
@@ -1470,7 +1470,6 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) 
{

	struct device *dev;

	int ret;

	struct pci_bus *child;

	struct pci_host_bridge *host = pci_host_bridge_from_priv(pcie);



	dev = pcie->dev;
@@ -1531,21 +1530,12 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) 
	host->map_irq = pcie->map_irq;

	host->swizzle_irq = pci_common_swizzle;



	ret = pci_scan_root_bus_bridge(host);

	ret = pci_host_probe(host);

	if (ret < 0) {

		dev_err(dev, "failed to scan host: %d\n", ret);

		goto err_power_off_phy;

	}



	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);



	pci_bus_add_devices(host->bus);



	return 0;



err_power_off_phy:
@@ -1558,8 +1548,10 @@ EXPORT_SYMBOL(iproc_pcie_setup); 


int iproc_pcie_remove(struct iproc_pcie *pcie)

{

	pci_stop_root_bus(pcie->root_bus);

	pci_remove_root_bus(pcie->root_bus);

	struct pci_host_bridge *host = pci_host_bridge_from_priv(pcie);



	pci_stop_root_bus(host->bus);

	pci_remove_root_bus(host->bus);



	iproc_pcie_msi_disable(pcie);

drivers/pci/controller/pcie-iproc.h

+0 −2
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ struct iproc_msi; 
 * @reg_offsets: register offsets

 * @base: PCIe host controller I/O register base

 * @base_addr: PCIe host controller register base physical address

 * @root_bus: pointer to root bus

 * @phy: optional PHY device that controls the Serdes

 * @map_irq: function callback to map interrupts

 * @ep_is_internal: indicates an internal emulated endpoint device is connected
@@ -85,7 +84,6 @@ struct iproc_pcie { 
	void __iomem *base;

	phys_addr_t base_addr;

	struct resource mem;

	struct pci_bus *root_bus;

	struct phy *phy;

	int (*map_irq)(const struct pci_dev *, u8, u8);

	bool ep_is_internal;