Commit 5a7d8953 authored by Russell King's avatar Russell King Committed by David S. Miller
Browse files

net: mvneta: convert to use mac_prepare()/mac_finish() 



Convert mvneta to use the mac_prepare() and mac_finish() methods in
preparation to converting mvneta to split-PCS support.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 85e3e0eb

drivers/net/ethernet/marvell/mvneta.c

+68 −35
Original line number Diff line number Diff line
@@ -3905,6 +3905,40 @@ static void mvneta_mac_an_restart(struct phylink_config *config) 
		    gmac_an & ~MVNETA_GMAC_INBAND_RESTART_AN);

}



static int mvneta_mac_prepare(struct phylink_config *config, unsigned int mode,

			      phy_interface_t interface)

{

	struct net_device *ndev = to_net_dev(config->dev);

	struct mvneta_port *pp = netdev_priv(ndev);

	u32 val;



	if (pp->phy_interface != interface ||

	    phylink_autoneg_inband(mode)) {

		/* Force the link down when changing the interface or if in

		 * in-band mode. According to Armada 370 documentation, we

		 * can only change the port mode and in-band enable when the

		 * link is down.

		 */

		val = mvreg_read(pp, MVNETA_GMAC_AUTONEG_CONFIG);

		val &= ~MVNETA_GMAC_FORCE_LINK_PASS;

		val |= MVNETA_GMAC_FORCE_LINK_DOWN;

		mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val);

	}



	if (pp->phy_interface != interface)

		WARN_ON(phy_power_off(pp->comphy));



	/* Enable the 1ms clock */

	if (phylink_autoneg_inband(mode)) {

		unsigned long rate = clk_get_rate(pp->clk);



		mvreg_write(pp, MVNETA_GMAC_CLOCK_DIVIDER,

			    MVNETA_GMAC_1MS_CLOCK_ENABLE | (rate / 1000));

	}



	return 0;

}



static void mvneta_mac_config(struct phylink_config *config, unsigned int mode,

			      const struct phylink_link_state *state)

