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

net: mvneta: use resolved link config in mac_link_up() 



Convert the Marvell mvneta ethernet driver to use the finalised link
parameters in mac_link_up() rather than the parameters in mac_config().

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

drivers/net/ethernet/marvell/mvneta.c

+38 −17
Original line number Diff line number Diff line
@@ -3830,13 +3830,9 @@ static void mvneta_mac_config(struct phylink_config *config, unsigned int mode, 
	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_CONFIG_MII_SPEED |

			     MVNETA_GMAC_CONFIG_GMII_SPEED |

			     MVNETA_GMAC_AN_SPEED_EN |

			     MVNETA_GMAC_ADVERT_SYM_FLOW_CTRL |

			     MVNETA_GMAC_CONFIG_FLOW_CTRL |

			     MVNETA_GMAC_AN_FLOW_CTRL_EN |

			     MVNETA_GMAC_CONFIG_FULL_DUPLEX |

			     MVNETA_GMAC_AN_DUPLEX_EN);



	/* Even though it might look weird, when we're configured in
@@ -3851,24 +3847,20 @@ static void mvneta_mac_config(struct phylink_config *config, unsigned int mode, 


	if (phylink_test(state->advertising, Pause))

		new_an |= MVNETA_GMAC_ADVERT_SYM_FLOW_CTRL;

	if (state->pause & MLO_PAUSE_TXRX_MASK)

		new_an |= MVNETA_GMAC_CONFIG_FLOW_CTRL;



	if (!phylink_autoneg_inband(mode)) {

		/* Phy or fixed speed */

		if (state->duplex)

			new_an |= MVNETA_GMAC_CONFIG_FULL_DUPLEX;



		if (state->speed == SPEED_1000 || state->speed == SPEED_2500)

			new_an |= MVNETA_GMAC_CONFIG_GMII_SPEED;

		else if (state->speed == SPEED_100)

			new_an |= MVNETA_GMAC_CONFIG_MII_SPEED;

		/* Phy or fixed speed - nothing to do, leave the

		 * configured speed, duplex and flow control as-is.

		 */

	} 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_FORCE_LINK_PASS |

				     MVNETA_GMAC_CONFIG_MII_SPEED |

				     MVNETA_GMAC_CONFIG_GMII_SPEED |

				     MVNETA_GMAC_CONFIG_FULL_DUPLEX)) |

			 MVNETA_GMAC_INBAND_AN_ENABLE |

			 MVNETA_GMAC_AN_SPEED_EN |

			 MVNETA_GMAC_AN_DUPLEX_EN;
@@ -3877,7 +3869,8 @@ static void mvneta_mac_config(struct phylink_config *config, unsigned int mode, 
		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_FORCE_LINK_PASS |

				     MVNETA_GMAC_CONFIG_MII_SPEED)) |

			 MVNETA_GMAC_INBAND_AN_ENABLE |

			 MVNETA_GMAC_CONFIG_GMII_SPEED |

			 /* The MAC only supports FD mode */
@@ -3977,8 +3970,36 @@ static void mvneta_mac_link_up(struct phylink_config *config, 


	if (!phylink_autoneg_inband(mode)) {

		val = mvreg_read(pp, MVNETA_GMAC_AUTONEG_CONFIG);

		val &= ~MVNETA_GMAC_FORCE_LINK_DOWN;

		val &= ~(MVNETA_GMAC_FORCE_LINK_DOWN |

			 MVNETA_GMAC_CONFIG_MII_SPEED |

			 MVNETA_GMAC_CONFIG_GMII_SPEED |

			 MVNETA_GMAC_CONFIG_FLOW_CTRL |

			 MVNETA_GMAC_CONFIG_FULL_DUPLEX);

		val |= MVNETA_GMAC_FORCE_LINK_PASS;



		if (speed == SPEED_1000 || speed == SPEED_2500)

			val |= MVNETA_GMAC_CONFIG_GMII_SPEED;

		else if (speed == SPEED_100)

			val |= MVNETA_GMAC_CONFIG_MII_SPEED;



		if (duplex == DUPLEX_FULL)

			val |= MVNETA_GMAC_CONFIG_FULL_DUPLEX;



		if (tx_pause || rx_pause)

			val |= MVNETA_GMAC_CONFIG_FLOW_CTRL;



		mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val);

	} else {

		/* When inband doesn't cover flow control or flow control is

		 * disabled, we need to manually configure it. This bit will

		 * only have effect if MVNETA_GMAC_AN_FLOW_CTRL_EN is unset.

		 */

		val = mvreg_read(pp, MVNETA_GMAC_AUTONEG_CONFIG);

		val &= ~MVNETA_GMAC_CONFIG_FLOW_CTRL;



		if (tx_pause || rx_pause)

			val |= MVNETA_GMAC_CONFIG_FLOW_CTRL;



		mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE