Commit dd5bba52 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branches 'pci/host-aardvark', 'pci/host-altera', 'pci/host-iproc',... 

Merge branches 'pci/host-aardvark', 'pci/host-altera', 'pci/host-iproc', 'pci/host-mvebu', 'pci/host-rcar', 'pci/host-rockchip', 'pci/host-tegra', 'pci/host-xgene' and 'pci/host-xilinx' into next

* pci/host-aardvark:
  MAINTAINERS: Add DT binding to the Aardvark PCIe driver maintainer
  PCI: aardvark: Remove unused platform data
  PCI: aardvark: Add local struct device pointers

* pci/host-altera:
  PCI: altera: Simplify TLP_CFG_DW1 usage
  PCI: altera: Simplify TLB_CFG_DW0 usage
  PCI: altera: Rename altera_pcie_valid_config() to altera_pcie_valid_device()
  PCI: altera: Remove redundant platform_get_resource() return value check
  PCI: altera: Remove unused platform data
  PCI: altera: Add local struct device pointers

* pci/host-iproc:
  PCI: iproc: Hard-code PCIe capability offset instead of searching
  PCI: iproc: Remove redundant null pointer checking
  PCI: iproc: Validate CSR base in BCMA setup code
  PCI: iproc: Set drvdata at end of probe function
  PCI: iproc: Add local struct device pointers

* pci/host-mvebu:
  PCI: mvebu: Use existing of_node pointer
  PCI: mvebu: Add local struct device pointers

* pci/host-rcar:
  PCI: rcar-gen2: Add local struct device pointers
  PCI: rcar: Remove DRV_NAME macro
  PCI: rcar: Remove unused rcar_pcie_get_resources() platform_device arg
  PCI: rcar: Remove unused platform data
  PCI: rcar: Add local struct device pointers

* pci/host-rockchip:
  PCI: rockchip: Indent "if" statement body
  PCI: rockchip: Remove unused platform data

* pci/host-tegra:
  PCI: tegra: Remove unused platform data
  PCI: tegra: Add local struct device pointers
  PCI: tegra: Fix argument order in tegra_pcie_phy_disable()

* pci/host-xgene:
  PCI: xgene: Add register accessors
  PCI: xgene: Pass struct xgene_pcie_port to setup functions
  PCI: xgene: Remove unused platform data
  PCI: xgene: Add local struct device pointers

* pci/host-xilinx:
  PCI: xilinx-nwl: Remove unused platform data
  PCI: xilinx-nwl: Add local struct device pointers
  PCI: xilinx: Removed unused xilinx_pcie_assign_msi() argument
  PCI: xilinx: Remove unused platform data
  PCI: xilinx: Add local struct device pointers
parents bdf53098 441106d9 4f276288 e3a1698b 96f61707 de9e6bc8 08015ee0 16cbff14 8e93c513 228ee66c

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -8982,6 +8982,7 @@ M: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/pci/aardvark-pci.txt

F:	drivers/pci/host/pci-aardvark.c



PCI DRIVER FOR NVIDIA TEGRA

drivers/pci/host/pci-aardvark.c

+20 −19
Original line number Diff line number Diff line
@@ -230,20 +230,20 @@ static int advk_pcie_link_up(struct advk_pcie *pcie) 


static int advk_pcie_wait_for_link(struct advk_pcie *pcie)

{

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

	int retries;



	/* check if the link is up or not */

	for (retries = 0; retries < LINK_WAIT_MAX_RETRIES; retries++) {

		if (advk_pcie_link_up(pcie)) {

			dev_info(&pcie->pdev->dev, "link up\n");

			dev_info(dev, "link up\n");

			return 0;

		}



		usleep_range(LINK_WAIT_USLEEP_MIN, LINK_WAIT_USLEEP_MAX);

	}



	dev_err(&pcie->pdev->dev, "link never came up\n");



	dev_err(dev, "link never came up\n");

	return -ETIMEDOUT;

}
@@ -376,6 +376,7 @@ static void advk_pcie_setup_hw(struct advk_pcie *pcie) 


static void advk_pcie_check_pio_status(struct advk_pcie *pcie)

