Commit 7bd4c4a7 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/mmio-dma-ranges' 

  - Consolidate DT "dma-ranges" parsing and convert all host drivers to use
    shared parsing (Rob Herring)

* remotes/lorenzo/pci/mmio-dma-ranges:
  PCI: Make devm_of_pci_get_host_bridge_resources() static
  PCI: rcar: Use inbound resources for setup
  PCI: iproc: Use inbound resources for setup
  PCI: xgene: Use inbound resources for setup
  PCI: v3-semi: Use inbound resources for setup
  PCI: ftpci100: Use inbound resources for setup
  PCI: of: Add inbound resource parsing to helpers
  PCI: versatile: Enable COMPILE_TEST
  PCI: versatile: Remove usage of PHYS_OFFSET
  PCI: versatile: Use pci_parse_request_of_pci_ranges()
  PCI: xilinx-nwl: Use pci_parse_request_of_pci_ranges()
  PCI: xilinx: Use pci_parse_request_of_pci_ranges()
  PCI: xgene: Use pci_parse_request_of_pci_ranges()
  PCI: v3-semi: Use pci_parse_request_of_pci_ranges()
  PCI: rockchip: Drop storing driver private outbound resource data
  PCI: rockchip: Use pci_parse_request_of_pci_ranges()
  PCI: mobiveil: Use pci_parse_request_of_pci_ranges()
  PCI: mediatek: Use pci_parse_request_of_pci_ranges()
  PCI: iproc: Use pci_parse_request_of_pci_ranges()
  PCI: faraday: Use pci_parse_request_of_pci_ranges()
  PCI: dwc: Use pci_parse_request_of_pci_ranges()
  PCI: altera: Use pci_parse_request_of_pci_ranges()
  PCI: aardvark: Use pci_parse_request_of_pci_ranges()
  PCI: Export pci_parse_request_of_pci_ranges()
  resource: Add a resource_list_first_type helper

# Conflicts:
#	drivers/pci/controller/pcie-rcar.c
parents d8ddab63 3b55809c

drivers/pci/controller/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ config PCI_V3_SEMI 


config PCI_VERSATILE

	bool "ARM Versatile PB PCI controller"

	depends on ARCH_VERSATILE

	depends on ARCH_VERSATILE || COMPILE_TEST



config PCIE_IPROC

	tristate

