svn commit: r229545 - stable/7/sys/dev/mii
Pyun YongHyeon
yongari at FreeBSD.org
Thu Jan 5 00:11:04 UTC 2012
Author: yongari
Date: Thu Jan 5 00:11:04 2012
New Revision: 229545
URL: http://svn.freebsd.org/changeset/base/229545
Log:
MFC r227842:
For IP1001 PHY, do not set multi-port device(MASTER). Ideally this
bit should not affect link establishment process of auto-negotiation
if manual configuration is not used, which is true in auto-negotiation.
However it seems setting this bit interfere with IP1001 PHY's
down-shifting feature such that establishing a 10/100Mbps link failed
when 1000baseT link is not available during auto-negotiation process.
Modified:
stable/7/sys/dev/mii/ip1000phy.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/mii/ip1000phy.c
==============================================================================
--- stable/7/sys/dev/mii/ip1000phy.c Thu Jan 5 00:09:49 2012 (r229544)
+++ stable/7/sys/dev/mii/ip1000phy.c Thu Jan 5 00:11:04 2012 (r229545)
@@ -357,7 +357,8 @@ ip1000phy_mii_phy_auto(struct mii_softc
PHY_WRITE(sc, IP1000PHY_MII_ANAR, reg | IP1000PHY_ANAR_CSMA);
reg = IP1000PHY_1000CR_1000T | IP1000PHY_1000CR_1000T_FDX;
- reg |= IP1000PHY_1000CR_MASTER;
+ if (isc->model != MII_MODEL_ICPLUS_IP1001)
+ reg |= IP1000PHY_1000CR_MASTER;
PHY_WRITE(sc, IP1000PHY_MII_1000CR, reg);
PHY_WRITE(sc, IP1000PHY_MII_BMCR, (IP1000PHY_BMCR_FDX |
IP1000PHY_BMCR_AUTOEN | IP1000PHY_BMCR_STARTNEG));
More information about the svn-src-stable-7
mailing list