[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <6843a1b4-e331-435d-9cc7-9b457955d3cd@ti.com>
Date: Tue, 27 Aug 2024 19:30:45 +0530
From: "Kumar, Udit" <u-kumar1@...com>
To: Siddharth Vadapalli <s-vadapalli@...com>, <bhelgaas@...gle.com>,
<lpieralisi@...nel.org>, <kw@...ux.com>, <robh@...nel.org>,
<vigneshr@...com>, <kishon@...nel.org>,
<manivannan.sadhasivam@...aro.org>, <j-keerthy@...com>
CC: <linux-omap@...r.kernel.org>, <linux-pci@...r.kernel.org>,
<linux-kernel@...r.kernel.org>, <linux-arm-kernel@...ts.infradead.org>,
<stable@...r.kernel.org>, <srk@...com>
Subject: Re: [PATCH 2/2] PCI: dra7xx: Fix error handling when IRQ request
fails in probe
On 8/27/2024 5:54 PM, Siddharth Vadapalli wrote:
> Commit d4c7d1a089d6 ("PCI: dwc: dra7xx: Push request_irq() call to the
> bottom of probe") moved the IRQ request for "dra7xx-pcie-main" towards
> the end of dra7xx_pcie_probe(). However, the error handling does not take
> into account the initialization performed by either dra7xx_add_pcie_port()
> or dra7xx_add_pcie_ep(), depending on the mode of operation. Fix the error
> handling to address this.
>
> Fixes: d4c7d1a089d6 ("PCI: dwc: dra7xx: Push request_irq() call to the bottom of probe")
> Cc: <stable@...r.kernel.org>
> Signed-off-by: Siddharth Vadapalli <s-vadapalli@...com>
> ---
> drivers/pci/controller/dwc/pci-dra7xx.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c
> index 20fb50741f3d..5c62e1a3ba52 100644
> --- a/drivers/pci/controller/dwc/pci-dra7xx.c
> +++ b/drivers/pci/controller/dwc/pci-dra7xx.c
> @@ -854,11 +854,17 @@ static int dra7xx_pcie_probe(struct platform_device *pdev)
> "dra7xx-pcie-main", dra7xx);
> if (ret) {
> dev_err(dev, "failed to request irq\n");
> - goto err_gpio;
> + goto err_deinit;
> }
>
> return 0;
>
> +err_deinit:
> + if (dra7xx->mode == DW_PCIE_RC_TYPE)
> + dw_pcie_host_deinit(&dra7xx->pci->pp);
> + else
> + dw_pcie_ep_deinit(&dra7xx->pci->ep);
dw_pcie_ep_deinit may not be available in previous kernels
Otherwise
Tested-by: Udit Kumar <u-kumar1@...com>
> +
> err_gpio:
> err_get_sync:
> pm_runtime_put(dev);
Powered by blists - more mailing lists