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

Unverified Commit 75a9da11 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Paul Burton
Browse files

MIPS: OCTEON: delete unused loopback configuration functions 



Delete unused loopback configuration functions.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/21205/
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@linux-mips.org
parent a3741102

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

+0 −68
Original line number Diff line number Diff line
@@ -449,71 +449,3 @@ int __cvmx_helper_rgmii_link_set(int ipd_port, 


	return result;

}
 


/**

 * Configure a port for internal and/or external loopback. Internal loopback

 * causes packets sent by the port to be received by Octeon. External loopback

 * causes packets received from the wire to sent out again.

 *

 * @ipd_port: IPD/PKO port to loopback.

 * @enable_internal:

 *		   Non zero if you want internal loopback

 * @enable_external:

 *		   Non zero if you want external loopback

 *

 * Returns Zero on success, negative on failure.

 */

int __cvmx_helper_rgmii_configure_loopback(int ipd_port, int enable_internal,

					   int enable_external)

{

	int interface = cvmx_helper_get_interface_num(ipd_port);

	int index = cvmx_helper_get_interface_index_num(ipd_port);

	int original_enable;

	union cvmx_gmxx_prtx_cfg gmx_cfg;

	union cvmx_asxx_prt_loop asxx_prt_loop;



	/* Read the current enable state and save it */

	gmx_cfg.u64 = cvmx_read_csr(CVMX_GMXX_PRTX_CFG(index, interface));

	original_enable = gmx_cfg.s.en;

	/* Force port to be disabled */

	gmx_cfg.s.en = 0;

	if (enable_internal) {

		/* Force speed if we're doing internal loopback */

		gmx_cfg.s.duplex = 1;

		gmx_cfg.s.slottime = 1;

		gmx_cfg.s.speed = 1;

		cvmx_write_csr(CVMX_GMXX_TXX_CLK(index, interface), 1);

		cvmx_write_csr(CVMX_GMXX_TXX_SLOT(index, interface), 0x200);

		cvmx_write_csr(CVMX_GMXX_TXX_BURST(index, interface), 0x2000);

	}

	cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), gmx_cfg.u64);



	/* Set the loopback bits */

	asxx_prt_loop.u64 = cvmx_read_csr(CVMX_ASXX_PRT_LOOP(interface));

	if (enable_internal)

		asxx_prt_loop.s.int_loop |= 1 << index;

	else

		asxx_prt_loop.s.int_loop &= ~(1 << index);

	if (enable_external)

		asxx_prt_loop.s.ext_loop |= 1 << index;

	else

		asxx_prt_loop.s.ext_loop &= ~(1 << index);

	cvmx_write_csr(CVMX_ASXX_PRT_LOOP(interface), asxx_prt_loop.u64);



	/* Force enables in internal loopback */

	if (enable_internal) {

		uint64_t tmp;

		tmp = cvmx_read_csr(CVMX_ASXX_TX_PRT_EN(interface));

		cvmx_write_csr(CVMX_ASXX_TX_PRT_EN(interface),

			       (1 << index) | tmp);

		tmp = cvmx_read_csr(CVMX_ASXX_RX_PRT_EN(interface));

		cvmx_write_csr(CVMX_ASXX_RX_PRT_EN(interface),

			       (1 << index) | tmp);

		original_enable = 1;

	}



	/* Restore the enable state */

	gmx_cfg.s.en = original_enable;

	cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), gmx_cfg.u64);

	return 0;

}

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

+0 −38
Original line number Diff line number Diff line
@@ -513,41 +513,3 @@ int __cvmx_helper_sgmii_link_set(int ipd_port, 
	return __cvmx_helper_sgmii_hardware_init_link_speed(interface, index,

							    link_info);

}
 


/**

 * Configure a port for internal and/or external loopback. Internal

 * loopback causes packets sent by the port to be received by

 * Octeon. External loopback causes packets received from the wire to

 * sent out again.

 *

 * @ipd_port: IPD/PKO port to loopback.

 * @enable_internal:

 *		   Non zero if you want internal loopback

 * @enable_external:

 *		   Non zero if you want external loopback

 *

 * Returns Zero on success, negative on failure.

 */

int __cvmx_helper_sgmii_configure_loopback(int ipd_port, int enable_internal,

					   int enable_external)

{

	int interface = cvmx_helper_get_interface_num(ipd_port);

	int index = cvmx_helper_get_interface_index_num(ipd_port);

	union cvmx_pcsx_mrx_control_reg pcsx_mrx_control_reg;

	union cvmx_pcsx_miscx_ctl_reg pcsx_miscx_ctl_reg;



	pcsx_mrx_control_reg.u64 =

	    cvmx_read_csr(CVMX_PCSX_MRX_CONTROL_REG(index, interface));

	pcsx_mrx_control_reg.s.loopbck1 = enable_internal;

	cvmx_write_csr(CVMX_PCSX_MRX_CONTROL_REG(index, interface),

		       pcsx_mrx_control_reg.u64);



	pcsx_miscx_ctl_reg.u64 =

	    cvmx_read_csr(CVMX_PCSX_MISCX_CTL_REG(index, interface));

	pcsx_miscx_ctl_reg.s.loopbck2 = enable_external;

	cvmx_write_csr(CVMX_PCSX_MISCX_CTL_REG(index, interface),

		       pcsx_miscx_ctl_reg.u64);



	__cvmx_helper_sgmii_hardware_init_link(interface, index);

	return 0;

}

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

+0 −39
Original line number Diff line number Diff line
@@ -319,42 +319,3 @@ int __cvmx_helper_xaui_link_set(int ipd_port, cvmx_helper_link_info_t link_info) 
	/* Bring the link up */

	return __cvmx_helper_xaui_enable(interface);

}
 


