You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
77 lines
2.5 KiB
Diff
77 lines
2.5 KiB
Diff
From: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
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 <rmk+kernel@arm.linux.org.uk>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/marvell/mvneta.c
|
|
+++ b/drivers/net/ethernet/marvell/mvneta.c
|
|
@@ -3179,6 +3179,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;
|
|
}
|
|
|
|
@@ -3221,6 +3227,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:
|
|
@@ -3245,7 +3253,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;
|
|
|
|
@@ -3711,6 +3719,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)
|
|
{
|
|
@@ -3902,6 +3926,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,
|