Commit 1aea58be authored May 24, 2018 by Marek Vasut Committed by Lorenzo Pieralisi May 24, 2018

PCI: rcar: Teardown MSI setup if rcar_pcie_enable() fails



If the rcar_pcie_enable() fails and MSIs are enabled, the setup done in
rcar_pcie_enable_msi() is never undone. Add a function to tear down the
MSI setup by disabling the MSI handling in the PCIe block, deallocating
the pages requested for the MSIs and zapping the IRQ mapping.

Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
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

parent 53f1aebf

drivers/pci/host/pcie-rcar.c

+27 −1

Original line number	Diff line number	Diff line
		@@ -924,6 +924,28 @@ err:
		return err;
		}

		static void rcar_pcie_teardown_msi(struct rcar_pcie *pcie)
		{
		struct rcar_msi *msi = &pcie->msi;
		int irq, i;

		/* Disable all MSI interrupts */
		rcar_pci_write_reg(pcie, 0, PCIEMSIIER);

		/* Disable address decoding of the MSI interrupt, MSIFE */
		rcar_pci_write_reg(pcie, 0, PCIEMSIALR);

		free_pages(msi->pages, 0);

		for (i = 0; i < INT_PCI_MSI_NR; i++) {
		irq = irq_find_mapping(msi->domain, i);
		if (irq > 0)
		irq_dispose_mapping(irq);
		}

		irq_domain_remove(msi->domain);
		}

		static int rcar_pcie_get_resources(struct rcar_pcie *pcie)
		{
		struct device *dev = pcie->dev;
		@@ -1152,10 +1174,14 @@ static int rcar_pcie_probe(struct platform_device *pdev)

		err = rcar_pcie_enable(pcie);
		if (err)
		goto err_clk_disable;
		goto err_msi_teardown;

		return 0;

		err_msi_teardown:
		if (IS_ENABLED(CONFIG_PCI_MSI))
		rcar_pcie_teardown_msi(pcie);

		err_clk_disable:
		clk_disable_unprepare(pcie->bus_clk);

Admin message