/**

 * Configure a port for internal and/or external loopback. Internal loopback

 * causes packets sent by the port to be received by Octeon. External loopback

 * causes packets received from the wire to sent out again.

 *

 * @ipd_port: IPD/PKO port to loopback.

 * @enable_internal:

 *		   Non zero if you want internal loopback

 * @enable_external:

 *		   Non zero if you want external loopback

 *

 * Returns Zero on success, negative on failure.

 */

extern int __cvmx_helper_xaui_configure_loopback(int ipd_port,

						 int enable_internal,

						 int enable_external)

{

	int interface = cvmx_helper_get_interface_num(ipd_port);

	union cvmx_pcsxx_control1_reg pcsxx_control1_reg;

	union cvmx_gmxx_xaui_ext_loopback gmxx_xaui_ext_loopback;



	/* Set the internal loop */

	pcsxx_control1_reg.u64 =

	    cvmx_read_csr(CVMX_PCSXX_CONTROL1_REG(interface));

	pcsxx_control1_reg.s.loopbck1 = enable_internal;

	cvmx_write_csr(CVMX_PCSXX_CONTROL1_REG(interface),

		       pcsxx_control1_reg.u64);



	/* Set the external loop */

	gmxx_xaui_ext_loopback.u64 =

	    cvmx_read_csr(CVMX_GMXX_XAUI_EXT_LOOPBACK(interface));

	gmxx_xaui_ext_loopback.s.en = enable_external;

	cvmx_write_csr(CVMX_GMXX_XAUI_EXT_LOOPBACK(interface),

		       gmxx_xaui_ext_loopback.u64);



	/* Take the link through a reset */

	return __cvmx_helper_xaui_enable(interface);

}

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

+0 −54
Original line number Diff line number Diff line
@@ -1239,57 +1239,3 @@ int cvmx_helper_link_set(int ipd_port, cvmx_helper_link_info_t link_info) 
	return result;

}

EXPORT_SYMBOL_GPL(cvmx_helper_link_set);
 


/**

 * Configure a port for internal and/or external loopback. Internal loopback

 * causes packets sent by the port to be received by Octeon. External loopback

 * causes packets received from the wire to sent out again.

 *

 * @ipd_port: IPD/PKO port to loopback.

 * @enable_internal:

 *		   Non zero if you want internal loopback

 * @enable_external:

 *		   Non zero if you want external loopback

 *

 * Returns Zero on success, negative on failure.

 */

int cvmx_helper_configure_loopback(int ipd_port, int enable_internal,

				   int enable_external)

{

	int result = -1;

	int interface = cvmx_helper_get_interface_num(ipd_port);

	int index = cvmx_helper_get_interface_index_num(ipd_port);



	if (index >= cvmx_helper_ports_on_interface(interface))

		return -1;



	switch (cvmx_helper_interface_get_mode(interface)) {

	case CVMX_HELPER_INTERFACE_MODE_DISABLED:

	case CVMX_HELPER_INTERFACE_MODE_PCIE:

	case CVMX_HELPER_INTERFACE_MODE_SPI:

	case CVMX_HELPER_INTERFACE_MODE_NPI:

	case CVMX_HELPER_INTERFACE_MODE_LOOP:

		break;

	case CVMX_HELPER_INTERFACE_MODE_XAUI:

		result =

		    __cvmx_helper_xaui_configure_loopback(ipd_port,

							  enable_internal,

							  enable_external);

		break;

	case CVMX_HELPER_INTERFACE_MODE_RGMII:

	case CVMX_HELPER_INTERFACE_MODE_GMII:

		result =

		    __cvmx_helper_rgmii_configure_loopback(ipd_port,

							   enable_internal,

							   enable_external);

		break;

	case CVMX_HELPER_INTERFACE_MODE_SGMII:

	case CVMX_HELPER_INTERFACE_MODE_PICMG:

		result =

		    __cvmx_helper_sgmii_configure_loopback(ipd_port,

							   enable_internal,

							   enable_external);

		break;

	}

	return result;

}

arch/mips/include/asm/octeon/cvmx-gmxx-defs.h

+0 −26
Original line number Diff line number Diff line
@@ -6902,30 +6902,4 @@ union cvmx_gmxx_tx_xaui_ctl { 
	struct cvmx_gmxx_tx_xaui_ctl_s cnf71xx;

};



union cvmx_gmxx_xaui_ext_loopback {

	uint64_t u64;

	struct cvmx_gmxx_xaui_ext_loopback_s {

#ifdef __BIG_ENDIAN_BITFIELD

		uint64_t reserved_5_63:59;

		uint64_t en:1;

		uint64_t thresh:4;

#else

		uint64_t thresh:4;

		uint64_t en:1;

		uint64_t reserved_5_63:59;

#endif

	} s;

	struct cvmx_gmxx_xaui_ext_loopback_s cn52xx;

	struct cvmx_gmxx_xaui_ext_loopback_s cn52xxp1;

	struct cvmx_gmxx_xaui_ext_loopback_s cn56xx;

	struct cvmx_gmxx_xaui_ext_loopback_s cn56xxp1;

	struct cvmx_gmxx_xaui_ext_loopback_s cn61xx;

	struct cvmx_gmxx_xaui_ext_loopback_s cn63xx;

	struct cvmx_gmxx_xaui_ext_loopback_s cn63xxp1;

	struct cvmx_gmxx_xaui_ext_loopback_s cn66xx;

	struct cvmx_gmxx_xaui_ext_loopback_s cn68xx;

	struct cvmx_gmxx_xaui_ext_loopback_s cn68xxp1;

	struct cvmx_gmxx_xaui_ext_loopback_s cnf71xx;

};



#endif