svn commit: r308326 - stable/11/sys/arm/nvidia

[Michal Meloun]

Author: mmel
Date: Sat Nov  5 04:32:46 2016
New Revision: 308326
URL: https://svnweb.freebsd.org/changeset/base/308326

Log:
  MFC r306666:
  
    TEGRA: Fix PCIe link timeout.

Modified:
  stable/11/sys/arm/nvidia/tegra_pcie.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm/nvidia/tegra_pcie.c
==============================================================================
--- stable/11/sys/arm/nvidia/tegra_pcie.c	Sat Nov  5 04:30:44 2016	(r308325)
+++ stable/11/sys/arm/nvidia/tegra_pcie.c	Sat Nov  5 04:32:46 2016	(r308326)
@@ -293,7 +293,8 @@ tegra_pci_get_ranges(phandle_t node,  st
 #define	 RP_LINK_CONTROL_STATUS_DL_LINK_ACTIVE	0x20000000
 #define	 RP_LINK_CONTROL_STATUS_LINKSTAT_MASK	0x3fff0000
 
-#define	TEGRA_PCIE_LINKUP_TIMEOUT	200
+/* Wait 50 ms (per port) for link. */
+#define	TEGRA_PCIE_LINKUP_TIMEOUT	50000
 
 #define	DEBUG
 #ifdef DEBUG
@@ -1257,6 +1258,7 @@ tegra_pcib_wait_for_link(struct tegra_pc
 		    RP_VEND_XP, 4);
 		if (reg & RP_VEND_XP_DL_UP)
 				break;
+		DELAY(1);
 
 	}
 	if (i <= 0)
@@ -1268,6 +1270,7 @@ tegra_pcib_wait_for_link(struct tegra_pc
 		if (reg & RP_LINK_CONTROL_STATUS_DL_LINK_ACTIVE)
 				break;
 
+		DELAY(1);
 	}
 	if (i <= 0)
 		return (ETIMEDOUT);