From 7e20e901d3e78e0544c9225efbf2ce1d64a4db0b Mon Sep 17 00:00:00 2001 From: Grant Grundler Date: Sun, 17 Feb 2008 11:30:23 -0700 Subject: [PATCH] --- yaml --- r: 86439 b: refs/heads/master c: 7a7d23dac29825a75e375800573d53e49d864a42 h: refs/heads/master i: 86437: 3e9a1afa57c86954ff748466dd04b9bb8de57c05 86435: 9ab754d17eb56931615f83c0445a9863ca124edf 86431: ab75be4b1613ca0b52c0f16536a2e0b2b8a7c357 v: v3 --- [refs] | 2 +- trunk/drivers/net/tulip/uli526x.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7f6e4a4f3f30..fc6fa6c37911 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 740db6d7f5bf194abf327613a5a500e3729fc19a +refs/heads/master: 7a7d23dac29825a75e375800573d53e49d864a42 diff --git a/trunk/drivers/net/tulip/uli526x.c b/trunk/drivers/net/tulip/uli526x.c index a7afeea156bd..a59c1f224aa8 100644 --- a/trunk/drivers/net/tulip/uli526x.c +++ b/trunk/drivers/net/tulip/uli526x.c @@ -482,9 +482,11 @@ static void uli526x_init(struct net_device *dev) struct uli526x_board_info *db = netdev_priv(dev); unsigned long ioaddr = db->ioaddr; u8 phy_tmp; + u8 timeout; u16 phy_value; u16 phy_reg_reset; + ULI526X_DBUG(0, "uli526x_init()", 0); /* Reset M526x MAC controller */ @@ -509,11 +511,19 @@ static void uli526x_init(struct net_device *dev) /* Parser SROM and media mode */ db->media_mode = uli526x_media_mode; - /* Phyxcer capability setting */ + /* phyxcer capability setting */ phy_reg_reset = phy_read(db->ioaddr, db->phy_addr, 0, db->chip_id); phy_reg_reset = (phy_reg_reset | 0x8000); phy_write(db->ioaddr, db->phy_addr, 0, phy_reg_reset, db->chip_id); + + /* See IEEE 802.3-2002.pdf (Section 2, Chapter "22.2.4 Management + * functions") or phy data sheet for details on phy reset + */ udelay(500); + timeout = 10; + while (timeout-- && + phy_read(db->ioaddr, db->phy_addr, 0, db->chip_id) & 0x8000) + udelay(100); /* Process Phyxcer Media Mode */ uli526x_set_phyxcer(db);