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

MIPS: Octeon: Delete unused cvmx_helper_board_link_set_phy. 



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/14204/


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

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

+0 −170
Original line number Diff line number Diff line
@@ -417,176 +417,6 @@ cvmx_helper_link_info_t __cvmx_helper_board_link_get(int ipd_port) 
	return result;

}



/**

 * This function as a board specific method of changing the PHY

 * speed, duplex, and auto-negotiation. This programs the PHY and

 * not Octeon. This can be used to force Octeon's links to

 * specific settings.

 *

 * @phy_addr:  The address of the PHY to program

 * @enable_autoneg:

 *		    Non zero if you want to enable auto-negotiation.

 * @link_info: Link speed to program. If the speed is zero and auto-negotiation

 *		    is enabled, all possible negotiation speeds are advertised.

 *

 * Returns Zero on success, negative on failure

 */

int cvmx_helper_board_link_set_phy(int phy_addr,

				   cvmx_helper_board_set_phy_link_flags_types_t

				   link_flags,

				   cvmx_helper_link_info_t link_info)

{



	/* Set the flow control settings based on link_flags */

	if ((link_flags & set_phy_link_flags_flow_control_mask) !=

	    set_phy_link_flags_flow_control_dont_touch) {

		cvmx_mdio_phy_reg_autoneg_adver_t reg_autoneg_adver;

		reg_autoneg_adver.u16 =

		    cvmx_mdio_read(phy_addr >> 8, phy_addr & 0xff,

				   CVMX_MDIO_PHY_REG_AUTONEG_ADVER);

		reg_autoneg_adver.s.asymmetric_pause =

		    (link_flags & set_phy_link_flags_flow_control_mask) ==

		    set_phy_link_flags_flow_control_enable;

		reg_autoneg_adver.s.pause =

		    (link_flags & set_phy_link_flags_flow_control_mask) ==

		    set_phy_link_flags_flow_control_enable;

		cvmx_mdio_write(phy_addr >> 8, phy_addr & 0xff,

				CVMX_MDIO_PHY_REG_AUTONEG_ADVER,

				reg_autoneg_adver.u16);

	}



	/* If speed isn't set and autoneg is on advertise all supported modes */

	if ((link_flags & set_phy_link_flags_autoneg)

	    && (link_info.s.speed == 0)) {

		cvmx_mdio_phy_reg_control_t reg_control;

		cvmx_mdio_phy_reg_status_t reg_status;

		cvmx_mdio_phy_reg_autoneg_adver_t reg_autoneg_adver;

		cvmx_mdio_phy_reg_extended_status_t reg_extended_status;

		cvmx_mdio_phy_reg_control_1000_t reg_control_1000;



		reg_status.u16 =

		    cvmx_mdio_read(phy_addr >> 8, phy_addr & 0xff,

				   CVMX_MDIO_PHY_REG_STATUS);

		reg_autoneg_adver.u16 =

		    cvmx_mdio_read(phy_addr >> 8, phy_addr & 0xff,

				   CVMX_MDIO_PHY_REG_AUTONEG_ADVER);

		reg_autoneg_adver.s.advert_100base_t4 =

		    reg_status.s.capable_100base_t4;

		reg_autoneg_adver.s.advert_10base_tx_full =

		    reg_status.s.capable_10_full;

		reg_autoneg_adver.s.advert_10base_tx_half =

		    reg_status.s.capable_10_half;

		reg_autoneg_adver.s.advert_100base_tx_full =

		    reg_status.s.capable_100base_x_full;

		reg_autoneg_adver.s.advert_100base_tx_half =

		    reg_status.s.capable_100base_x_half;

		cvmx_mdio_write(phy_addr >> 8, phy_addr & 0xff,

				CVMX_MDIO_PHY_REG_AUTONEG_ADVER,

				reg_autoneg_adver.u16);

		if (reg_status.s.capable_extended_status) {

			reg_extended_status.u16 =

			    cvmx_mdio_read(phy_addr >> 8, phy_addr & 0xff,

					   CVMX_MDIO_PHY_REG_EXTENDED_STATUS);

			reg_control_1000.u16 =

			    cvmx_mdio_read(phy_addr >> 8, phy_addr & 0xff,

					   CVMX_MDIO_PHY_REG_CONTROL_1000);

			reg_control_1000.s.advert_1000base_t_full =

			    reg_extended_status.s.capable_1000base_t_full;

			reg_control_1000.s.advert_1000base_t_half =

			    reg_extended_status.s.capable_1000base_t_half;

			cvmx_mdio_write(phy_addr >> 8, phy_addr & 0xff,

					CVMX_MDIO_PHY_REG_CONTROL_1000,

					reg_control_1000.u16);

		}

		reg_control.u16 =

		    cvmx_mdio_read(phy_addr >> 8, phy_addr & 0xff,

				   CVMX_MDIO_PHY_REG_CONTROL);

		reg_control.s.autoneg_enable = 1;

		reg_control.s.restart_autoneg = 1;

		cvmx_mdio_write(phy_addr >> 8, phy_addr & 0xff,

				CVMX_MDIO_PHY_REG_CONTROL, reg_control.u16);

	} else if ((link_flags & set_phy_link_flags_autoneg)) {

		cvmx_mdio_phy_reg_control_t reg_control;

		cvmx_mdio_phy_reg_status_t reg_status;

		cvmx_mdio_phy_reg_autoneg_adver_t reg_autoneg_adver;

		cvmx_mdio_phy_reg_control_1000_t reg_control_1000;



		reg_status.u16 =

		    cvmx_mdio_read(phy_addr >> 8, phy_addr & 0xff,

				   CVMX_MDIO_PHY_REG_STATUS);

		reg_autoneg_adver.u16 =

		    cvmx_mdio_read(phy_addr >> 8, phy_addr & 0xff,

				   CVMX_MDIO_PHY_REG_AUTONEG_ADVER);

		reg_autoneg_adver.s.advert_100base_t4 = 0;

		reg_autoneg_adver.s.advert_10base_tx_full = 0;

		reg_autoneg_adver.s.advert_10base_tx_half = 0;

		reg_autoneg_adver.s.advert_100base_tx_full = 0;

		reg_autoneg_adver.s.advert_100base_tx_half = 0;

		if (reg_status.s.capable_extended_status) {

			reg_control_1000.u16 =

			    cvmx_mdio_read(phy_addr >> 8, phy_addr & 0xff,

					   CVMX_MDIO_PHY_REG_CONTROL_1000);

			reg_control_1000.s.advert_1000base_t_full = 0;

			reg_control_1000.s.advert_1000base_t_half = 0;

		}

		switch (link_info.s.speed) {

		case 10:

			reg_autoneg_adver.s.advert_10base_tx_full =

			    link_info.s.full_duplex;

			reg_autoneg_adver.s.advert_10base_tx_half =

			    !link_info.s.full_duplex;

			break;

		case 100:

			reg_autoneg_adver.s.advert_100base_tx_full =

			    link_info.s.full_duplex;

			reg_autoneg_adver.s.advert_100base_tx_half =

			    !link_info.s.full_duplex;

			break;

		case 1000:

			reg_control_1000.s.advert_1000base_t_full =

			    link_info.s.full_duplex;

			reg_control_1000.s.advert_1000base_t_half =

			    !link_info.s.full_duplex;

			break;

		}

		cvmx_mdio_write(phy_addr >> 8, phy_addr & 0xff,

				CVMX_MDIO_PHY_REG_AUTONEG_ADVER,

				reg_autoneg_adver.u16);

		if (reg_status.s.capable_extended_status)

			cvmx_mdio_write(phy_addr >> 8, phy_addr & 0xff,

					CVMX_MDIO_PHY_REG_CONTROL_1000,

					reg_control_1000.u16);

		reg_control.u16 =

		    cvmx_mdio_read(phy_addr >> 8, phy_addr & 0xff,

				   CVMX_MDIO_PHY_REG_CONTROL);

		reg_control.s.autoneg_enable = 1;

		reg_control.s.restart_autoneg = 1;

		cvmx_mdio_write(phy_addr >> 8, phy_addr & 0xff,

				CVMX_MDIO_PHY_REG_CONTROL, reg_control.u16);

	} else {

		cvmx_mdio_phy_reg_control_t reg_control;

		reg_control.u16 =

		    cvmx_mdio_read(phy_addr >> 8, phy_addr & 0xff,

				   CVMX_MDIO_PHY_REG_CONTROL);

		reg_control.s.autoneg_enable = 0;

		reg_control.s.restart_autoneg = 1;

		reg_control.s.duplex = link_info.s.full_duplex;

		if (link_info.s.speed == 1000) {

			reg_control.s.speed_msb = 1;

			reg_control.s.speed_lsb = 0;

		} else if (link_info.s.speed == 100) {

			reg_control.s.speed_msb = 0;

			reg_control.s.speed_lsb = 1;

		} else if (link_info.s.speed == 10) {

			reg_control.s.speed_msb = 0;

			reg_control.s.speed_lsb = 0;

		}

		cvmx_mdio_write(phy_addr >> 8, phy_addr & 0xff,

				CVMX_MDIO_PHY_REG_CONTROL, reg_control.u16);

	}

	return 0;

}