{

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

	u32 reg;

	unsigned int status;

	char *strcomp_status, *str_posted;
@@ -407,12 +408,13 @@ static void advk_pcie_check_pio_status(struct advk_pcie *pcie) 
	else

		str_posted = "Posted";



	dev_err(&pcie->pdev->dev, "%s PIO Response Status: %s, %#x @ %#x\n",

	dev_err(dev, "%s PIO Response Status: %s, %#x @ %#x\n",

		str_posted, strcomp_status, reg, advk_readl(pcie, PIO_ADDR_LS));

}



static int advk_pcie_wait_pio(struct advk_pcie *pcie)

{

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

	unsigned long timeout;



	timeout = jiffies + msecs_to_jiffies(PIO_TIMEOUT_MS);
@@ -426,7 +428,7 @@ static int advk_pcie_wait_pio(struct advk_pcie *pcie) 
			return 0;

	}



	dev_err(&pcie->pdev->dev, "config read/write timed out\n");

	dev_err(dev, "config read/write timed out\n");

	return -ETIMEDOUT;

}
@@ -560,10 +562,11 @@ static int advk_pcie_alloc_msi(struct advk_pcie *pcie) 


static void advk_pcie_free_msi(struct advk_pcie *pcie, int hwirq)

{

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



	mutex_lock(&pcie->msi_used_lock);

	if (!test_bit(hwirq, pcie->msi_irq_in_use))

		dev_err(&pcie->pdev->dev, "trying to free unused MSI#%d\n",

			hwirq);

		dev_err(dev, "trying to free unused MSI#%d\n", hwirq);

	else

		clear_bit(hwirq, pcie->msi_irq_in_use);

	mutex_unlock(&pcie->msi_used_lock);
@@ -910,6 +913,7 @@ out_release_res: 


static int advk_pcie_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct advk_pcie *pcie;

	struct resource *res;

	struct pci_bus *bus, *child;
@@ -917,31 +921,29 @@ static int advk_pcie_probe(struct platform_device *pdev) 
	struct device_node *msi_node;

	int ret, irq;



	pcie = devm_kzalloc(&pdev->dev, sizeof(struct advk_pcie),

			    GFP_KERNEL);

	pcie = devm_kzalloc(dev, sizeof(struct advk_pcie), GFP_KERNEL);

	if (!pcie)

		return -ENOMEM;



	pcie->pdev = pdev;

	platform_set_drvdata(pdev, pcie);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	pcie->base = devm_ioremap_resource(&pdev->dev, res);

	pcie->base = devm_ioremap_resource(dev, res);

	if (IS_ERR(pcie->base))

		return PTR_ERR(pcie->base);



	irq = platform_get_irq(pdev, 0);

	ret = devm_request_irq(&pdev->dev, irq, advk_pcie_irq_handler,

	ret = devm_request_irq(dev, irq, advk_pcie_irq_handler,

			       IRQF_SHARED | IRQF_NO_THREAD, "advk-pcie",

			       pcie);

	if (ret) {

		dev_err(&pdev->dev, "Failed to register interrupt\n");

		dev_err(dev, "Failed to register interrupt\n");

		return ret;

	}



	ret = advk_pcie_parse_request_of_pci_ranges(pcie);

	if (ret) {

		dev_err(&pdev->dev, "Failed to parse resources\n");

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

		return ret;

	}
@@ -949,24 +951,24 @@ static int advk_pcie_probe(struct platform_device *pdev) 


	ret = advk_pcie_init_irq_domain(pcie);

	if (ret) {

		dev_err(&pdev->dev, "Failed to initialize irq\n");

		dev_err(dev, "Failed to initialize irq\n");

		return ret;

	}



	ret = advk_pcie_init_msi_irq_domain(pcie);

	if (ret) {

		dev_err(&pdev->dev, "Failed to initialize irq\n");

		dev_err(dev, "Failed to initialize irq\n");

		advk_pcie_remove_irq_domain(pcie);

		return ret;

	}



	msi_node = of_parse_phandle(pdev->dev.of_node, "msi-parent", 0);

	msi_node = of_parse_phandle(dev->of_node, "msi-parent", 0);

	if (msi_node)

		msi = of_pci_find_msi_chip_by_node(msi_node);

	else

		msi = NULL;



	bus = pci_scan_root_bus_msi(&pdev->dev, 0, &advk_pcie_ops,

	bus = pci_scan_root_bus_msi(dev, 0, &advk_pcie_ops,

				    pcie, &pcie->resources, &pcie->msi);

	if (!bus) {

		advk_pcie_remove_msi_irq_domain(pcie);
@@ -980,7 +982,6 @@ static int advk_pcie_probe(struct platform_device *pdev) 
		pcie_bus_configure_settings(child);



	pci_bus_add_devices(bus);



	return 0;

}

drivers/pci/host/pci-mvebu.c

+9 −12
Original line number Diff line number Diff line
@@ -1190,13 +1190,13 @@ static void mvebu_pcie_powerdown(struct mvebu_pcie_port *port) 


static int mvebu_pcie_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct mvebu_pcie *pcie;

	struct device_node *np = pdev->dev.of_node;

	struct device_node *np = dev->of_node;

	struct device_node *child;

	int num, i, ret;



	pcie = devm_kzalloc(&pdev->dev, sizeof(struct mvebu_pcie),

			    GFP_KERNEL);

	pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);

	if (!pcie)

		return -ENOMEM;
@@ -1206,7 +1206,7 @@ static int mvebu_pcie_probe(struct platform_device *pdev) 
	/* Get the PCIe memory and I/O aperture */

	mvebu_mbus_get_pcie_mem_aperture(&pcie->mem);

	if (resource_size(&pcie->mem) == 0) {

		dev_err(&pdev->dev, "invalid memory aperture size\n");

		dev_err(dev, "invalid memory aperture size\n");

		return -EINVAL;

	}
@@ -1224,20 +1224,18 @@ static int mvebu_pcie_probe(struct platform_device *pdev) 
	/* Get the bus range */

	ret = of_pci_parse_bus_range(np, &pcie->busn);

	if (ret) {

		dev_err(&pdev->dev, "failed to parse bus-range property: %d\n",

			ret);

		dev_err(dev, "failed to parse bus-range property: %d\n", ret);

		return ret;

	}



	num = of_get_available_child_count(pdev->dev.of_node);

	num = of_get_available_child_count(np);



	pcie->ports = devm_kcalloc(&pdev->dev, num, sizeof(*pcie->ports),

				   GFP_KERNEL);

	pcie->ports = devm_kcalloc(dev, num, sizeof(*pcie->ports), GFP_KERNEL);

	if (!pcie->ports)

		return -ENOMEM;



	i = 0;

	for_each_available_child_of_node(pdev->dev.of_node, child) {

	for_each_available_child_of_node(np, child) {

		struct mvebu_pcie_port *port = &pcie->ports[i];



		ret = mvebu_pcie_parse_port(pcie, port, child);
@@ -1266,8 +1264,7 @@ static int mvebu_pcie_probe(struct platform_device *pdev) 


		port->base = mvebu_pcie_map_registers(pdev, child, port);

		if (IS_ERR(port->base)) {

			dev_err(&pdev->dev, "%s: cannot map registers\n",

				port->name);

			dev_err(dev, "%s: cannot map registers\n", port->name);

			port->base = NULL;

			mvebu_pcie_powerdown(port);

			continue;

drivers/pci/host/pci-rcar-gen2.c

+25 −21
Original line number Diff line number Diff line
@@ -154,10 +154,11 @@ static int rcar_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 
static irqreturn_t rcar_pci_err_irq(int irq, void *pw)

{

	struct rcar_pci_priv *priv = pw;

	struct device *dev = priv->dev;

	u32 status = ioread32(priv->reg + RCAR_PCI_INT_STATUS_REG);



	if (status & RCAR_PCI_INT_ALLERRORS) {

		dev_err(priv->dev, "error irq: status %08x\n", status);

		dev_err(dev, "error irq: status %08x\n", status);



		/* clear the error(s) */

		iowrite32(status & RCAR_PCI_INT_ALLERRORS,
@@ -170,13 +171,14 @@ static irqreturn_t rcar_pci_err_irq(int irq, void *pw) 


static void rcar_pci_setup_errirq(struct rcar_pci_priv *priv)

{

	struct device *dev = priv->dev;

	int ret;

	u32 val;



	ret = devm_request_irq(priv->dev, priv->irq, rcar_pci_err_irq,

	ret = devm_request_irq(dev, priv->irq, rcar_pci_err_irq,

			       IRQF_SHARED, "error irq", priv);

	if (ret) {

		dev_err(priv->dev, "cannot claim IRQ for error handling\n");

		dev_err(dev, "cannot claim IRQ for error handling\n");

		return;

	}
@@ -192,15 +194,16 @@ static inline void rcar_pci_setup_errirq(struct rcar_pci_priv *priv) { } 
static int rcar_pci_setup(int nr, struct pci_sys_data *sys)

{

	struct rcar_pci_priv *priv = sys->private_data;

	struct device *dev = priv->dev;

	void __iomem *reg = priv->reg;

	u32 val;

	int ret;



	pm_runtime_enable(priv->dev);

	pm_runtime_get_sync(priv->dev);

	pm_runtime_enable(dev);

	pm_runtime_get_sync(dev);



	val = ioread32(reg + RCAR_PCI_UNIT_REV_REG);

	dev_info(priv->dev, "PCI: bus%u revision %x\n", sys->busnr, val);

	dev_info(dev, "PCI: bus%u revision %x\n", sys->busnr, val);



	/* Disable Direct Power Down State and assert reset */

	val = ioread32(reg + RCAR_USBCTR_REG) & ~RCAR_USBCTR_DIRPD;
@@ -275,7 +278,7 @@ static int rcar_pci_setup(int nr, struct pci_sys_data *sys) 


	/* Add PCI resources */

	pci_add_resource(&sys->resources, &priv->mem_res);

	ret = devm_request_pci_bus_resources(priv->dev, &sys->resources);

	ret = devm_request_pci_bus_resources(dev, &sys->resources);

	if (ret < 0)

		return ret;
@@ -311,6 +314,7 @@ static int pci_dma_range_parser_init(struct of_pci_range_parser *parser, 
static int rcar_pci_parse_map_dma_ranges(struct rcar_pci_priv *pci,

					 struct device_node *np)

{

	struct device *dev = pci->dev;

	struct of_pci_range range;

	struct of_pci_range_parser parser;

	int index = 0;
@@ -331,14 +335,14 @@ static int rcar_pci_parse_map_dma_ranges(struct rcar_pci_priv *pci, 


		/* Catch HW limitations */

		if (!(range.flags & IORESOURCE_PREFETCH)) {

			dev_err(pci->dev, "window must be prefetchable\n");

			dev_err(dev, "window must be prefetchable\n");

			return -EINVAL;

		}

		if (pci->window_addr) {

			u32 lowaddr = 1 << (ffs(pci->window_addr) - 1);



			if (lowaddr < pci->window_size) {

				dev_err(pci->dev, "invalid window size/addr\n");

				dev_err(dev, "invalid window size/addr\n");

				return -EINVAL;

			}

		}
@@ -350,6 +354,7 @@ static int rcar_pci_parse_map_dma_ranges(struct rcar_pci_priv *pci, 


static int rcar_pci_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct resource *cfg_res, *mem_res;

	struct rcar_pci_priv *priv;

	void __iomem *reg;
@@ -357,7 +362,7 @@ static int rcar_pci_probe(struct platform_device *pdev) 
	void *hw_private[1];



	cfg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	reg = devm_ioremap_resource(&pdev->dev, cfg_res);

	reg = devm_ioremap_resource(dev, cfg_res);

	if (IS_ERR(reg))

		return PTR_ERR(reg);
@@ -368,8 +373,7 @@ static int rcar_pci_probe(struct platform_device *pdev) 
	if (mem_res->start & 0xFFFF)

		return -EINVAL;



	priv = devm_kzalloc(&pdev->dev,

			    sizeof(struct rcar_pci_priv), GFP_KERNEL);

	priv = devm_kzalloc(dev, sizeof(struct rcar_pci_priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;
@@ -378,10 +382,10 @@ static int rcar_pci_probe(struct platform_device *pdev) 


	priv->irq = platform_get_irq(pdev, 0);

	priv->reg = reg;

	priv->dev = &pdev->dev;

	priv->dev = dev;



	if (priv->irq < 0) {

		dev_err(&pdev->dev, "no valid irq found\n");

		dev_err(dev, "no valid irq found\n");

		return priv->irq;

	}
@@ -390,23 +394,23 @@ static int rcar_pci_probe(struct platform_device *pdev) 
	priv->window_pci = 0x40000000;

	priv->window_size = SZ_1G;



	if (pdev->dev.of_node) {

	if (dev->of_node) {

		struct resource busnr;

		int ret;



		ret = of_pci_parse_bus_range(pdev->dev.of_node, &busnr);

		ret = of_pci_parse_bus_range(dev->of_node, &busnr);

		if (ret < 0) {

			dev_err(&pdev->dev, "failed to parse bus-range\n");

			dev_err(dev, "failed to parse bus-range\n");

			return ret;

		}



		priv->busnr = busnr.start;

		if (busnr.end != busnr.start)

			dev_warn(&pdev->dev, "only one bus number supported\n");

			dev_warn(dev, "only one bus number supported\n");



		ret = rcar_pci_parse_map_dma_ranges(priv, pdev->dev.of_node);

		ret = rcar_pci_parse_map_dma_ranges(priv, dev->of_node);

		if (ret < 0) {

			dev_err(&pdev->dev, "failed to parse dma-range\n");

			dev_err(dev, "failed to parse dma-range\n");

			return ret;

		}

	} else {
@@ -421,7 +425,7 @@ static int rcar_pci_probe(struct platform_device *pdev) 
	hw.map_irq = rcar_pci_map_irq;

	hw.ops = &rcar_pci_ops;

	hw.setup = rcar_pci_setup;

	pci_common_init_dev(&pdev->dev, &hw);

	pci_common_init_dev(dev, &hw);

	return 0;

}

drivers/pci/host/pci-tegra.c

+123 −114

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE