| Message ID | 1403362076-7777-6-git-send-email-linux@rainbow-software.org |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 06/21/2014 06:47 PM, Ondrej Zary wrote: > When link is lost on a card which uses internal PHY for 10 Mbit speeds, > restart autonegotiation to allow switching between 10 and 100 Mbps speeds. > > Signed-off-by: Ondrej Zary <linux@rainbow-software.org> > --- > drivers/net/ethernet/ti/tlan.c | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c > index 31d4a96..47eb30e 100644 > --- a/drivers/net/ethernet/ti/tlan.c > +++ b/drivers/net/ethernet/ti/tlan.c [...] > @@ -2788,6 +2789,20 @@ static void tlan_phy_monitor(unsigned long data) > dev->name); > tlan_dio_write8(dev->base_addr, TLAN_LED_REG, 0); > netif_carrier_off(dev); > + if (priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10) { > + /* power down internal PHY */ > + u16 data = MII_GC_PDOWN | MII_GC_LOOPBK | > + MII_GC_ISOLATE; Please insert empty line here, after declaration. > + tlan_mii_sync(dev->base_addr); > + tlan_mii_write_reg(dev, priv->phy[0], > + MII_GEN_CTL, data); > + /* set to external PHY */ > + priv->phy_num = 1; > + /* restart autonegotiation */ > + tlan_set_timer(dev, 4 * HZ / 10, > + TLAN_TIMER_PHY_PDOWN); > + return; > + } > } > } WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c index 31d4a96..47eb30e 100644 --- a/drivers/net/ethernet/ti/tlan.c +++ b/drivers/net/ethernet/ti/tlan.c @@ -2721,6 +2721,7 @@ static void tlan_phy_finish_auto_neg(struct net_device *dev) else if (!(mode & 0x0080) && (mode & 0x0040)) priv->tlan_full_duplex = true; + /* switch to internal PHY for 10 Mbps */ if ((!(mode & 0x0180)) && (priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10) && (priv->phy_num != 0)) { @@ -2788,6 +2789,20 @@ static void tlan_phy_monitor(unsigned long data) dev->name); tlan_dio_write8(dev->base_addr, TLAN_LED_REG, 0); netif_carrier_off(dev); + if (priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10) { + /* power down internal PHY */ + u16 data = MII_GC_PDOWN | MII_GC_LOOPBK | + MII_GC_ISOLATE; + tlan_mii_sync(dev->base_addr); + tlan_mii_write_reg(dev, priv->phy[0], + MII_GEN_CTL, data); + /* set to external PHY */ + priv->phy_num = 1; + /* restart autonegotiation */ + tlan_set_timer(dev, 4 * HZ / 10, + TLAN_TIMER_PHY_PDOWN); + return; + } } }
When link is lost on a card which uses internal PHY for 10 Mbit speeds, restart autonegotiation to allow switching between 10 and 100 Mbps speeds. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> --- drivers/net/ethernet/ti/tlan.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)