imx6: fix USB for 4.9 kernel
[oweals/openwrt.git] / target / linux / mvebu / patches-4.4 / 139-net-mvneta-add-flow-control-support-via-phylink.patch
1 From 7bd34822b9922beb22a6384d9190646105d259d8 Mon Sep 17 00:00:00 2001
2 From: Russell King <rmk+kernel@arm.linux.org.uk>
3 Date: Thu, 1 Oct 2015 17:41:44 +0100
4 Subject: [PATCH 727/744] net: mvneta: add flow control support via phylink
5
6 Add flow control support to mvneta, including the ethtool hooks.  This
7 uses the phylink code to calculate the result of autonegotiation where
8 a phy is attached, and to handle the ethtool settings.
9
10 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
11 ---
12  drivers/net/ethernet/marvell/mvneta.c | 22 +++++++++++++++++++++-
13  1 file changed, 21 insertions(+), 1 deletion(-)
14
15 --- a/drivers/net/ethernet/marvell/mvneta.c
16 +++ b/drivers/net/ethernet/marvell/mvneta.c
17 @@ -3208,6 +3208,8 @@ static void mvneta_mac_config(struct net
18  
19         if (state->advertising & ADVERTISED_Pause)
20                 new_an |= MVNETA_GMAC_ADVERT_SYM_FLOW_CTRL;
21 +       if (state->pause & MLO_PAUSE_TXRX_MASK)
22 +               new_an |= MVNETA_GMAC_CONFIG_FLOW_CTRL;
23  
24         switch (mode) {
25         case MLO_AN_SGMII:
26 @@ -3232,7 +3234,7 @@ static void mvneta_mac_config(struct net
27                          /* The MAC only supports FD mode */
28                          MVNETA_GMAC_CONFIG_FULL_DUPLEX;
29  
30 -               if (state->an_enabled)
31 +               if (state->pause & MLO_PAUSE_AN && state->an_enabled)
32                         new_an |= MVNETA_GMAC_AN_FLOW_CTRL_EN;
33                 break;
34  
35 @@ -3685,6 +3687,22 @@ static int mvneta_ethtool_set_ringparam(
36         return 0;
37  }
38  
39 +static void mvneta_ethtool_get_pauseparam(struct net_device *dev,
40 +                                         struct ethtool_pauseparam *pause)
41 +{
42 +       struct mvneta_port *pp = netdev_priv(dev);
43 +
44 +       phylink_ethtool_get_pauseparam(pp->phylink, pause);
45 +}
46 +
47 +static int mvneta_ethtool_set_pauseparam(struct net_device *dev,
48 +                                        struct ethtool_pauseparam *pause)
49 +{
50 +       struct mvneta_port *pp = netdev_priv(dev);
51 +
52 +       return phylink_ethtool_set_pauseparam(pp->phylink, pause);
53 +}
54 +
55  static void mvneta_ethtool_get_strings(struct net_device *netdev, u32 sset,
56                                        u8 *data)
57  {
58 @@ -3866,6 +3884,8 @@ const struct ethtool_ops mvneta_eth_tool
59         .get_drvinfo    = mvneta_ethtool_get_drvinfo,
60         .get_ringparam  = mvneta_ethtool_get_ringparam,
61         .set_ringparam  = mvneta_ethtool_set_ringparam,
62 +       .get_pauseparam = mvneta_ethtool_get_pauseparam,
63 +       .set_pauseparam = mvneta_ethtool_set_pauseparam,
64         .get_strings    = mvneta_ethtool_get_strings,
65         .get_ethtool_stats = mvneta_ethtool_get_stats,
66         .get_sset_count = mvneta_ethtool_get_sset_count,