RE: [RESEND v2 2/5] PCI: imx6: Add the error propagation from host_init

-----Original Message-----
From: Lucas Stach <l.stach@pengutronix.de>
Sent: Saturday, October 16, 2021 2:16 AM
To: Richard Zhu <hongxing.zhu@nxp.com>; bhelgaas@google.com;
lorenzo.pieralisi@arm.com
Cc: linux-pci@vger.kernel.org; dl-linux-imx <redacted>;
linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org;
kernel@pengutronix.de
Subject: Re: [RESEND v2 2/5] PCI: imx6: Add the error propagation from
host_init

Am Freitag, dem 15.10.2021 um 14:05 +0800 schrieb Richard Zhu:

quoted

Since there is error return check of the host_init callback, add error
check to imx6_pcie_deassert_core_reset() function, and change the
function type accordingly.

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>

Reviewed-by: Lucas Stach <l.stach@pengutronix.de>

[Richard Zhu] Thanks.

Best Regards
Richard Zhu

quoted

---
 drivers/pci/controller/dwc/pci-imx6.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c

b/drivers/pci/controller/dwc/pci-imx6.c
index 1fa1dba6da81..3372775834a2 100644

--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c

@@ -527,24 +527,24 @@ static void

imx7d_pcie_wait_for_phy_pll_lock(struct imx6_pcie *imx6_pcie)

quoted

 		dev_err(dev, "PCIe PLL lock timeout\n");  }

-static void imx6_pcie_deassert_core_reset(struct imx6_pcie
*imx6_pcie)
+static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
 {
 	struct dw_pcie *pci = imx6_pcie->pci;
 	struct device *dev = pci->dev;
-	int ret;
+	int ret, err;

 	if (imx6_pcie->vpcie && !regulator_is_enabled(imx6_pcie->vpcie)) {
 		ret = regulator_enable(imx6_pcie->vpcie);
 		if (ret) {
 			dev_err(dev, "failed to enable vpcie regulator: %d\n",
 				ret);
-			return;
+			return ret;
 		}
 	}

-	ret = imx6_pcie_clk_enable(imx6_pcie);
-	if (ret) {
-		dev_err(dev, "unable to enable pcie clocks\n");
+	err = imx6_pcie_clk_enable(imx6_pcie);
+	if (err) {
+		dev_err(dev, "unable to enable pcie clocks: %d\n", err);
 		goto err_clks;
 	}

@@ -599,7 +599,7 @@ static void imx6_pcie_deassert_core_reset(struct

imx6_pcie *imx6_pcie)

quoted

 		break;
 	}

-	return;
+	return 0;

 err_clks:
 	if (imx6_pcie->vpcie && regulator_is_enabled(imx6_pcie->vpcie) > 0)
{ @@ -608,6 +608,7 @@ static void imx6_pcie_deassert_core_reset(struct

imx6_pcie *imx6_pcie)

quoted

 			dev_err(dev, "failed to disable vpcie regulator: %d\n",
 				ret);
 	}
+	return err;
 }

 static void imx6_pcie_configure_type(struct imx6_pcie *imx6_pcie) @@
-858,11 +859,18 @@ static int imx6_pcie_start_link(struct dw_pcie
*pci)  static int imx6_pcie_host_init(struct pcie_port *pp)  {
 	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
+	struct device *dev = pci->dev;
 	struct imx6_pcie *imx6_pcie = to_imx6_pcie(pci);
+	int ret;

 	imx6_pcie_assert_core_reset(imx6_pcie);
 	imx6_pcie_init_phy(imx6_pcie);
-	imx6_pcie_deassert_core_reset(imx6_pcie);
+	ret = imx6_pcie_deassert_core_reset(imx6_pcie);
+	if (ret < 0) {
+		dev_err(dev, "pcie host init failed: %d.\n", ret);
+		return ret;
+	}
+
 	imx6_setup_phy_mpll(imx6_pcie);

 	return 0;

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel