diff options
| author | Richard Zhu <hongxing.zhu@nxp.com> | 2017-05-04 14:58:35 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:26:28 +0800 |
| commit | 6f5ef050062a5c0e73c9e47eee9f6777fce8322c (patch) | |
| tree | 6cce3b6077cf69e8648c0cc55894c8695d328499 /drivers/pci | |
| parent | d5bd565668f20fad1a3cdafe00bf1d4c2b247a7d (diff) | |
MLK-14796 PCI: imx: kernel panic when reboot ep board
pp->ops is not assigned properly, thus there
would be kernel panic when reboot ep board.
Initialized pp->ops in ep initializatione,
fix this issue.
don't call dw_pcie_wait_for_link because
the usleep is used in it.
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/dwc/pci-imx6.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/drivers/pci/dwc/pci-imx6.c b/drivers/pci/dwc/pci-imx6.c index 5b3778fecaba..cb1e62a1778c 100644 --- a/drivers/pci/dwc/pci-imx6.c +++ b/drivers/pci/dwc/pci-imx6.c @@ -668,18 +668,24 @@ static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie) static int imx6_pcie_wait_for_link(struct imx6_pcie *imx6_pcie) { + int count = 20000; struct dw_pcie *pci = imx6_pcie->pci; struct device *dev = pci->dev; /* check if the link is up or not */ - if (!dw_pcie_wait_for_link(pci)) - return 0; - - dev_dbg(dev, "DEBUG_R0: 0x%08x, DEBUG_R1: 0x%08x\n", - dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R0), - dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R1)); + while (!dw_pcie_link_up(pci)) { + udelay(10); + if (--count) + continue; + + dev_err(dev, "phy link never came up\n"); + dev_dbg(dev, "DEBUG_R0: 0x%08x, DEBUG_R1: 0x%08x\n", + dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R0), + dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R1)); + return -ETIMEDOUT; + } - return -ETIMEDOUT; + return 0; } static int imx6_pcie_wait_for_speed_change(struct imx6_pcie *imx6_pcie) @@ -1472,6 +1478,7 @@ static int __init imx6_pcie_probe(struct platform_device *pdev) } pp->mem_base = pp->mem->start; + pp->ops = &imx6_pcie_host_ops; /* enable disp_mix power domain */ if (imx6_pcie->variant == IMX7D) |