system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-05 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

PCI: rcar: Add missing irq_dispose_mapping() into failpath

Browse source 
The rcar_pcie_get_resources() is another misnomer with a side effect.
The function does not only get resources, but also maps MSI IRQs via
irq_of_parse_and_map(). In case anything fails afterward, the IRQ
mapping must be disposed through irq_dispose_mapping() which is not
done.

This patch handles irq_of_parse_and_map() failures in by disposing
of the mapping in rcar_pcie_get_resources() as well as in probe.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Phil Edworthy <phil.edworthy@renesas.com>
Cc: Simon Horman <horms+renesas@verge.net.au>
Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: linux-renesas-soc@vger.kernel.org
This commit is contained in:
Marek Vasut 2018-05-24 16:36:20 +02:00 committed by Lorenzo Pieralisi
parent 80b8471e69
commit 53f1aebfbe
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/pci/host/pcie-rcar.c
View file

@ -951,18 +951,25 @@ static int rcar_pcie_get_resources(struct rcar_pcie *pcie)
i = irq_of_parse_and_map(dev->of_node, 0); i = irq_of_parse_and_map(dev->of_node, 0);
if (!i) { if (!i) {
dev_err(dev, "cannot get platform resources for msi interrupt\n"); dev_err(dev, "cannot get platform resources for msi interrupt\n");
return -ENOENT; err = -ENOENT;
goto err_irq1;
} }
pcie->msi.irq1 = i; pcie->msi.irq1 = i;
i = irq_of_parse_and_map(dev->of_node, 1); i = irq_of_parse_and_map(dev->of_node, 1);
if (!i) { if (!i) {
dev_err(dev, "cannot get platform resources for msi interrupt\n"); dev_err(dev, "cannot get platform resources for msi interrupt\n");
return -ENOENT; err = -ENOENT;
goto err_irq2;
} }
pcie->msi.irq2 = i; pcie->msi.irq2 = i;
return 0; return 0;
err_irq2:
irq_dispose_mapping(pcie->msi.irq1);
err_irq1:
return err;
} }
static int rcar_pcie_inbound_ranges(struct rcar_pcie *pcie, static int rcar_pcie_inbound_ranges(struct rcar_pcie *pcie,
@ -1109,7 +1116,7 @@ static int rcar_pcie_probe(struct platform_device *pdev)
err = clk_prepare_enable(pcie->bus_clk); err = clk_prepare_enable(pcie->bus_clk);
if (err) { if (err) {
dev_err(dev, "failed to enable bus clock: %d\n", err); dev_err(dev, "failed to enable bus clock: %d\n", err);
goto err_pm_put; goto err_unmap_msi_irqs;
} }
err = rcar_pcie_parse_map_dma_ranges(pcie, dev->of_node); err = rcar_pcie_parse_map_dma_ranges(pcie, dev->of_node);
@ -1152,6 +1159,10 @@ static int rcar_pcie_probe(struct platform_device *pdev)
err_clk_disable: err_clk_disable:
clk_disable_unprepare(pcie->bus_clk); clk_disable_unprepare(pcie->bus_clk);
err_unmap_msi_irqs:
irq_dispose_mapping(pcie->msi.irq2);
irq_dispose_mapping(pcie->msi.irq1);
err_pm_put: err_pm_put:
pm_runtime_put(dev); pm_runtime_put(dev);