drivers/pci/controller/cadence/pcie-cadence-host.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static int cdns_pcie_host_init(struct device *dev, 
	int err;



	/* Parse our PCI ranges and request their resources */

	err = pci_parse_request_of_pci_ranges(dev, resources, &bus_range);

	err = pci_parse_request_of_pci_ranges(dev, resources, NULL, &bus_range);

	if (err)

		return err;

drivers/pci/controller/dwc/pcie-designware-host.c

+9 −20
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ int dw_pcie_host_init(struct pcie_port *pp) 
	struct device *dev = pci->dev;

	struct device_node *np = dev->of_node;

	struct platform_device *pdev = to_platform_device(dev);

	struct resource_entry *win, *tmp;

	struct resource_entry *win;

	struct pci_bus *child;

	struct pci_host_bridge *bridge;

	struct resource *cfg_res;
@@ -344,31 +344,20 @@ int dw_pcie_host_init(struct pcie_port *pp) 
	if (!bridge)

		return -ENOMEM;



	ret = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff,

					&bridge->windows, &pp->io_base);

	if (ret)

		return ret;



	ret = devm_request_pci_bus_resources(dev, &bridge->windows);

	ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows,

					      &bridge->dma_ranges, NULL);

	if (ret)

		return ret;



	/* Get the I/O and memory ranges from DT */

	resource_list_for_each_entry_safe(win, tmp, &bridge->windows) {

	resource_list_for_each_entry(win, &bridge->windows) {

		switch (resource_type(win->res)) {

		case IORESOURCE_IO:

			ret = devm_pci_remap_iospace(dev, win->res,

						     pp->io_base);

			if (ret) {

				dev_warn(dev, "Error %d: failed to map resource %pR\n",

					 ret, win->res);

				resource_list_destroy_entry(win);

			} else {

			pp->io = win->res;

			pp->io->name = "I/O";

			pp->io_size = resource_size(pp->io);

			pp->io_bus_addr = pp->io->start - win->offset;

			}

			pp->io_base = pci_pio_to_address(pp->io->start);

			break;

		case IORESOURCE_MEM:

			pp->mem = win->res;

drivers/pci/controller/pci-aardvark.c

+4 −56
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ 
struct advk_pcie {

	struct platform_device *pdev;

	void __iomem *base;

	struct list_head resources;

	struct irq_domain *irq_domain;

	struct irq_chip irq_chip;

	struct irq_domain *msi_domain;
@@ -953,63 +952,11 @@ static irqreturn_t advk_pcie_irq_handler(int irq, void *arg) 
	return IRQ_HANDLED;

}



static int advk_pcie_parse_request_of_pci_ranges(struct advk_pcie *pcie)

{

	int err, res_valid = 0;

	struct device *dev = &pcie->pdev->dev;

	struct resource_entry *win, *tmp;

	resource_size_t iobase;



	INIT_LIST_HEAD(&pcie->resources);



	err = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff,

						    &pcie->resources, &iobase);

	if (err)

		return err;



	err = devm_request_pci_bus_resources(dev, &pcie->resources);

	if (err)

		goto out_release_res;



	resource_list_for_each_entry_safe(win, tmp, &pcie->resources) {

		struct resource *res = win->res;



		switch (resource_type(res)) {

		case IORESOURCE_IO:

			err = devm_pci_remap_iospace(dev, res, iobase);

			if (err) {

				dev_warn(dev, "error %d: failed to map resource %pR\n",

					 err, res);

				resource_list_destroy_entry(win);

			}

			break;

		case IORESOURCE_MEM:

			res_valid |= !(res->flags & IORESOURCE_PREFETCH);

			break;

		case IORESOURCE_BUS:

			pcie->root_bus_nr = res->start;

			break;

		}

	}



	if (!res_valid) {

		dev_err(dev, "non-prefetchable memory resource required\n");

		err = -EINVAL;

		goto out_release_res;

	}



	return 0;



out_release_res:

	pci_free_resource_list(&pcie->resources);

	return err;

}



static int advk_pcie_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct advk_pcie *pcie;

	struct resource *res;

	struct resource *res, *bus;

	struct pci_host_bridge *bridge;

	int ret, irq;
@@ -1034,11 +981,13 @@ static int advk_pcie_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = advk_pcie_parse_request_of_pci_ranges(pcie);

	ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows,

					      &bridge->dma_ranges, &bus);

	if (ret) {

		dev_err(dev, "Failed to parse resources\n");

		return ret;

	}

	pcie->root_bus_nr = bus->start;



	advk_pcie_setup_hw(pcie);
@@ -1057,7 +1006,6 @@ static int advk_pcie_probe(struct platform_device *pdev) 
		return ret;

	}



	list_splice_init(&pcie->resources, &bridge->windows);

	bridge->dev.parent = dev;

	bridge->sysdata = pcie;

	bridge->busnr = 0;

drivers/pci/controller/pci-ftpci100.c

+22 −57
Original line number Diff line number Diff line
@@ -375,12 +375,11 @@ static int faraday_pci_setup_cascaded_irq(struct faraday_pci *p) 
	return 0;

}



static int faraday_pci_parse_map_dma_ranges(struct faraday_pci *p,

					    struct device_node *np)

static int faraday_pci_parse_map_dma_ranges(struct faraday_pci *p)

