Commit abf7e53e authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarTobias Klauser <tklauser@distanz.ch>
Acked-by: default avatarThierry Reding <thierry.reding@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1c0d32fd
...@@ -221,6 +221,9 @@ struct ethoc { ...@@ -221,6 +221,9 @@ struct ethoc {
struct mii_bus *mdio; struct mii_bus *mdio;
struct clk *clk; struct clk *clk;
s8 phy_id; 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) ...@@ -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) 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) static int ethoc_mdio_probe(struct net_device *dev)
...@@ -685,6 +714,9 @@ static int ethoc_mdio_probe(struct net_device *dev) ...@@ -685,6 +714,9 @@ static int ethoc_mdio_probe(struct net_device *dev)
return -ENXIO; return -ENXIO;
} }
priv->old_duplex = -1;
priv->old_link = -1;
err = phy_connect_direct(dev, phy, ethoc_mdio_poll, err = phy_connect_direct(dev, phy, ethoc_mdio_poll,
PHY_INTERFACE_MODE_GMII); PHY_INTERFACE_MODE_GMII);
if (err) { if (err) {
...@@ -721,6 +753,9 @@ static int ethoc_open(struct net_device *dev) ...@@ -721,6 +753,9 @@ static int ethoc_open(struct net_device *dev)
netif_start_queue(dev); netif_start_queue(dev);
} }
priv->old_link = -1;
priv->old_duplex = -1;
phy_start(dev->phydev); phy_start(dev->phydev);
napi_enable(&priv->napi); napi_enable(&priv->napi);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment