diff options
| author | yongari <yongari@FreeBSD.org> | 2008-09-30 08:18:38 +0000 |
|---|---|---|
| committer | yongari <yongari@FreeBSD.org> | 2008-09-30 08:18:38 +0000 |
| commit | a635b04c3f8e533d5d08ff5929c4ff55c05366d5 (patch) | |
| tree | f58c593c18510836cc10795abaff10561fcdfb1e /sys | |
| parent | cee43dc76f976f85e2d3e0e3ebaeb19635e6bd66 (diff) | |
| download | FreeBSD-src-a635b04c3f8e533d5d08ff5929c4ff55c05366d5.zip FreeBSD-src-a635b04c3f8e533d5d08ff5929c4ff55c05366d5.tar.gz | |
Save extended address register prior to switching to 1000BASE-X
only mode and restore original value of extended address register
instead of overwriting it with page 1. There are still instance
information passing issue(e.g configured media type: fiber or
copper) from driver to PHY layer but this change make the selected
PHY work with 88E1112 PHY.
Reported by: Krzysztof Jedruczyk < beaker <at> hot dot pl >
Tested by: Krzysztof Jedruczyk < beaker <at> hot dot pl >
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/mii/e1000phy.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/mii/e1000phy.c b/sys/dev/mii/e1000phy.c index 5de13ca..7f38983 100644 --- a/sys/dev/mii/e1000phy.c +++ b/sys/dev/mii/e1000phy.c @@ -210,7 +210,7 @@ static void e1000phy_reset(struct mii_softc *sc) { struct e1000phy_softc *esc; - uint16_t reg; + uint16_t reg, page; esc = (struct e1000phy_softc *)sc; reg = PHY_READ(sc, E1000_SCR); @@ -219,12 +219,13 @@ e1000phy_reset(struct mii_softc *sc) PHY_WRITE(sc, E1000_SCR, reg); if (esc->mii_model == MII_MODEL_MARVELL_E1112) { /* Select 1000BASE-X only mode. */ + page = PHY_READ(sc, E1000_EADR); PHY_WRITE(sc, E1000_EADR, 2); reg = PHY_READ(sc, E1000_SCR); reg &= ~E1000_SCR_MODE_MASK; reg |= E1000_SCR_MODE_1000BX; PHY_WRITE(sc, E1000_SCR, reg); - PHY_WRITE(sc, E1000_EADR, 1); + PHY_WRITE(sc, E1000_EADR, page); } } else { switch (esc->mii_model) { |