{
@@ -3913,14 +3947,12 @@ static void mvneta_mac_config(struct phylink_config *config, unsigned int mode, 
	u32 new_ctrl0, gmac_ctrl0 = mvreg_read(pp, MVNETA_GMAC_CTRL_0);

	u32 new_ctrl2, gmac_ctrl2 = mvreg_read(pp, MVNETA_GMAC_CTRL_2);

	u32 new_ctrl4, gmac_ctrl4 = mvreg_read(pp, MVNETA_GMAC_CTRL_4);

	u32 new_clk, gmac_clk = mvreg_read(pp, MVNETA_GMAC_CLOCK_DIVIDER);

	u32 new_an, gmac_an = mvreg_read(pp, MVNETA_GMAC_AUTONEG_CONFIG);



	new_ctrl0 = gmac_ctrl0 & ~MVNETA_GMAC0_PORT_1000BASE_X;

	new_ctrl2 = gmac_ctrl2 & ~(MVNETA_GMAC2_INBAND_AN_ENABLE |

				   MVNETA_GMAC2_PORT_RESET);

	new_ctrl4 = gmac_ctrl4 & ~(MVNETA_GMAC4_SHORT_PREAMBLE_ENABLE);

	new_clk = gmac_clk & ~MVNETA_GMAC_1MS_CLOCK_ENABLE;

	new_an = gmac_an & ~(MVNETA_GMAC_INBAND_AN_ENABLE |

			     MVNETA_GMAC_INBAND_RESTART_AN |

			     MVNETA_GMAC_AN_SPEED_EN |
@@ -3948,10 +3980,7 @@ static void mvneta_mac_config(struct phylink_config *config, unsigned int mode, 
	} else if (state->interface == PHY_INTERFACE_MODE_SGMII) {

		/* SGMII mode receives the state from the PHY */

		new_ctrl2 |= MVNETA_GMAC2_INBAND_AN_ENABLE;

		new_clk = MVNETA_GMAC_1MS_CLOCK_ENABLE;

		new_an = (new_an & ~(MVNETA_GMAC_FORCE_LINK_DOWN |

				     MVNETA_GMAC_FORCE_LINK_PASS |

				     MVNETA_GMAC_CONFIG_MII_SPEED |

		new_an = (new_an & ~(MVNETA_GMAC_CONFIG_MII_SPEED |

				     MVNETA_GMAC_CONFIG_GMII_SPEED |

				     MVNETA_GMAC_CONFIG_FULL_DUPLEX)) |

			 MVNETA_GMAC_INBAND_AN_ENABLE |
@@ -3960,10 +3989,7 @@ static void mvneta_mac_config(struct phylink_config *config, unsigned int mode, 
	} else {

		/* 802.3z negotiation - only 1000base-X */

		new_ctrl0 |= MVNETA_GMAC0_PORT_1000BASE_X;

		new_clk = MVNETA_GMAC_1MS_CLOCK_ENABLE;

		new_an = (new_an & ~(MVNETA_GMAC_FORCE_LINK_DOWN |

				     MVNETA_GMAC_FORCE_LINK_PASS |

				     MVNETA_GMAC_CONFIG_MII_SPEED)) |

		new_an = (new_an & ~MVNETA_GMAC_CONFIG_MII_SPEED) |

			 MVNETA_GMAC_INBAND_AN_ENABLE |

			 MVNETA_GMAC_CONFIG_GMII_SPEED |

			 /* The MAC only supports FD mode */
@@ -3973,43 +3999,18 @@ static void mvneta_mac_config(struct phylink_config *config, unsigned int mode, 
			new_an |= MVNETA_GMAC_AN_FLOW_CTRL_EN;

	}



	/* Set the 1ms clock divisor */

	if (new_clk == MVNETA_GMAC_1MS_CLOCK_ENABLE)

		new_clk |= clk_get_rate(pp->clk) / 1000;



	/* Armada 370 documentation says we can only change the port mode

	 * and in-band enable when the link is down, so force it down

	 * while making these changes. We also do this for GMAC_CTRL2

	 */

	if ((new_ctrl0 ^ gmac_ctrl0) & MVNETA_GMAC0_PORT_1000BASE_X ||

	    (new_ctrl2 ^ gmac_ctrl2) & MVNETA_GMAC2_INBAND_AN_ENABLE ||

	    (new_an  ^ gmac_an) & MVNETA_GMAC_INBAND_AN_ENABLE) {

		mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG,

			    (gmac_an & ~MVNETA_GMAC_FORCE_LINK_PASS) |

			    MVNETA_GMAC_FORCE_LINK_DOWN);

	}





	/* When at 2.5G, the link partner can send frames with shortened

	 * preambles.

	 */

	if (state->interface == PHY_INTERFACE_MODE_2500BASEX)

		new_ctrl4 |= MVNETA_GMAC4_SHORT_PREAMBLE_ENABLE;



	if (pp->phy_interface != state->interface) {

		if (pp->comphy)

			WARN_ON(phy_power_off(pp->comphy));

		WARN_ON(mvneta_config_interface(pp, state->interface));

	}



	if (new_ctrl0 != gmac_ctrl0)

		mvreg_write(pp, MVNETA_GMAC_CTRL_0, new_ctrl0);

	if (new_ctrl2 != gmac_ctrl2)

		mvreg_write(pp, MVNETA_GMAC_CTRL_2, new_ctrl2);

	if (new_ctrl4 != gmac_ctrl4)

		mvreg_write(pp, MVNETA_GMAC_CTRL_4, new_ctrl4);

	if (new_clk != gmac_clk)

		mvreg_write(pp, MVNETA_GMAC_CLOCK_DIVIDER, new_clk);

	if (new_an != gmac_an)

		mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, new_an);
@@ -4020,6 +4021,36 @@ static void mvneta_mac_config(struct phylink_config *config, unsigned int mode, 
	}

}



static int mvneta_mac_finish(struct phylink_config *config, unsigned int mode,

			     phy_interface_t interface)

{

	struct net_device *ndev = to_net_dev(config->dev);

	struct mvneta_port *pp = netdev_priv(ndev);

	u32 val, clk;



	/* Disable 1ms clock if not in in-band mode */

	if (!phylink_autoneg_inband(mode)) {

		clk = mvreg_read(pp, MVNETA_GMAC_CLOCK_DIVIDER);

		clk &= ~MVNETA_GMAC_1MS_CLOCK_ENABLE;

		mvreg_write(pp, MVNETA_GMAC_CLOCK_DIVIDER, clk);

	}



	if (pp->phy_interface != interface)

		/* Enable the Serdes PHY */

		WARN_ON(mvneta_config_interface(pp, interface));



	/* Allow the link to come up if in in-band mode, otherwise the

	 * link is forced via mac_link_down()/mac_link_up()

	 */

	if (phylink_autoneg_inband(mode)) {

		val = mvreg_read(pp, MVNETA_GMAC_AUTONEG_CONFIG);

		val &= ~MVNETA_GMAC_FORCE_LINK_DOWN;

		mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val);

	}



	return 0;

}



static void mvneta_set_eee(struct mvneta_port *pp, bool enable)

{

	u32 lpi_ctl1;
@@ -4109,7 +4140,9 @@ static const struct phylink_mac_ops mvneta_phylink_ops = { 
	.validate = mvneta_validate,

	.mac_pcs_get_state = mvneta_mac_pcs_get_state,

	.mac_an_restart = mvneta_mac_an_restart,

	.mac_prepare = mvneta_mac_prepare,

	.mac_config = mvneta_mac_config,

	.mac_finish = mvneta_mac_finish,

	.mac_link_down = mvneta_mac_link_down,

	.mac_link_up = mvneta_mac_link_up,

};