PCI: imx6: Do not hide PHY driver callbacks and refine the error handling

Move the phy_power_on() to host_init from imx6_pcie_clk_enable().

Move the phy_init() to host_init from imx6_pcie_deassert_core_reset().

Refine the error handling in imx6_pcie_host_init() accordingly.

Link: https://lore.kernel.org/r/1657783869-19194-15-git-send-email-hongxing.zhu@nxp.com
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 33c5089eb46eb4205fc12f505a445636098ecfae..7a9047f0a27a5cb2a77c1a166b4cdae134c83c1c 100644 (file)
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -639,14 +639,6 @@ static int imx6_pcie_clk_enable(struct imx6_pcie *imx6_pcie)
                goto err_ref_clk;
        }
 
-       switch (imx6_pcie->drvdata->variant) {
-       case IMX8MM:
-               if (phy_power_on(imx6_pcie->phy))
-                       dev_err(dev, "unable to power on PHY\n");
-               break;
-       default:
-               break;
-       }
        /* allow the clocks to stabilize */
        usleep_range(200, 500);
        return 0;
@@ -723,10 +715,6 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
        case IMX8MQ:
                reset_control_deassert(imx6_pcie->pciephy_reset);
                break;
-       case IMX8MM:
-               if (phy_init(imx6_pcie->phy))
-                       dev_err(dev, "waiting for phy ready timeout!\n");
-               break;
        case IMX7D:
                reset_control_deassert(imx6_pcie->pciephy_reset);
 
@@ -762,6 +750,7 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
                usleep_range(200, 500);
                break;
        case IMX6Q:             /* Nothing to do */
+       case IMX8MM:
                break;
        }
 
@@ -914,16 +903,37 @@ static int imx6_pcie_host_init(struct dw_pcie_rp *pp)
 
        imx6_pcie_assert_core_reset(imx6_pcie);
        imx6_pcie_init_phy(imx6_pcie);
+
+       if (imx6_pcie->phy) {
+               ret = phy_power_on(imx6_pcie->phy);
+               if (ret) {
+                       dev_err(dev, "pcie PHY power up failed\n");
+                       goto err_reg_disable;
+               }
+       }
+
        ret = imx6_pcie_deassert_core_reset(imx6_pcie);
        if (ret < 0) {
                dev_err(dev, "pcie deassert core reset failed: %d\n", ret);
-               goto err_reg_disable;
+               goto err_phy_off;
        }
 
+       if (imx6_pcie->phy) {
+               ret = phy_init(imx6_pcie->phy);
+               if (ret) {
+                       dev_err(dev, "waiting for PHY ready timeout!\n");
+                       goto err_clk_disable;
+               }
+       }
        imx6_setup_phy_mpll(imx6_pcie);
 
        return 0;
 
+err_clk_disable:
+       imx6_pcie_clk_disable(imx6_pcie);
+err_phy_off:
+       if (imx6_pcie->phy)
+               phy_power_off(imx6_pcie->phy);
 err_reg_disable:
        if (imx6_pcie->vpcie)
                regulator_disable(imx6_pcie->vpcie);