Commit b93ebc1d authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Ralf Baechle
Browse files

MIPS: Octeon: Don't try to maintain link state in early init. 



Leave that to actual ethernet/phy drivers.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Cc: David Daney <ddaney@caviumnetworks.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14202/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 23d1f8f5

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

+1 −2
Original line number Diff line number Diff line
@@ -243,8 +243,7 @@ int __cvmx_helper_rgmii_enable(int interface) 
	/* enable the ports now */

	for (port = 0; port < num_ports; port++) {

		union cvmx_gmxx_prtx_cfg gmx_cfg;

		cvmx_helper_link_autoconf(cvmx_helper_get_ipd_port

					  (interface, port));



		gmx_cfg.u64 =

		    cvmx_read_csr(CVMX_GMXX_PRTX_CFG(port, interface));

		gmx_cfg.s.en = 1;

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

+0 −2
Original line number Diff line number Diff line
@@ -234,8 +234,6 @@ int __cvmx_helper_xaui_enable(int interface) 
	cvmx_write_csr(CVMX_GMXX_TX_INT_EN(interface), gmx_tx_int_en.u64);

	cvmx_write_csr(CVMX_PCSXX_INT_EN_REG(interface), pcsx_int_en_reg.u64);



	cvmx_helper_link_autoconf(cvmx_helper_get_ipd_port(interface, 0));



	/* (8) Enable packet reception */

	xauiMiscCtl.s.gmxeno = 0;

	cvmx_write_csr(CVMX_PCSXX_MISC_CTL_REG(interface), xauiMiscCtl.u64);

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

+0 −10
Original line number Diff line number Diff line
@@ -841,7 +841,6 @@ int __cvmx_helper_errata_fix_ipd_ptr_alignment(void) 
	int retry_cnt;

	int retry_loop_cnt;

	int i;

	cvmx_helper_link_info_t link_info;



	/* Save values for restore at end */

	uint64_t prtx_cfg =
@@ -1002,15 +1001,6 @@ fix_ipd_exit: 
		       (INDEX(FIX_IPD_OUTPORT), INTERFACE(FIX_IPD_OUTPORT)),

		       frame_max);

	cvmx_write_csr(CVMX_ASXX_PRT_LOOP(INTERFACE(FIX_IPD_OUTPORT)), 0);

	/* Set link to down so autonegotiation will set it up again */

	link_info.u64 = 0;

	cvmx_helper_link_set(FIX_IPD_OUTPORT, link_info);



	/*

	 * Bring the link back up as autonegotiation is not done in

	 * user applications.

	 */

	cvmx_helper_link_autoconf(FIX_IPD_OUTPORT);



	CVMX_SYNC;

	if (num_segs)

CRA Git | Maintained and supported by SUSTech CRA and CCSE