PCI: imx6: Mark the link down as non-fatal error

If the PCIe link is down, return zero from imx6_pcie_start_link() so the
driver will probe successfully.

Link: https://lore.kernel.org/r/1657783869-19194-13-git-send-email-hongxing.zhu@nxp.com
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index cfb67f422e46e284573e2e282926430f9663f297..a693286c9843b7dea8ed47f91948613f9b545832 100644 (file)
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -836,7 +836,9 @@ static int imx6_pcie_start_link(struct dw_pcie *pci)
        /* Start LTSSM. */
        imx6_pcie_ltssm_enable(dev);
 
-       dw_pcie_wait_for_link(pci);
+       ret = dw_pcie_wait_for_link(pci);
+       if (ret)
+               goto err_reset_phy;
 
        if (pci->link_gen == 2) {
                /* Allow Gen2 mode after the link is up. */
@@ -872,7 +874,9 @@ static int imx6_pcie_start_link(struct dw_pcie *pci)
                }
 
                /* Make sure link training is finished as well! */
-               dw_pcie_wait_for_link(pci);
+               ret = dw_pcie_wait_for_link(pci);
+               if (ret)
+                       goto err_reset_phy;
        } else {
                dev_info(dev, "Link: Gen2 disabled\n");
        }
@@ -886,7 +890,7 @@ err_reset_phy:
                dw_pcie_readl_dbi(pci, PCIE_PORT_DEBUG0),
                dw_pcie_readl_dbi(pci, PCIE_PORT_DEBUG1));
        imx6_pcie_reset_phy(imx6_pcie);
-       return ret;
+       return 0;
 }
 
 static int imx6_pcie_host_init(struct dw_pcie_rp *pp)
@@ -1027,10 +1031,7 @@ static int imx6_pcie_resume_noirq(struct device *dev)
                return ret;
        dw_pcie_setup_rc(pp);
 
-       ret = imx6_pcie_start_link(imx6_pcie->pci);
-       if (ret < 0)
-               dev_info(dev, "pcie link is down after resume.\n");
-
+       imx6_pcie_start_link(imx6_pcie->pci);
        return 0;
 }