net: ethoc: Account for duplex changes

ethoc_mdio_poll() which is our PHYLIB adjust_link callback does nothing,
we should at least react to duplex changes and change MODER accordingly.
Speed changes is not a problem, since the OpenCores Ethernet core seems
to be reacting okay without us telling it.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Tobias Klauser <tklauser@distanz.ch>
Acked-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c
index 6456c180114bba6b7e9f2cca56bbe235f94b96ea..877c02a36c85a5ebae5b17af848d69335e35fa5a 100644 (file)
--- a/drivers/net/ethernet/ethoc.c
+++ b/drivers/net/ethernet/ethoc.c
@@ -221,6 +221,9 @@ struct ethoc {
        struct mii_bus *mdio;
        struct clk *clk;
        s8 phy_id;
+
+       int old_link;
+       int old_duplex;
 };
 
 /**
@@ -667,6 +670,32 @@ static int ethoc_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val)
 
 static void ethoc_mdio_poll(struct net_device *dev)
 {
+       struct ethoc *priv = netdev_priv(dev);
+       struct phy_device *phydev = dev->phydev;
+       bool changed = false;
+       u32 mode;
+
+       if (priv->old_link != phydev->link) {
+               changed = true;
+               priv->old_link = phydev->link;
+       }
+
+       if (priv->old_duplex != phydev->duplex) {
+               changed = true;
+               priv->old_duplex = phydev->duplex;
+       }
+
+       if (!changed)
+               return;
+
+       mode = ethoc_read(priv, MODER);
+       if (phydev->duplex == DUPLEX_FULL)
+               mode |= MODER_FULLD;
+       else
+               mode &= ~MODER_FULLD;
+       ethoc_write(priv, MODER, mode);
+
+       phy_print_status(phydev);
 }
 
 static int ethoc_mdio_probe(struct net_device *dev)
@@ -685,6 +714,9 @@ static int ethoc_mdio_probe(struct net_device *dev)
                return -ENXIO;
        }
 
+       priv->old_duplex = -1;
+       priv->old_link = -1;
+
        err = phy_connect_direct(dev, phy, ethoc_mdio_poll,
                                 PHY_INTERFACE_MODE_GMII);
        if (err) {
@@ -721,6 +753,9 @@ static int ethoc_open(struct net_device *dev)
                netif_start_queue(dev);
        }
 
+       priv->old_link = -1;
+       priv->old_duplex = -1;
+
        phy_start(dev->phydev);
        napi_enable(&priv->napi);