diff options
author | Felix Fietkau <nbd@openwrt.org> | 2008-09-29 01:08:17 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2008-09-29 01:08:17 +0000 |
commit | bc92b67c41bb9eb64dd342735cf04d0ca5098926 (patch) | |
tree | fb3cad267265be9ac8eb1532182422f278dc3d0a /target/linux/ixp4xx/patches-2.6.27/203-npe_driver_phy_reset_autoneg.patch | |
parent | 9b2097af21c4298fb67622266d5587e4e680fc5c (diff) | |
download | master-31e0f0ae-bc92b67c41bb9eb64dd342735cf04d0ca5098926.tar.gz master-31e0f0ae-bc92b67c41bb9eb64dd342735cf04d0ca5098926.tar.bz2 master-31e0f0ae-bc92b67c41bb9eb64dd342735cf04d0ca5098926.zip |
port generic and ixp4xx kernel patches to 2.6.27 (compiles except for iptables, but otherwise completely untested)
SVN-Revision: 12790
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.27/203-npe_driver_phy_reset_autoneg.patch')
-rw-r--r-- | target/linux/ixp4xx/patches-2.6.27/203-npe_driver_phy_reset_autoneg.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.27/203-npe_driver_phy_reset_autoneg.patch b/target/linux/ixp4xx/patches-2.6.27/203-npe_driver_phy_reset_autoneg.patch new file mode 100644 index 0000000000..699763f518 --- /dev/null +++ b/target/linux/ixp4xx/patches-2.6.27/203-npe_driver_phy_reset_autoneg.patch @@ -0,0 +1,42 @@ +--- a/drivers/net/arm/ixp4xx_eth.c ++++ b/drivers/net/arm/ixp4xx_eth.c +@@ -322,8 +322,12 @@ + struct port *port = netdev_priv(dev); + int phy_id = port->mii[idx].phy_id; + int cycles = 0; ++ u16 bmcr; + +- mdio_write(dev, phy_id, MII_BMCR, port->mii_bmcr[idx] | BMCR_RESET); ++ /* reset the PHY */ ++ bmcr = mdio_read(dev, phy_id, MII_BMCR); ++ bmcr |= BMCR_ANENABLE; ++ mdio_write(dev, phy_id, MII_BMCR, bmcr | BMCR_RESET); + + while (cycles < MAX_MII_RESET_RETRIES) { + if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) { +@@ -331,13 +335,23 @@ + printk(KERN_DEBUG "%s: phy_reset() took %i cycles\n", + dev->name, cycles); + #endif +- return; ++ break; + } + udelay(1); + cycles++; + } + +- printk(KERN_ERR "%s: MII reset failed on PHY%2d\n", dev->name, phy_id); ++ if (cycles == MAX_MII_RESET_RETRIES) { ++ printk(KERN_ERR "%s: MII reset failed on PHY%2d\n", dev->name, ++ phy_id); ++ return; ++ } ++ ++ /* restart auto negotiation */ ++ bmcr = mdio_read(dev, phy_id, MII_BMCR); ++ bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART); ++ mdio_write(dev, phy_id, MII_BMCR, bmcr); ++ + } + + static void eth_set_duplex(struct port *port, int full_duplex) |