Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49b8e3f3 authored by Cyrille Pitchen's avatar Cyrille Pitchen Committed by Lorenzo Pieralisi
Browse files

PCI: Add generic function to probe PCI host controllers 



This patchs moves generic source code from
drivers/pci/host/pci-host-common.c into drivers/pci/probe.c.

Indeed the extracted lines of code were duplicated by many host
controller drivers. Regrouping them into a generic function gives a
change to properly share this code without introducing a useless
dependency to PCI_HOST_COMMON, which selects PCI_ECAM when not needed by
most host controller drivers.

Signed-off-by: default avatarCyrille Pitchen <cyrille.pitchen@free-electrons.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent c6dd8ecf

drivers/pci/host/pci-host-common.c

+1 −21
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ int pci_host_common_probe(struct platform_device *pdev, 
	const char *type;

	struct device *dev = &pdev->dev;

	struct device_node *np = dev->of_node;

	struct pci_bus *bus, *child;

	struct pci_host_bridge *bridge;

	struct pci_config_window *cfg;

	struct list_head resources;
@@ -107,30 +106,11 @@ int pci_host_common_probe(struct platform_device *pdev, 
	bridge->map_irq = of_irq_parse_and_map_pci;

	bridge->swizzle_irq = pci_common_swizzle;



	ret = pci_scan_root_bus_bridge(bridge);

	ret = pci_host_probe(bridge);

	if (ret < 0) {

		dev_err(dev, "Scanning root bridge failed");

		pci_free_resource_list(&resources);

		return ret;

	}



	bus = bridge->bus;



	/*

	 * We insert PCI resources into the iomem_resource and

	 * ioport_resource trees in either pci_bus_claim_resources()

	 * or pci_bus_assign_resources().

	 */

	if (pci_has_flag(PCI_PROBE_ONLY)) {

		pci_bus_claim_resources(bus);

	} else {

		pci_bus_size_bridges(bus);

		pci_bus_assign_resources(bus);



		list_for_each_entry(child, &bus->children, node)

			pcie_bus_configure_settings(child);

	}



	pci_bus_add_devices(bus);

	return 0;

}

drivers/pci/probe.c

+33 −0
Original line number Diff line number Diff line
@@ -2620,6 +2620,39 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, 
}

EXPORT_SYMBOL_GPL(pci_create_root_bus);



int pci_host_probe(struct pci_host_bridge *bridge)

{

	struct pci_bus *bus, *child;

	int ret;



	ret = pci_scan_root_bus_bridge(bridge);

	if (ret < 0) {

		dev_err(bridge->dev.parent, "Scanning root bridge failed");

		return ret;

	}



	bus = bridge->bus;



	/*

	 * We insert PCI resources into the iomem_resource and

	 * ioport_resource trees in either pci_bus_claim_resources()

	 * or pci_bus_assign_resources().

	 */

	if (pci_has_flag(PCI_PROBE_ONLY)) {

		pci_bus_claim_resources(bus);

	} else {

		pci_bus_size_bridges(bus);

		pci_bus_assign_resources(bus);



		list_for_each_entry(child, &bus->children, node)

			pcie_bus_configure_settings(child);

	}



	pci_bus_add_devices(bus);

	return 0;

}

EXPORT_SYMBOL_GPL(pci_host_probe);



int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int bus_max)

{

	struct resource *res = &b->busn_res;

include/linux/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -887,6 +887,7 @@ struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata); 
struct pci_bus *pci_create_root_bus(struct device *parent, int bus,

				    struct pci_ops *ops, void *sysdata,

				    struct list_head *resources);

int pci_host_probe(struct pci_host_bridge *bridge);

int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int busmax);

int pci_bus_update_busn_res_end(struct pci_bus *b, int busmax);

void pci_bus_release_busn_res(struct pci_bus *b);