mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
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>
This commit is contained in:
parent
de3edab427
commit
bf793295e1
1 changed files with 20 additions and 2 deletions
|
@ -571,8 +571,8 @@ static void rtl8169_xmii_reset_enable(void __iomem *ioaddr)
|
||||||
{
|
{
|
||||||
unsigned int val;
|
unsigned int val;
|
||||||
|
|
||||||
val = (mdio_read(ioaddr, MII_BMCR) | BMCR_RESET) & 0xffff;
|
mdio_write(ioaddr, MII_BMCR, BMCR_RESET);
|
||||||
mdio_write(ioaddr, MII_BMCR, val);
|
val = mdio_read(ioaddr, MII_BMCR);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void rtl8169_check_link_status(struct net_device *dev,
|
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);
|
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)
|
static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)
|
||||||
{
|
{
|
||||||
void __iomem *ioaddr = tp->mmio_addr;
|
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_link_option(board_idx, &autoneg, &speed, &duplex);
|
||||||
|
|
||||||
|
rtl8169_phy_reset(dev, tp);
|
||||||
|
|
||||||
rtl8169_set_speed(dev, autoneg, speed, duplex);
|
rtl8169_set_speed(dev, autoneg, speed, duplex);
|
||||||
|
|
||||||
if ((RTL_R8(PHYstatus) & TBI_Enable) && netif_msg_link(tp))
|
if ((RTL_R8(PHYstatus) & TBI_Enable) && netif_msg_link(tp))
|
||||||
|
|
Loading…
Reference in a new issue