cvs commit: src/sys/conf files src/sys/net if_media.h src/sys/dev/netif/mii_layer Makefile acphy.c amphy.c brgphy.c ciphy.c ciphyreg.h dcphy.c e1000phy.c exphy.c inphy.c inphyreg.h lxtphy.c mii.c mii.h mii_physubr.c miidevs miidevs.h miivar.h ...

Sun Aug 6 03:35:06 PDT 2006

sephe       2006/08/06 03:32:23 PDT

DragonFly src repository

  Modified files:
    sys/conf             files 
    sys/net              if_media.h 
    sys/dev/netif/mii_layer Makefile acphy.c amphy.c brgphy.c 
                            ciphy.c ciphyreg.h dcphy.c e1000phy.c 
                            exphy.c inphy.c inphyreg.h lxtphy.c 
                            mii.c mii.h mii_physubr.c miidevs 
                            miidevs.h miivar.h mlphy.c nsgphy.c 
                            nsphy.c nsphyreg.h pnaphy.c pnphy.c 
                            qsphy.c rgephy.c rlphy.c ruephy.c 
                            tlphy.c ukphy.c ukphy_subr.c xmphy.c 
  Removed files:
    sys/dev/netif/mii_layer nvphy.c 
  Log:
  Sync MII support with NetBSD/OpenBSD:
  - Standard conforming GMII support:
    1) replace mii_media_add() with mii_phy_add_media().
    2) ukphy has generic GMII support now, thus retire nvphy.
  - Factor common code of PHY modules out into mii_physubr.c, noticably
    mii_phy_{set_media, tick, update}().
    In order to support this refactoring:
    1) mii_softc.{mii_reset,mii_status} funtion pointers are added, which are
       used to reset PHY modules and get PHY modules' status.
    2) mii_softc.mii_anegticks is added, which is used by PHY modules to tell
       mii_phy_tick(), how often auto-negociation should happen.  Two commonly
       used values are defined as MII_ANEGTICKS and MII_ANEGTICKS_GIGE.
       mii_softc.mii_anegticks is set to MII_ANEGTICKS by default.
  - Add mii_softc.mii_media_status and rename mii_softc.mii_active to
    mii_softc.mii_media_active.  Now changes in either one of them will cause
    MIIBUS_STATCHG() being involked.
  - For PHY modules that utilize mii_phy_add_media(), ifmedia_entry.ifm_data
    no longer stores value of BMCR.  It stores an index of mii_media_table[],
    which stores BMCR, ANAR and GTCR.
  - Replace slightly different PHY modules detach routines with ukphy_detach().
  - Use OUI and MODEL id array + mii_phy_match() in PHY modules probe routines,
    instead of original large `if, else if' or `switch' code segment.
  - Support more OUIs and MODELs in individual PHY module.
  - Make the usage of `mii' and `sc' stack variable more consistent.  `mii'
    refers to miibus softc, while `sc' refers to PHY module softc.
  - Nuke no longer used functions' definition and declaration.
  - Regen miidevs.h

  Following PHY modules were tested:
  acphy(dc), brgphy(bge), e1000phy(nv,sk), exphy(xl), inphy(fxp), rgephy(re),
  rlphy(rl), ruephy(rue), ukphy(nv,vr,...)

  MII generic code is mainly synced with NetBSD.
  Individual PHY modules are mainly synced with OpenBSD.

  Tested-by: swildner, corecode

  Revision  Changes    Path
  1.133     +0 -1      src/sys/conf/files
  1.11      +14 -4     src/sys/net/if_media.h
  1.9       +1 -1      src/sys/dev/netif/mii_layer/Makefile
  1.9       +38 -66    src/sys/dev/netif/mii_layer/acphy.c
  1.10      +32 -100   src/sys/dev/netif/mii_layer/amphy.c
  1.13      +262 -170  src/sys/dev/netif/mii_layer/brgphy.c
  1.2       +48 -94    src/sys/dev/netif/mii_layer/ciphy.c
  1.2       +12 -0     src/sys/dev/netif/mii_layer/ciphyreg.h
  1.9       +58 -108   src/sys/dev/netif/mii_layer/dcphy.c
  1.8       +82 -88    src/sys/dev/netif/mii_layer/e1000phy.c
  1.9       +19 -62    src/sys/dev/netif/mii_layer/exphy.c
  1.7       +32 -111   src/sys/dev/netif/mii_layer/inphy.c
  1.3       +3 -2      src/sys/dev/netif/mii_layer/inphyreg.h
  1.9       +54 -112   src/sys/dev/netif/mii_layer/lxtphy.c
  1.9       +21 -21    src/sys/dev/netif/mii_layer/mii.c
  1.4       +77 -20    src/sys/dev/netif/mii_layer/mii.h
  1.12      +422 -137  src/sys/dev/netif/mii_layer/mii_physubr.c
  1.8       +52 -3     src/sys/dev/netif/mii_layer/miidevs
  1.8       +95 -6     src/sys/dev/netif/mii_layer/miidevs.h
  1.12      +111 -33   src/sys/dev/netif/mii_layer/miivar.h
  1.9       +34 -41    src/sys/dev/netif/mii_layer/mlphy.c
  1.13      +37 -211   src/sys/dev/netif/mii_layer/nsgphy.c
  1.9       +39 -94    src/sys/dev/netif/mii_layer/nsphy.c
  1.3       +3 -1      src/sys/dev/netif/mii_layer/nsphyreg.h
  1.10      +25 -84    src/sys/dev/netif/mii_layer/pnaphy.c
  1.10      +15 -39    src/sys/dev/netif/mii_layer/pnphy.c
  1.9       +61 -83    src/sys/dev/netif/mii_layer/qsphy.c
  1.2       +46 -53    src/sys/dev/netif/mii_layer/rgephy.c
  1.10      +51 -82    src/sys/dev/netif/mii_layer/rlphy.c
  1.5       +20 -51    src/sys/dev/netif/mii_layer/ruephy.c
  1.9       +37 -53    src/sys/dev/netif/mii_layer/tlphy.c
  1.10      +19 -78    src/sys/dev/netif/mii_layer/ukphy.c
  1.7       +28 -15    src/sys/dev/netif/mii_layer/ukphy_subr.c
  1.9       +43 -73    src/sys/dev/netif/mii_layer/xmphy.c

http://www.dragonflybsd.org/cvsweb/src/sys/conf/files.diff?r1=1.132&r2=1.133&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/net/if_media.h.diff?r1=1.10&r2=1.11&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/Makefile.diff?r1=1.8&r2=1.9&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/acphy.c.diff?r1=1.8&r2=1.9&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/amphy.c.diff?r1=1.9&r2=1.10&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/brgphy.c.diff?r1=1.12&r2=1.13&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/ciphy.c.diff?r1=1.1&r2=1.2&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/ciphyreg.h.diff?r1=1.1&r2=1.2&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/dcphy.c.diff?r1=1.8&r2=1.9&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/e1000phy.c.diff?r1=1.7&r2=1.8&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/exphy.c.diff?r1=1.8&r2=1.9&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/inphy.c.diff?r1=1.6&r2=1.7&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/inphyreg.h.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/lxtphy.c.diff?r1=1.8&r2=1.9&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/mii.c.diff?r1=1.8&r2=1.9&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/mii.h.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/mii_physubr.c.diff?r1=1.11&r2=1.12&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/miidevs.diff?r1=1.7&r2=1.8&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/miidevs.h.diff?r1=1.7&r2=1.8&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/miivar.h.diff?r1=1.11&r2=1.12&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/mlphy.c.diff?r1=1.8&r2=1.9&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/nsgphy.c.diff?r1=1.12&r2=1.13&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/nsphy.c.diff?r1=1.8&r2=1.9&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/nsphyreg.h.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/pnaphy.c.diff?r1=1.9&r2=1.10&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/pnphy.c.diff?r1=1.9&r2=1.10&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/qsphy.c.diff?r1=1.8&r2=1.9&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/rgephy.c.diff?r1=1.1&r2=1.2&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/rlphy.c.diff?r1=1.9&r2=1.10&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/ruephy.c.diff?r1=1.4&r2=1.5&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/tlphy.c.diff?r1=1.8&r2=1.9&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/ukphy.c.diff?r1=1.9&r2=1.10&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/ukphy_subr.c.diff?r1=1.6&r2=1.7&f=u
http://www.dragonflybsd.org/cvsweb/src/sys/dev/netif/mii_layer/xmphy.c.diff?r1=1.8&r2=1.9&f=u