Commit 79a85423 authored by Lucas Stach's avatar Lucas Stach Committed by Ben Hutchings

PCI: imx6: Move PHY reset into imx6_pcie_establish_link()

commit 54a47a83 upstream.

This adds the PHY reset into a common error path of
imx6_pcie_establish_link(), deduplicating some of the debug prints.  Also
reduce the severity of the "no-link" message in the one place where it is
expected to be hit when no peripheral is attached.
Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
[bwh: Backported to 3.16:
 - Error paths were different in imx6_pcie_start_link()
 - Adjust context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 2ede1057
...@@ -322,10 +322,6 @@ static int imx6_pcie_wait_for_link(struct pcie_port *pp) ...@@ -322,10 +322,6 @@ static int imx6_pcie_wait_for_link(struct pcie_port *pp)
if (--count) if (--count)
continue; continue;
dev_err(pp->dev, "phy link never came up\n");
dev_dbg(pp->dev, "DEBUG_R0: 0x%08x, DEBUG_R1: 0x%08x\n",
readl(pp->dbi_base + PCIE_PHY_DEBUG_R0),
readl(pp->dbi_base + PCIE_PHY_DEBUG_R1));
return -EINVAL; return -EINVAL;
} }
...@@ -360,8 +356,10 @@ static int imx6_pcie_start_link(struct pcie_port *pp) ...@@ -360,8 +356,10 @@ static int imx6_pcie_start_link(struct pcie_port *pp)
IMX6Q_GPR12_PCIE_CTL_2, 1 << 10); IMX6Q_GPR12_PCIE_CTL_2, 1 << 10);
ret = imx6_pcie_wait_for_link(pp); ret = imx6_pcie_wait_for_link(pp);
if (ret) if (ret) {
return ret; dev_info(pp->dev, "Link never came up\n");
goto err_reset_phy;
}
/* Allow Gen2 mode after the link is up. */ /* Allow Gen2 mode after the link is up. */
tmp = readl(pp->dbi_base + PCIE_RC_LCR); tmp = readl(pp->dbi_base + PCIE_RC_LCR);
...@@ -394,11 +392,20 @@ static int imx6_pcie_start_link(struct pcie_port *pp) ...@@ -394,11 +392,20 @@ static int imx6_pcie_start_link(struct pcie_port *pp)
if (ret) { if (ret) {
dev_err(pp->dev, "Failed to bring link up!\n"); dev_err(pp->dev, "Failed to bring link up!\n");
goto err_reset_phy;
} else { } else {
tmp = readl(pp->dbi_base + 0x80); tmp = readl(pp->dbi_base + 0x80);
dev_dbg(pp->dev, "Link up, Gen=%i\n", (tmp >> 16) & 0xf); dev_dbg(pp->dev, "Link up, Gen=%i\n", (tmp >> 16) & 0xf);
} }
return ret;
err_reset_phy:
dev_dbg(pp->dev, "PHY DEBUG_R0=0x%08x DEBUG_R1=0x%08x\n",
readl(pp->dbi_base + PCIE_PHY_DEBUG_R0),
readl(pp->dbi_base + PCIE_PHY_DEBUG_R1));
imx6_pcie_reset_phy(pp);
return ret; return ret;
} }
...@@ -470,11 +477,6 @@ static int imx6_pcie_link_up(struct pcie_port *pp) ...@@ -470,11 +477,6 @@ static int imx6_pcie_link_up(struct pcie_port *pp)
if ((debug_r0 & 0x3f) != 0x0d) if ((debug_r0 & 0x3f) != 0x0d)
return 0; return 0;
dev_err(pp->dev, "transition to gen2 is stuck, reset PHY!\n");
dev_dbg(pp->dev, "debug_r0=%08x debug_r1=%08x\n", debug_r0, rc);
imx6_pcie_reset_phy(pp);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment