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

Commit 795d5fd4 authored by Dmitry Artamonow's avatar Dmitry Artamonow Committed by Olof Johansson
Browse files

arm/tegra: add timeout to PCIe PLL lock detection loop 



Tegra PCIe driver waits for PLL to lock using busy loop.
If PLL fails to lock for some reason, this leads to silent lockup
while booting (as PCIe code is not modular).

Fix by adding timeout, so if PLL doesn't lock in a couple
of seconds, just PCIe driver fails and machine continues to boot.

Signed-off-by: default avatarDmitry Artamonow <mad_soft@inbox.ru>
Acked-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 448b9804

arch/arm/mach-tegra/pcie.c

+11 −3
Original line number Original line Diff line number Diff line
@@ -585,10 +585,10 @@ static void tegra_pcie_setup_translations(void) 
	afi_writel(0, AFI_MSI_BAR_SZ);

	afi_writel(0, AFI_MSI_BAR_SZ);

}

}





static void tegra_pcie_enable_controller(void)

static int tegra_pcie_enable_controller(void)

{

{

	u32 val, reg;

	u32 val, reg;

	int i;

	int i, timeout;





	/* Enable slot clock and pulse the reset signals */

	/* Enable slot clock and pulse the reset signals */

	for (i = 0, reg = AFI_PEX0_CTRL; i < 2; i++, reg += 0x8) {

	for (i = 0, reg = AFI_PEX0_CTRL; i < 2; i++, reg += 0x8) {
@@ -639,8 +639,14 @@ static void tegra_pcie_enable_controller(void) 
	pads_writel(0xfa5cfa5c, 0xc8);

	pads_writel(0xfa5cfa5c, 0xc8);





	/* Wait for the PLL to lock */

	/* Wait for the PLL to lock */

	timeout = 2000;

	do {

	do {

		val = pads_readl(PADS_PLL_CTL);

		val = pads_readl(PADS_PLL_CTL);

		mdelay(1);

		if (--timeout == 0) {

			pr_err("Tegra PCIe error: timeout waiting for PLL\n");

			return -EBUSY;

		}

	} while (!(val & PADS_PLL_CTL_LOCKDET));

	} while (!(val & PADS_PLL_CTL_LOCKDET));





	/* turn off IDDQ override */

	/* turn off IDDQ override */
@@ -921,7 +927,9 @@ int __init tegra_pcie_init(bool init_port0, bool init_port1) 
	if (err)

	if (err)

		return err;

		return err;





	tegra_pcie_enable_controller();

	err = tegra_pcie_enable_controller();

	if (err)

		return err;





	/* setup the AFI address translations */

	/* setup the AFI address translations */

	tegra_pcie_setup_translations();

	tegra_pcie_setup_translations();