Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54a47a83 authored by Lucas Stach's avatar Lucas Stach Committed by Bjorn Helgaas
Browse files

PCI: imx6: Move PHY reset into imx6_pcie_establish_link() 



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>
parent 53eeb48b

drivers/pci/host/pci-imx6.c

+15 −13
Original line number Diff line number Diff line
@@ -355,10 +355,6 @@ static int imx6_pcie_wait_for_link(struct pcie_port *pp) 
		usleep_range(100, 1000);

	}



	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;

}
@@ -407,8 +403,10 @@ static int imx6_pcie_establish_link(struct pcie_port *pp) 
			IMX6Q_GPR12_PCIE_CTL_2, 1 << 10);



	ret = imx6_pcie_wait_for_link(pp);

	if (ret)

		return ret;

	if (ret) {

		dev_info(pp->dev, "Link never came up\n");

		goto err_reset_phy;

	}



	/* Allow Gen2 mode after the link is up. */

	tmp = readl(pp->dbi_base + PCIE_RC_LCR);
@@ -427,19 +425,28 @@ static int imx6_pcie_establish_link(struct pcie_port *pp) 
	ret = imx6_pcie_wait_for_speed_change(pp);

	if (ret) {

		dev_err(pp->dev, "Failed to bring link up!\n");

		return ret;

		goto err_reset_phy;

	}



	/* Make sure link training is finished as well! */

	ret = imx6_pcie_wait_for_link(pp);

	if (ret) {

		dev_err(pp->dev, "Failed to bring link up!\n");

		return ret;

		goto err_reset_phy;

	}



	tmp = readl(pp->dbi_base + PCIE_RC_LCSR);

	dev_dbg(pp->dev, "Link up, Gen=%i\n", (tmp >> 16) & 0xf);



	return 0;



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;

}



static void imx6_pcie_host_init(struct pcie_port *pp)
@@ -510,11 +517,6 @@ static int imx6_pcie_link_up(struct pcie_port *pp) 
	if ((debug_r0 & 0x3f) != 0x0d)

		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;

}