mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Florian Fainelli 2016-12-04 12:40:28 -08:00 committed by David S. Miller
parent 1c0d32fde5
commit abf7e53e9e
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/net/ethernet/ethoc.c
View File

@ -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);