| From c3bb029a7c7324ad488b6069ab0114ec45d79a24 Mon Sep 17 00:00:00 2001 |
| From: Marek Vasut <marek.vasut@gmail.com> |
| Date: Thu, 24 May 2018 16:36:21 +0200 |
| Subject: [PATCH 1438/1795] 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 |
| (cherry picked from commit 1aea58be739816f05232c64f970784d75a84cd96) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/pci/host/pcie-rcar.c | 28 +++++++++++++++++++++++++++- |
| 1 file changed, 27 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c |
| index 382780353f64..f5307b61d7e0 100644 |
| --- a/drivers/pci/host/pcie-rcar.c |
| +++ b/drivers/pci/host/pcie-rcar.c |
| @@ -927,6 +927,28 @@ static int rcar_pcie_enable_msi(struct rcar_pcie *pcie) |
| 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; |
| @@ -1155,10 +1177,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); |
| |
| -- |
| 2.19.0 |
| |