mvebu: add support for SFP

[openwrt/openwrt.git] / target / linux / mvebu / patches-4.4 / 139-net-mvneta-add-flow-control-support-via-phylink.patch

diff --git a/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch b/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch
new file mode 100644 (file)
index 0000000..75cd46e
--- /dev/null
+++ b/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch
@@ -0,0 +1,66 @@
+From 7bd34822b9922beb22a6384d9190646105d259d8 Mon Sep 17 00:00:00 2001
+From: Russell King <rmk+kernel@arm.linux.org.uk>
+Date: Thu, 1 Oct 2015 17:41:44 +0100
+Subject: [PATCH 727/744] 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>
+---
+ drivers/net/ethernet/marvell/mvneta.c | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/marvell/mvneta.c
++++ b/drivers/net/ethernet/marvell/mvneta.c
+@@ -3208,6 +3208,8 @@ static void mvneta_mac_config(struct net
+ 
+       if (state->advertising & ADVERTISED_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:
+@@ -3232,7 +3234,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;
+ 
+@@ -3685,6 +3687,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)
+ {
+@@ -3866,6 +3884,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,