{

	struct of_pci_range range;

	struct of_pci_range_parser parser;

	struct device *dev = p->dev;

	struct pci_host_bridge *bridge = pci_host_bridge_from_priv(p);

	struct resource_entry *entry;

	u32 confreg[3] = {

		FARADAY_PCI_MEM1_BASE_SIZE,

		FARADAY_PCI_MEM2_BASE_SIZE,
@@ -389,19 +388,13 @@ static int faraday_pci_parse_map_dma_ranges(struct faraday_pci *p, 
	int i = 0;

	u32 val;



	if (of_pci_dma_range_parser_init(&parser, np)) {

		dev_err(dev, "missing dma-ranges property\n");

		return -EINVAL;

	}



	/*

	 * Get the dma-ranges from the device tree

	 */

	for_each_of_pci_range(&parser, &range) {

		u64 end = range.pci_addr + range.size - 1;

	resource_list_for_each_entry(entry, &bridge->dma_ranges) {

		u64 pci_addr = entry->res->start - entry->offset;

		u64 end = entry->res->end - entry->offset;

		int ret;



		ret = faraday_res_to_memcfg(range.pci_addr, range.size, &val);

		ret = faraday_res_to_memcfg(pci_addr,

					    resource_size(entry->res), &val);

		if (ret) {

			dev_err(dev,

				"DMA range %d: illegal MEM resource size\n", i);
@@ -409,7 +402,7 @@ static int faraday_pci_parse_map_dma_ranges(struct faraday_pci *p, 
		}



		dev_info(dev, "DMA MEM%d BASE: 0x%016llx -> 0x%016llx config %08x\n",

			 i + 1, range.pci_addr, end, val);

			 i + 1, pci_addr, end, val);

		if (i <= 2) {

			faraday_raw_pci_write_config(p, 0, 0, confreg[i],

						     4, val);
@@ -430,10 +423,8 @@ static int faraday_pci_probe(struct platform_device *pdev) 
	const struct faraday_pci_variant *variant =

		of_device_get_match_data(dev);

	struct resource *regs;

	resource_size_t io_base;

	struct resource_entry *win;

	struct faraday_pci *p;

	struct resource *mem;

	struct resource *io;

	struct pci_host_bridge *host;

	struct clk *clk;
@@ -441,7 +432,6 @@ static int faraday_pci_probe(struct platform_device *pdev) 
	unsigned char cur_bus_speed = PCI_SPEED_33MHz;

	int ret;

	u32 val;

	LIST_HEAD(res);



	host = devm_pci_alloc_host_bridge(dev, sizeof(*p));

	if (!host)
@@ -480,21 +470,14 @@ static int faraday_pci_probe(struct platform_device *pdev) 
	if (IS_ERR(p->base))

		return PTR_ERR(p->base);



	ret = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff,

						    &res, &io_base);

	ret = pci_parse_request_of_pci_ranges(dev, &host->windows,

					      &host->dma_ranges, NULL);

	if (ret)

		return ret;



	ret = devm_request_pci_bus_resources(dev, &res);

	if (ret)

		return ret;



	/* Get the I/O and memory ranges from DT */

	resource_list_for_each_entry(win, &res) {

		switch (resource_type(win->res)) {

		case IORESOURCE_IO:

	win = resource_list_first_type(&host->windows, IORESOURCE_IO);

	if (win) {

		io = win->res;

			io->name = "Gemini PCI I/O";

		if (!faraday_res_to_memcfg(io->start - win->offset,

					   resource_size(io), &val)) {

			/* setup I/O space size */
@@ -503,22 +486,6 @@ static int faraday_pci_probe(struct platform_device *pdev) 
			dev_err(dev, "illegal IO mem size\n");

			return -EINVAL;

		}

			ret = devm_pci_remap_iospace(dev, io, io_base);

			if (ret) {

				dev_warn(dev, "error %d: failed to map resource %pR\n",

					 ret, io);

				continue;

			}

			break;

		case IORESOURCE_MEM:

			mem = win->res;

			mem->name = "Gemini PCI MEM";

			break;

		case IORESOURCE_BUS:

			break;

		default:

			break;

		}

	}



	/* Setup hostbridge */
@@ -565,11 +532,10 @@ static int faraday_pci_probe(struct platform_device *pdev) 
			cur_bus_speed = PCI_SPEED_66MHz;

	}



	ret = faraday_pci_parse_map_dma_ranges(p, dev->of_node);

	ret = faraday_pci_parse_map_dma_ranges(p);

	if (ret)

		return ret;



	list_splice_init(&res, &host->windows);

	ret = pci_scan_root_bus_bridge(host);

	if (ret) {

		dev_err(dev, "failed to scan host: %d\n", ret);
@@ -581,7 +547,6 @@ static int faraday_pci_probe(struct platform_device *pdev) 


	pci_bus_assign_resources(p->bus);

	pci_bus_add_devices(p->bus);

	pci_free_resource_list(&res);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE