drivers: net: stmmac: add port selection programming

[mirror_ubuntu-artful-kernel.git] / drivers / net / ethernet / stmicro / stmmac / stmmac_ethtool.c

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index e2b98b01647e8341b57995d994375b1ad63a7b11..1e06173fc9d733d63c1e5ccbbc12c03506d0a44c 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -276,7 +276,8 @@ static int stmmac_ethtool_getsettings(struct net_device *dev,
        struct phy_device *phy = priv->phydev;
        int rc;
 
-       if ((priv->pcs & STMMAC_PCS_RGMII) || (priv->pcs & STMMAC_PCS_SGMII)) {
+       if (priv->hw->pcs & STMMAC_PCS_RGMII ||
+           priv->hw->pcs & STMMAC_PCS_SGMII) {
                struct rgmii_adv adv;
 
                if (!priv->xstats.pcs_link) {
@@ -289,10 +290,10 @@ static int stmmac_ethtool_getsettings(struct net_device *dev,
                ethtool_cmd_speed_set(cmd, priv->xstats.pcs_speed);
 
                /* Get and convert ADV/LP_ADV from the HW AN registers */
-               if (!priv->hw->mac->get_adv)
+               if (!priv->hw->mac->pcs_get_adv_lp)
                        return -EOPNOTSUPP;     /* should never happen indeed */
 
-               priv->hw->mac->get_adv(priv->hw, &adv);
+               priv->hw->mac->pcs_get_adv_lp(priv->ioaddr, &adv);
 
                /* Encoding of PSE bits is defined in 802.3z, 37.2.1.4 */
 
@@ -361,7 +362,8 @@ static int stmmac_ethtool_setsettings(struct net_device *dev,
        struct phy_device *phy = priv->phydev;
        int rc;
 
-       if ((priv->pcs & STMMAC_PCS_RGMII) || (priv->pcs & STMMAC_PCS_SGMII)) {
+       if (priv->hw->pcs & STMMAC_PCS_RGMII ||
+           priv->hw->pcs & STMMAC_PCS_SGMII) {
                u32 mask = ADVERTISED_Autoneg | ADVERTISED_Pause;
 
                /* Only support ANE */
@@ -376,8 +378,11 @@ static int stmmac_ethtool_setsettings(struct net_device *dev,
                        ADVERTISED_10baseT_Full);
 
                spin_lock(&priv->lock);
-               if (priv->hw->mac->ctrl_ane)
-                       priv->hw->mac->ctrl_ane(priv->hw, 1);
+
+               if (priv->hw->mac->pcs_ctrl_ane)
+                       priv->hw->mac->pcs_ctrl_ane(priv->ioaddr, 1,
+                                                   priv->hw->ps, 0);
+
                spin_unlock(&priv->lock);
 
                return 0;
@@ -452,11 +457,22 @@ stmmac_get_pauseparam(struct net_device *netdev,
 {
        struct stmmac_priv *priv = netdev_priv(netdev);
 
-       if (priv->pcs)  /* FIXME */
-               return;
-
        pause->rx_pause = 0;
        pause->tx_pause = 0;
+
+       if (priv->hw->pcs && priv->hw->mac->pcs_get_adv_lp) {
+               struct rgmii_adv adv_lp;
+
+               pause->autoneg = 1;
+               priv->hw->mac->pcs_get_adv_lp(priv->ioaddr, &adv_lp);
+               if (!adv_lp.pause)
+                       return;
+       } else {
+               if (!(priv->phydev->supported & SUPPORTED_Pause) ||
+                   !(priv->phydev->supported & SUPPORTED_Asym_Pause))
+                       return;
+       }
+
        pause->autoneg = priv->phydev->autoneg;
 
        if (priv->flow_ctrl & FLOW_RX)
@@ -473,10 +489,19 @@ stmmac_set_pauseparam(struct net_device *netdev,
        struct stmmac_priv *priv = netdev_priv(netdev);
        struct phy_device *phy = priv->phydev;
        int new_pause = FLOW_OFF;
-       int ret = 0;
 
-       if (priv->pcs)  /* FIXME */
-               return -EOPNOTSUPP;
+       if (priv->hw->pcs && priv->hw->mac->pcs_get_adv_lp) {
+               struct rgmii_adv adv_lp;
+
+               pause->autoneg = 1;
+               priv->hw->mac->pcs_get_adv_lp(priv->ioaddr, &adv_lp);
+               if (!adv_lp.pause)
+                       return -EOPNOTSUPP;
+       } else {
+               if (!(phy->supported & SUPPORTED_Pause) ||
+                   !(phy->supported & SUPPORTED_Asym_Pause))
+                       return -EOPNOTSUPP;
+       }
 
        if (pause->rx_pause)
                new_pause |= FLOW_RX;
@@ -488,11 +513,12 @@ stmmac_set_pauseparam(struct net_device *netdev,
 
        if (phy->autoneg) {
                if (netif_running(netdev))
-                       ret = phy_start_aneg(phy);
-       } else
-               priv->hw->mac->flow_ctrl(priv->hw, phy->duplex,
-                                        priv->flow_ctrl, priv->pause);
-       return ret;
+                       return phy_start_aneg(phy);
+       }
+
+       priv->hw->mac->flow_ctrl(priv->hw, phy->duplex, priv->flow_ctrl,
+                                priv->pause);
+       return 0;
 }
 
 static void stmmac_get_ethtool_stats(struct net_device *dev,