Commit 407710a3 authored by Stijn Tintel's avatar Stijn Tintel Committed by Thomas Bogendoerfer
Browse files

MIPS: Octeon: fix CN6640 hang on XAUI init 



Some CN66XX series Octeon II chips seem to hang if a reset is issued on
XAUI initialization. Avoid the hang by disabling the reset.

Tested on SNIC10E.

Signed-off-by: default avatarStijn Tintel <stijn@linux-ipv6.be>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 4107fa70

arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c

+3 −2
Original line number Diff line number Diff line
@@ -156,8 +156,9 @@ int __cvmx_helper_xaui_enable(int interface) 
	xauiCtl.u64 = cvmx_read_csr(CVMX_PCSXX_CONTROL1_REG(interface));

	xauiCtl.s.lo_pwr = 0;



	/* Issuing a reset here seems to hang some CN68XX chips. */

	if (!OCTEON_IS_MODEL(OCTEON_CN68XX_PASS1_X) &&

	/* Issuing a reset here seems to hang some CN66XX/CN68XX chips. */

	if (!OCTEON_IS_MODEL(OCTEON_CN66XX) &&

	    !OCTEON_IS_MODEL(OCTEON_CN68XX_PASS1_X) &&

	    !OCTEON_IS_MODEL(OCTEON_CN68XX_PASS2_X))

		xauiCtl.s.reset = 1;