From owner-cvs-src-old@FreeBSD.ORG Fri Oct 15 14:52:29 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C45A31065698 for ; Fri, 15 Oct 2010 14:52:29 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 930E98FC21 for ; Fri, 15 Oct 2010 14:52:29 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o9FEqTEs069384 for ; Fri, 15 Oct 2010 14:52:29 GMT (envelope-from marius@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o9FEqT4h069383 for cvs-src-old@freebsd.org; Fri, 15 Oct 2010 14:52:29 GMT (envelope-from marius@repoman.freebsd.org) Message-Id: <201010151452.o9FEqT4h069383@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to marius@repoman.freebsd.org using -f From: Marius Strobl Date: Fri, 15 Oct 2010 14:52:11 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/arm/econa if_ece.c src/sys/arm/xscale/ixp425 if_npe.c src/sys/dev/ae if_ae.c if_aevar.h src/sys/dev/age if_age.c src/sys/dev/alc if_alc.c src/sys/dev/ale if_ale.c src/sys/dev/bfe if_bfe.c src/sys/dev/bge if_bge.c if_bgereg.h ... X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Oct 2010 14:52:29 -0000 marius 2010-10-15 14:52:11 UTC FreeBSD src repository Modified files: sys/arm/econa if_ece.c sys/arm/xscale/ixp425 if_npe.c sys/dev/ae if_ae.c if_aevar.h sys/dev/age if_age.c sys/dev/alc if_alc.c sys/dev/ale if_ale.c sys/dev/bfe if_bfe.c sys/dev/bge if_bge.c if_bgereg.h sys/dev/bm if_bm.c sys/dev/cas if_cas.c if_casvar.h sys/dev/dc if_dc.c pnphy.c sys/dev/fxp if_fxp.c sys/dev/gem if_gem.c if_gemvar.h sys/dev/hme if_hme.c sys/dev/jme if_jme.c sys/dev/mge if_mge.c if_mgevar.h sys/dev/mii acphy.c amphy.c atphy.c axphy.c bmtphy.c brgphy.c ciphy.c e1000phy.c exphy.c gentbi.c icsphy.c inphy.c ip1000phy.c jmphy.c lxtphy.c mlphy.c nsgphy.c nsphy.c nsphyter.c pnaphy.c qsphy.c rgephy.c rlphy.c rlswitch.c ruephy.c smcphy.c tdkphy.c tlphy.c truephy.c ukphy.c xmphy.c sys/dev/msk if_msk.c sys/dev/pcn if_pcn.c sys/dev/re if_re.c sys/dev/sk if_sk.c sys/dev/ste if_ste.c sys/dev/stge if_stge.c sys/dev/tsec if_tsec.c sys/dev/vge if_vge.c sys/dev/vr if_vr.c if_vrreg.h sys/dev/xl if_xl.c sys/mips/cavium/octe octe.c sys/mips/rmi/dev/nlge if_nlge.c sys/pci if_rl.c Log: SVN rev 213893 on 2010-10-15 14:52:11Z by marius Convert the PHY drivers to honor the mii_flags passed down and convert the NIC drivers as well as the PHY drivers to take advantage of the mii_attach() introduced in r213878 to get rid of certain hacks. For the most part these were: - Artificially limiting miibus_{read,write}reg methods to certain PHY addresses; we now let mii_attach() only probe the PHY at the desired address(es) instead. - PHY drivers setting MIIF_* flags based on the NIC driver they hang off from, partly even based on grabbing and using the softc of the parent; we now pass these flags down from the NIC to the PHY drivers via mii_attach(). This got us rid of all such hacks except those of brgphy() in combination with bce(4) and bge(4), which is way beyond what can be expressed with simple flags. While at it, I took the opportunity to change the NIC drivers to pass up the error returned by mii_attach() (previously by mii_phy_probe()) and unify the error message used in this case where and as appropriate as mii_attach() actually can fail for a number of reasons, not just because of no PHY(s) being present at the expected address(es). Reviewed by: jhb, yongari Revision Changes Path 1.2 +5 -7 src/sys/arm/econa/if_ece.c 1.22 +9 -12 src/sys/arm/xscale/ixp425/if_npe.c 1.12 +4 -12 src/sys/dev/ae/if_ae.c 1.2 +0 -1 src/sys/dev/ae/if_aevar.h 1.16 +5 -7 src/sys/dev/age/if_age.c 1.20 +5 -9 src/sys/dev/alc/if_alc.c 1.12 +5 -9 src/sys/dev/ale/if_ale.c 1.56 +5 -8 src/sys/dev/bfe/if_bfe.c 1.326 +7 -11 src/sys/dev/bge/if_bge.c 1.111 +0 -1 src/sys/dev/bge/if_bgereg.h 1.8 +13 -5 src/sys/dev/bm/if_bm.c 1.8 +11 -26 src/sys/dev/cas/if_cas.c 1.3 +0 -2 src/sys/dev/cas/if_casvar.h 1.205 +29 -35 src/sys/dev/dc/if_dc.c 1.27 +1 -2 src/sys/dev/dc/pnphy.c 1.307 +8 -4 src/sys/dev/fxp/if_fxp.c 1.58 +17 -22 src/sys/dev/gem/if_gem.c 1.20 +0 -2 src/sys/dev/gem/if_gemvar.h 1.57 +14 -11 src/sys/dev/hme/if_hme.c 1.17 +9 -17 src/sys/dev/jme/if_jme.c 1.13 +6 -11 src/sys/dev/mge/if_mge.c 1.4 +0 -2 src/sys/dev/mge/if_mgevar.h 1.26 +1 -0 src/sys/dev/mii/acphy.c 1.28 +1 -0 src/sys/dev/mii/amphy.c 1.7 +1 -0 src/sys/dev/mii/atphy.c 1.6 +1 -0 src/sys/dev/mii/axphy.c 1.17 +1 -0 src/sys/dev/mii/bmtphy.c 1.93 +1 -0 src/sys/dev/mii/brgphy.c 1.20 +2 -3 src/sys/dev/mii/ciphy.c 1.40 +5 -13 src/sys/dev/mii/e1000phy.c 1.27 +1 -0 src/sys/dev/mii/exphy.c 1.9 +1 -0 src/sys/dev/mii/gentbi.c 1.5 +1 -0 src/sys/dev/mii/icsphy.c 1.21 +1 -0 src/sys/dev/mii/inphy.c 1.11 +7 -15 src/sys/dev/mii/ip1000phy.c 1.4 +1 -0 src/sys/dev/mii/jmphy.c 1.25 +1 -10 src/sys/dev/mii/lxtphy.c 1.28 +1 -0 src/sys/dev/mii/mlphy.c 1.28 +1 -0 src/sys/dev/mii/nsgphy.c 1.35 +8 -19 src/sys/dev/mii/nsphy.c 1.5 +7 -12 src/sys/dev/mii/nsphyter.c 1.21 +1 -0 src/sys/dev/mii/pnaphy.c 1.23 +1 -0 src/sys/dev/mii/qsphy.c 1.24 +1 -0 src/sys/dev/mii/rgephy.c 1.36 +1 -0 src/sys/dev/mii/rlphy.c 1.4 +1 -0 src/sys/dev/mii/rlswitch.c 1.10 +1 -0 src/sys/dev/mii/ruephy.c 1.4 +1 -0 src/sys/dev/mii/smcphy.c 1.28 +1 -0 src/sys/dev/mii/tdkphy.c 1.28 +3 -2 src/sys/dev/mii/tlphy.c 1.6 +1 -0 src/sys/dev/mii/truephy.c 1.24 +1 -0 src/sys/dev/mii/ukphy.c 1.24 +1 -0 src/sys/dev/mii/xmphy.c 1.101 +10 -11 src/sys/dev/msk/if_msk.c 1.6 +8 -5 src/sys/dev/pcn/if_pcn.c 1.170 +11 -17 src/sys/dev/re/if_re.c 1.146 +11 -11 src/sys/dev/sk/if_sk.c 1.34 +8 -9 src/sys/dev/ste/if_ste.c 1.19 +9 -4 src/sys/dev/stge/if_stge.c 1.17 +5 -14 src/sys/dev/tsec/if_tsec.c 1.73 +5 -10 src/sys/dev/vge/if_vge.c 1.139 +8 -14 src/sys/dev/vr/if_vr.c 1.39 +0 -1 src/sys/dev/vr/if_vrreg.h 1.14 +14 -18 src/sys/dev/xl/if_xl.c 1.5 +6 -6 src/sys/mips/cavium/octe/octe.c 1.15 +6 -4 src/sys/mips/rmi/dev/nlge/if_nlge.c 1.196 +10 -13 src/sys/pci/if_rl.c