| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576 |
- From: Russell King <[email protected]>
- Date: Thu, 1 Oct 2015 17:41:44 +0100
- Subject: [PATCH] net: mvneta: add flow control support via phylink
- Add flow control support to mvneta, including the ethtool hooks. This
- uses the phylink code to calculate the result of autonegotiation where
- a phy is attached, and to handle the ethtool settings.
- Signed-off-by: Russell King <[email protected]>
- ---
- --- a/drivers/net/ethernet/marvell/mvneta.c
- +++ b/drivers/net/ethernet/marvell/mvneta.c
- @@ -3180,6 +3180,12 @@ static int mvneta_mac_link_state(struct
- state->link = !!(gmac_stat & MVNETA_GMAC_LINK_UP);
- state->duplex = !!(gmac_stat & MVNETA_GMAC_FULL_DUPLEX);
-
- + state->pause = 0;
- + if (gmac_stat & MVNETA_GMAC_RX_FLOW_CTRL_ENABLE)
- + state->pause |= MLO_PAUSE_RX;
- + if (gmac_stat & MVNETA_GMAC_TX_FLOW_CTRL_ENABLE)
- + state->pause |= MLO_PAUSE_TX;
- +
- return 1;
- }
-
- @@ -3222,6 +3228,8 @@ static void mvneta_mac_config(struct net
-
- 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;
-
- switch (mode) {
- case MLO_AN_SGMII:
- @@ -3246,7 +3254,7 @@ static void mvneta_mac_config(struct net
- /* The MAC only supports FD mode */
- MVNETA_GMAC_CONFIG_FULL_DUPLEX;
-
- - if (state->an_enabled)
- + if (state->pause & MLO_PAUSE_AN && state->an_enabled)
- new_an |= MVNETA_GMAC_AN_FLOW_CTRL_EN;
- break;
-
- @@ -3712,6 +3720,22 @@ static int mvneta_ethtool_set_ringparam(
- return 0;
- }
-
- +static void mvneta_ethtool_get_pauseparam(struct net_device *dev,
- + struct ethtool_pauseparam *pause)
- +{
- + struct mvneta_port *pp = netdev_priv(dev);
- +
- + phylink_ethtool_get_pauseparam(pp->phylink, pause);
- +}
- +
- +static int mvneta_ethtool_set_pauseparam(struct net_device *dev,
- + struct ethtool_pauseparam *pause)
- +{
- + struct mvneta_port *pp = netdev_priv(dev);
- +
- + return phylink_ethtool_set_pauseparam(pp->phylink, pause);
- +}
- +
- static void mvneta_ethtool_get_strings(struct net_device *netdev, u32 sset,
- u8 *data)
- {
- @@ -3903,6 +3927,8 @@ const struct ethtool_ops mvneta_eth_tool
- .get_drvinfo = mvneta_ethtool_get_drvinfo,
- .get_ringparam = mvneta_ethtool_get_ringparam,
- .set_ringparam = mvneta_ethtool_set_ringparam,
- + .get_pauseparam = mvneta_ethtool_get_pauseparam,
- + .set_pauseparam = mvneta_ethtool_set_pauseparam,
- .get_strings = mvneta_ethtool_get_strings,
- .get_ethtool_stats = mvneta_ethtool_get_stats,
- .get_sset_count = mvneta_ethtool_get_sset_count,
|
