UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Richard Zhu 2022-07-14 15:31:04 +08:00 committed by Bjorn Helgaas
parent f0691e326b
commit 508919d0a9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/pci/controller/dwc/pci-imx6.c
View File

@ -836,7 +836,9 @@ static int imx6_pcie_start_link(struct dw_pcie *pci)
/* Start LTSSM. */ /* Start LTSSM. */
imx6_pcie_ltssm_enable(dev); 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) { if (pci->link_gen == 2) {
/* Allow Gen2 mode after the link is up. */ /* 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! */ /* 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 { } else {
dev_info(dev, "Link: Gen2 disabled\n"); 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_DEBUG0),
dw_pcie_readl_dbi(pci, PCIE_PORT_DEBUG1)); dw_pcie_readl_dbi(pci, PCIE_PORT_DEBUG1));
imx6_pcie_reset_phy(imx6_pcie); imx6_pcie_reset_phy(imx6_pcie);
return ret; return 0;
} }
static int imx6_pcie_host_init(struct dw_pcie_rp *pp) 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; return ret;
dw_pcie_setup_rc(pp); dw_pcie_setup_rc(pp);
ret = imx6_pcie_start_link(imx6_pcie->pci); imx6_pcie_start_link(imx6_pcie->pci);
if (ret < 0)
dev_info(dev, "pcie link is down after resume.\n");
return 0; return 0;
} }