diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2006-10-31 23:53:05 (GMT) |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-02 05:12:01 (GMT) |
| commit | bf793295e1090af84972750898bf8470df5e5419 (patch) | |
| tree | 900158abf33dd5fa98dca6506fb82dd15f59353b | |
| parent | de3edab4276c3c789f64dc3d78eea027709fef0e (diff) | |
| download | linux-bf793295e1090af84972750898bf8470df5e5419.tar.xz | |
r8169: perform a PHY reset before any other operation at boot time
Realtek's 8139/810x (0x8136) PCI-E comes with a touchy PHY.
A big heavy reset seems to calm it down.
Fix for http://bugzilla.kernel.org/show_bug.cgi?id=7378.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Darren Salt <linux@youmustbejoking.demon.co.uk>
| -rw-r--r-- | drivers/net/r8169.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index b977ed8..45d3ca4 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -571,8 +571,8 @@ static void rtl8169_xmii_reset_enable(void __iomem *ioaddr) { unsigned int val; - val = (mdio_read(ioaddr, MII_BMCR) | BMCR_RESET) & 0xffff; - mdio_write(ioaddr, MII_BMCR, val); + mdio_write(ioaddr, MII_BMCR, BMCR_RESET); + val = mdio_read(ioaddr, MII_BMCR); } static void rtl8169_check_link_status(struct net_device *dev, @@ -1406,6 +1406,22 @@ static void rtl8169_release_board(struct pci_dev *pdev, struct net_device *dev, free_netdev(dev); } +static void rtl8169_phy_reset(struct net_device *dev, + struct rtl8169_private *tp) +{ + void __iomem *ioaddr = tp->mmio_addr; + int i; + + tp->phy_reset_enable(ioaddr); + for (i = 0; i < 100; i++) { + if (!tp->phy_reset_pending(ioaddr)) + return; + msleep(1); + } + if (netif_msg_link(tp)) + printk(KERN_ERR "%s: PHY reset failed.\n", dev->name); +} + static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp) { void __iomem *ioaddr = tp->mmio_addr; @@ -1434,6 +1450,8 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp) rtl8169_link_option(board_idx, &autoneg, &speed, &duplex); + rtl8169_phy_reset(dev, tp); + rtl8169_set_speed(dev, autoneg, speed, duplex); if ((RTL_R8(PHYstatus) & TBI_Enable) && netif_msg_link(tp)) |