Commit 611f8418 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/xgene' 

- Revert "PCI: xgene: Use inbound resources for setup" (Marc Zyngier)

- Revert "PCI: xgene: Fix IB window setup" (Marc Zyngier)

* remotes/lorenzo/pci/xgene:
  PCI: xgene: Revert "PCI: xgene: Fix IB window setup"
  PCI: xgene: Revert "PCI: xgene: Use inbound resources for setup"
parents c1e10d81 825da4e9

drivers/pci/controller/pci-xgene.c

+23 −12
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static int xgene_pcie_select_ib_reg(u8 *ib_reg_mask, u64 size) 
		return 1;

	}



	if ((size > SZ_1K) && (size < SZ_4G) && !(*ib_reg_mask & (1 << 0))) {

	if ((size > SZ_1K) && (size < SZ_1T) && !(*ib_reg_mask & (1 << 0))) {

		*ib_reg_mask |= (1 << 0);

		return 0;

	}
@@ -478,28 +478,27 @@ static int xgene_pcie_select_ib_reg(u8 *ib_reg_mask, u64 size) 
}



static void xgene_pcie_setup_ib_reg(struct xgene_pcie *port,

				    struct resource_entry *entry,

				    u8 *ib_reg_mask)

				    struct of_pci_range *range, u8 *ib_reg_mask)

{

	void __iomem *cfg_base = port->cfg_base;

	struct device *dev = port->dev;

	void __iomem *bar_addr;

	u32 pim_reg;

	u64 cpu_addr = entry->res->start;

	u64 pci_addr = cpu_addr - entry->offset;

	u64 size = resource_size(entry->res);

	u64 cpu_addr = range->cpu_addr;

	u64 pci_addr = range->pci_addr;

	u64 size = range->size;

	u64 mask = ~(size - 1) | EN_REG;

	u32 flags = PCI_BASE_ADDRESS_MEM_TYPE_64;

	u32 bar_low;

	int region;



	region = xgene_pcie_select_ib_reg(ib_reg_mask, size);

	region = xgene_pcie_select_ib_reg(ib_reg_mask, range->size);

	if (region < 0) {

		dev_warn(dev, "invalid pcie dma-range config\n");

		return;

	}



	if (entry->res->flags & IORESOURCE_PREFETCH)

	if (range->flags & IORESOURCE_PREFETCH)

		flags |= PCI_BASE_ADDRESS_MEM_PREFETCH;



	bar_low = pcie_bar_low_val((u32)cpu_addr, flags);
@@ -530,13 +529,25 @@ static void xgene_pcie_setup_ib_reg(struct xgene_pcie *port, 


static int xgene_pcie_parse_map_dma_ranges(struct xgene_pcie *port)

{

	struct pci_host_bridge *bridge = pci_host_bridge_from_priv(port);

	struct resource_entry *entry;

	struct device_node *np = port->node;

	struct of_pci_range range;

	struct of_pci_range_parser parser;

	struct device *dev = port->dev;

	u8 ib_reg_mask = 0;



	resource_list_for_each_entry(entry, &bridge->dma_ranges)

		xgene_pcie_setup_ib_reg(port, entry, &ib_reg_mask);

	if (of_pci_dma_range_parser_init(&parser, np)) {

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

		return -EINVAL;

	}



	/* Get the dma-ranges from DT */

	for_each_of_pci_range(&parser, &range) {

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



		dev_dbg(dev, "0x%08x 0x%016llx..0x%016llx -> 0x%016llx\n",

			range.flags, range.cpu_addr, end, range.pci_addr);

		xgene_pcie_setup_ib_reg(port, &range, &ib_reg_mask);

	}

	return 0;

}