/**

 * This function is called by cvmx_helper_interface_probe() after it

 * determines the number of ports Octeon can support on a specific

arch/mips/include/asm/octeon/cvmx-helper-board.h

+0 −20
Original line number Diff line number Diff line
@@ -75,26 +75,6 @@ typedef enum { 
 */

extern int cvmx_helper_board_get_mii_address(int ipd_port);



/**

 * This function as a board specific method of changing the PHY

 * speed, duplex, and autonegotiation. This programs the PHY and

 * not Octeon. This can be used to force Octeon's links to

 * specific settings.

 *

 * @phy_addr:  The address of the PHY to program

 * @link_flags:

 *		    Flags to control autonegotiation.  Bit 0 is autonegotiation

 *		    enable/disable to maintain backward compatibility.

 * @link_info: Link speed to program. If the speed is zero and autonegotiation

 *		    is enabled, all possible negotiation speeds are advertised.

 *

 * Returns Zero on success, negative on failure

 */

int cvmx_helper_board_link_set_phy(int phy_addr,

				   cvmx_helper_board_set_phy_link_flags_types_t

				   link_flags,

				   cvmx_helper_link_info_t link_info);



/**

 * This function is the board specific method of determining an

 * ethernet ports link speed. Most Octeon boards have Marvell PHYs

CRA Git | Maintained and supported by SUSTech CRA and CCSE