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

Merge branch 'remotes/lorenzo/pci/misc' 

  - Exit pcitest with error code when test fails (Jean-Jacques Hiblot)

  - Fix leaked of_node references in dra7xx, uniphier, layerscape,
    rockchip, aardvark, iproc, mediatek, rpadlpar (Wen Yang)

  - Fix pcitest "help" option parsing (Kishon Vijay Abraham I)

  - Fix Makefile bug that inadvertently removes pcitest.sh (Kishon Vijay
    Abraham I)

  - Check for alloc_workqueue() failure in endpoint test driver (Kangjie
    Lu)

* remotes/lorenzo/pci/misc:
  PCI: endpoint: Fix a potential NULL pointer dereference
  tools: PCI: Handle pcitest.sh independently from pcitest
  tools: PCI: Add 'h' in optstring of getopt()
  PCI: mediatek: Fix a leaked reference by adding missing of_node_put()
  PCI: iproc: Fix a leaked reference by adding missing of_node_put()
  PCI: aardvark: Fix a leaked reference by adding missing of_node_put()
  PCI: rockchip: Fix a leaked reference by adding missing of_node_put()
  PCI: dwc: layerscape: Fix a leaked reference by adding missing of_node_put()
  PCI: uniphier: Fix a leaked reference by adding missing of_node_put()
  PCI: dwc: pci-dra7xx: Fix a leaked reference by adding missing of_node_put()
  tools: PCI: Exit with error code when test fails
parents ed0eaf32 507b8200

drivers/pci/controller/dwc/pci-dra7xx.c

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ static int dra7xx_pcie_init_irq_domain(struct pcie_port *pp) 


	dra7xx->irq_domain = irq_domain_add_linear(pcie_intc_node, PCI_NUM_INTX,

						   &intx_domain_ops, pp);

	of_node_put(pcie_intc_node);

	if (!dra7xx->irq_domain) {

		dev_err(dev, "Failed to get a INTx IRQ domain\n");

		return -ENODEV;

drivers/pci/controller/dwc/pci-layerscape.c

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ static int ls_pcie_msi_host_init(struct pcie_port *pp) 
		return -EINVAL;

	}



	of_node_put(msi_node);

	return 0;

}

drivers/pci/controller/dwc/pcie-uniphier.c

+8 −3
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ static int uniphier_pcie_config_legacy_irq(struct pcie_port *pp) 
	struct uniphier_pcie_priv *priv = to_uniphier_pcie(pci);

	struct device_node *np = pci->dev->of_node;

	struct device_node *np_intc;

	int ret = 0;



	np_intc = of_get_child_by_name(np, "legacy-interrupt-controller");

	if (!np_intc) {
@@ -280,20 +281,24 @@ static int uniphier_pcie_config_legacy_irq(struct pcie_port *pp) 
	pp->irq = irq_of_parse_and_map(np_intc, 0);

	if (!pp->irq) {

		dev_err(pci->dev, "Failed to get an IRQ entry in legacy-interrupt-controller\n");

		return -EINVAL;

		ret = -EINVAL;

		goto out_put_node;

	}



	priv->legacy_irq_domain = irq_domain_add_linear(np_intc, PCI_NUM_INTX,

						&uniphier_intx_domain_ops, pp);

	if (!priv->legacy_irq_domain) {

		dev_err(pci->dev, "Failed to get INTx domain\n");

		return -ENODEV;

		ret = -ENODEV;

		goto out_put_node;

	}



	irq_set_chained_handler_and_data(pp->irq, uniphier_pcie_irq_handler,

					 pp);



	return 0;

out_put_node:

	of_node_put(np_intc);

	return ret;

}



static int uniphier_pcie_host_init(struct pcie_port *pp)

drivers/pci/controller/pci-aardvark.c

+8 −5
Original line number Diff line number Diff line
@@ -794,6 +794,7 @@ static int advk_pcie_init_irq_domain(struct advk_pcie *pcie) 
	struct device_node *node = dev->of_node;

	struct device_node *pcie_intc_node;

	struct irq_chip *irq_chip;

	int ret = 0;



	pcie_intc_node =  of_get_next_child(node, NULL);

	if (!pcie_intc_node) {
@@ -806,8 +807,8 @@ static int advk_pcie_init_irq_domain(struct advk_pcie *pcie) 
	irq_chip->name = devm_kasprintf(dev, GFP_KERNEL, "%s-irq",

					dev_name(dev));

	if (!irq_chip->name) {

		of_node_put(pcie_intc_node);

		return -ENOMEM;

		ret = -ENOMEM;

		goto out_put_node;

	}



	irq_chip->irq_mask = advk_pcie_irq_mask;
@@ -819,11 +820,13 @@ static int advk_pcie_init_irq_domain(struct advk_pcie *pcie) 
				      &advk_pcie_irq_domain_ops, pcie);

	if (!pcie->irq_domain) {

		dev_err(dev, "Failed to get a INTx IRQ domain\n");

		of_node_put(pcie_intc_node);

		return -ENOMEM;

		ret = -ENOMEM;

		goto out_put_node;

	}



	return 0;

out_put_node:

	of_node_put(pcie_intc_node);

	return ret;

}



static void advk_pcie_remove_irq_domain(struct advk_pcie *pcie)

drivers/pci/controller/pcie-iproc.c

+6 −2
Original line number Diff line number Diff line
@@ -1356,14 +1356,18 @@ static int iproc_pcie_msi_enable(struct iproc_pcie *pcie) 
	if (pcie->need_msi_steer) {

		ret = iproc_pcie_msi_steer(pcie, msi_node);

		if (ret)

			return ret;

			goto out_put_node;

	}



	/*

	 * If another MSI controller is being used, the call below should fail

	 * but that is okay

	 */

	return iproc_msi_init(pcie, msi_node);

	ret = iproc_msi_init(pcie, msi_node);



out_put_node:

	of_node_put(msi_node);

	return ret;

}



static void iproc_pcie_msi_disable(struct iproc_pcie *pcie)

CRA Git | Maintained and supported by SUSTech CRA and CCSE