svn commit: r227842 - head/sys/dev/mii

Pyun YongHyeon yongari at FreeBSD.org
Tue Nov 22 21:22:07 UTC 2011


Author: yongari
Date: Tue Nov 22 21:22:06 2011
New Revision: 227842
URL: http://svn.freebsd.org/changeset/base/227842

Log:
  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.
  
  Tested by:	Andrey Smagin <samspeed <> mail dot ru >

Modified:
  head/sys/dev/mii/ip1000phy.c

Modified: head/sys/dev/mii/ip1000phy.c
==============================================================================
--- head/sys/dev/mii/ip1000phy.c	Tue Nov 22 21:18:14 2011	(r227841)
+++ head/sys/dev/mii/ip1000phy.c	Tue Nov 22 21:22:06 2011	(r227842)
@@ -324,7 +324,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 (sc->mii_mpd_model != MII_MODEL_xxICPLUS_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-all mailing list