| Message ID | 20240827122422.985547-3-s-vadapalli@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | Fixes for the PCI dra7xx driver | expand |
On Tue, Aug 27, 2024 at 05:54:22PM +0530, 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@vger.kernel.org> > Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> - Mani > --- > 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); > + > err_gpio: > err_get_sync: > pm_runtime_put(dev); > -- > 2.40.1 >
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); + err_gpio: err_get_sync: pm_runtime_put(dev);
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@vger.kernel.org> Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com> --- drivers/pci/controller/dwc/pci-dra7xx.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)