aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/mii/mlphy.c
Commit message (Collapse)AuthorAgeFilesLines
* The MII layer shouldn't care about administrative status of anGleb Smirnoff2013-10-261-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | interface. Make MII drivers forget about 'struct ifnet'. Later plan is to provide an administrative downcall from ifnet layer into drivers, to inform them about administrative status change. If someone thinks that processing MII events for an administratively down interface is a big problem, then drivers would turn MII processing off. The following MII drivers do evil things, like strcmp() on driver name, so they still need knowledge of ifnet and thus include if_var.h. They all need to be fixed: sys/dev/mii/brgphy.c sys/dev/mii/e1000phy.c sys/dev/mii/ip1000phy.c sys/dev/mii/jmphy.c sys/dev/mii/nsphy.c sys/dev/mii/rgephy.c sys/dev/mii/truephy.c Sponsored by: Netflix Sponsored by: Nginx, Inc. Notes: svn path=/head/; revision=257184
* Use DEVMETHOD_END.Marius Strobl2011-11-231-1/+1
| | | | Notes: svn path=/head/; revision=227908
* - Remove attempts to implement setting of BMCR_LOOP/MIIF_NOLOOPMarius Strobl2011-05-031-31/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (reporting IFM_LOOP based on BMCR_LOOP is left in place though as it might provide useful for debugging). For most mii(4) drivers it was unclear whether the PHYs driven by them actually support loopback or not. Moreover, typically loopback mode also needs to be activated on the MAC, which none of the Ethernet drivers using mii(4) implements. Given that loopback media has no real use (and obviously hardly had a chance to actually work) besides for driver development (which just loopback mode should be sufficient for though, i.e one doesn't necessary need support for loopback media) support for it is just dropped as both NetBSD and OpenBSD already did quite some time ago. - Let mii_phy_add_media() also announce the support of IFM_NONE. - Restructure the PHY entry points to use a structure of entry points instead of discrete function pointers, and extend this to include a "reset" entry point. Make sure any PHY-specific reset routine is always used, and provide one for lxtphy(4) which disables MII interrupts (as is done for a few other PHYs we have drivers for). This includes changing NIC drivers which previously just called the generic mii_phy_reset() to now actually call the PHY-specific reset routine, which might be crucial in some cases. While at it, the redundant checks in these NIC drivers for mii->mii_instance not being zero before calling the reset routines were removed because as soon as one PHY driver attaches mii->mii_instance is incremented and we hardly can end up in their media change callbacks etc if no PHY driver has attached as mii_attach() would have failed in that case and not attach a miibus(4) instance. Consequently, NIC drivers now no longer should call mii_phy_reset() directly, so it was removed from EXPORT_SYMS. - Add a mii_phy_dev_attach() as a companion helper to mii_phy_dev_probe(). The purpose of that function is to perform the common steps to attach a PHY driver instance and to hook it up to the miibus(4) instance and to optionally also handle the probing, addition and initialization of the supported media. So all a PHY driver without any special requirements has to do in its bus attach method is to call mii_phy_dev_attach() along with PHY-specific MIIF_* flags, a pointer to its PHY functions and the add_media set to one. All PHY drivers were updated to take advantage of mii_phy_dev_attach() as appropriate. Along with these changes the capability mask was added to the mii_softc structure so PHY drivers taking advantage of mii_phy_dev_attach() but still handling media on their own do not need to fiddle with the MII attach arguments anyway. - Keep track of the PHY offset in the mii_softc structure. This is done for compatibility with NetBSD/OpenBSD. - Keep track of the PHY's OUI, model and revision in the mii_softc structure. Several PHY drivers require this information also after attaching and previously had to wrap their own softc around mii_softc. NetBSD/OpenBSD also keep track of the model and revision on their mii_softc structure. All PHY drivers were updated to take advantage as appropriate. - Convert the mebers of the MII data structure to unsigned where appropriate. This is partly inspired by NetBSD/OpenBSD. - According to IEEE 802.3-2002 the bits actually have to be reversed when mapping an OUI to the MII ID registers. All PHY drivers and miidevs where changed as necessary. Actually this now again allows to largely share miidevs with NetBSD, which fixed this problem already 9 years ago. Consequently miidevs was synced as far as possible. - Add MIIF_NOMANPAUSE and mii_phy_flowstatus() calls to drivers that weren't explicitly converted to support flow control before. It's unclear whether flow control actually works with these but typically it should and their net behavior should be more correct with these changes in place than without if the MAC driver sets MIIF_DOPAUSE. Obtained from: NetBSD (partially) Reviewed by: yongari (earlier version), silence on arch@ and net@ Notes: svn path=/head/; revision=221407
* - Add IFM_10_2 and IFM_10_5 media via tlphy(4) only in case the respectiveMarius Strobl2010-10-241-22/+19
| | | | | | | | | | | | | | | interface also has such connectors. - In tl_attach() unify three different ways of obtaining the device and vendor IDs and remove the now obsolete tl_dinfo from tl_softc. - Given that tlphy(4) only handles the integrated PHYs of NICs driven by tl(4) make it only probe on the latter. - Switch mlphy(4) and tlphy(4) to use mii_phy_add_media()/mii_phy_setmedia(). - Simplify looking for the respective companion PHY in mlphy(4) and tlphy(4) by ignoring the native one by just comparing the device_t's directly rather than the device name. Notes: svn path=/head/; revision=214264
* Convert the PHY drivers to honor the mii_flags passed down and convertMarius Strobl2010-10-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 Notes: svn path=/head/; revision=213893
* - In the spirit of previous simplifications factor out the checks for aMarius Strobl2010-10-021-33/+4
| | | | | | | | | | | | | | | | | | | | different PHY instance being selected and isolation out into the wrappers around the service methods rather than duplicating them over and over again (besides, a PHY driver shouldn't need to care about which instance it actually is). - Centralize the check for the need to isolate a non-zero PHY instance not supporting isolation in mii_mediachg() and just ignore it rather than panicing, which should sufficient given that a) things are likely to just work anyway if one doesn't plug in more than one port at a time and b) refusing to attach in this case just leaves us in a unknown but most likely also not exactly correct configuration (besides several drivers setting MIIF_NOISOLATE didn't care about these anyway, probably due to setting this flag for no real reason). - Minor fixes like removing unnecessary setting of sc->mii_anegticks, using sc->mii_anegticks instead of hardcoded values etc. Notes: svn path=/head/; revision=213364
* Use the mii_data provided via mii_attach_args and mii_pdata respectivelyMarius Strobl2010-09-271-1/+1
| | | | | | | instead of reaching out for the softc of the parent. Notes: svn path=/head/; revision=213229
* Move the code that looks for the companion phy to a subroutine to makeWarner Losh2008-08-231-23/+22
| | | | | | | | sure we get the error handling right in both places. This also simplifies the code somewhat. Notes: svn path=/head/; revision=182067
* It turns out that my analysis of the error handling here was wrong.Warner Losh2008-08-231-7/+7
| | | | | | | | | | When there's an error, we don't want to free the children, since it will be stack garbage. While we did fail to dereference it by setting devs to 0, we didn't fail to call free. We never failed to fail, it was the easiest thing to do. Notes: svn path=/head/; revision=182064
* Set devs to 0 in case device_get_children return an error. The right thingWarner Losh2008-08-231-0/+2
| | | | | | | to do here is nothing in that case... Notes: svn path=/head/; revision=182037
* Some style changes to a couple of PHY drivers:Marius Strobl2006-12-021-12/+6
| | | | | | | | | | | | | | | | - Fix some whitespace nits. - Fix some spelling in comments. - Use MII_ANEGTICKS instead of 5. - Don't define variables in nested scope. - Remove superfluous returns at the end of void functions. - Remove unused static global rgephy_mii_model. - Remove dupe $Id$ in tdkphy(4). - Sort brgphys table. MFC after: 2 weeks Notes: svn path=/head/; revision=164830
* Replace hard-coded magic constants to system defined constantsPyun YongHyeon2006-07-031-1/+1
| | | | | | | | | | (BUS_PROBE_DEFAULT, BUS_PROBE_GENERIC etc). There is no functional changes. Reviewed by: oleg, scottl Notes: svn path=/head/; revision=160076
* Start each of the license/copyright comments with /*-, minor shuffle of linesWarner Losh2005-01-061-1/+1
| | | | Notes: svn path=/head/; revision=139749
* Correct the phy_service() routine case MII_TICK to correctly trackAndre Oppermann2004-05-031-2/+2
| | | | | | | | | | | | | the falling edge of a media state change. This is in preparation for media state change notification to the routing socket. No objections by: sam, wpaul, ru, bms Brucification by: bde Notes: svn path=/head/; revision=128870
* Use __FBSDID().David E. O'Brien2003-08-241-1/+3
| | | | | | | Also some minor style cleanups. Notes: svn path=/head/; revision=119418
* Remove unnecessary breaks.Poul-Henning Kamp2003-05-311-1/+0
| | | | | | | | | | Remove unused variables. Add XXX comment where a break may be missing. [lxtphy.c] Found by: FlexeLint Notes: svn path=/head/; revision=115520
* Put function return types on a line by themselves.Alfred Perlstein2002-10-141-6/+10
| | | | | | | | Cleanup my earlier de-__P sweep and remove whitespace between function names and paramters. Notes: svn path=/head/; revision=105135
* Clean up mii/phy drivers: Remove the MIIF_DOINGAUTO which doesn't reallyPoul-Henning Kamp2002-05-041-5/+4
| | | | | | | | do anything at the end of the day except bloat the drivers which has copy&pasted it. Notes: svn path=/head/; revision=96026
* Make one generic mii_phy_detach() to replace 19 slightly different ones.Poul-Henning Kamp2002-04-291-17/+1
| | | | | | | | | | Rename mii_phy_auto_stop() mii_phy_down(). Introduce mii_down(), use it from nge. Do not indirect it to 19 identical case's in 19 switchstatements like NetBSD did. Notes: svn path=/head/; revision=95722
* Edging ever closer to NetBSD...Poul-Henning Kamp2002-04-291-2/+2
| | | | Notes: svn path=/head/; revision=95705
* Don't pass three args when one will do just fine, and even preventPoul-Henning Kamp2002-04-281-1/+1
| | | | | | | mistakes like the one brgphy.c (now corrected). Notes: svn path=/head/; revision=95667
* Improve an API by about 4 lines per driver.Poul-Henning Kamp2002-04-281-5/+1
| | | | Notes: svn path=/head/; revision=95665
* Remove __P.Alfred Perlstein2002-03-201-6/+6
| | | | Notes: svn path=/head/; revision=92739
* Cleanup pass for mii drivers.Jonathan Lemon2001-09-291-18/+13
| | | | | | | | | | . Make internal service routines static. . Use a consistent ordering of checks in MII_TICK. Do the work in the mii_phy_tick() subroutine if appropriate. . Call mii_phy_update() to trigger the callbacks. Notes: svn path=/head/; revision=84145
* Add includes of sys/malloc.h so this actually compiles.John Baldwin2001-02-091-1/+1
| | | | | | | Pointy-hat to: asmodai Notes: svn path=/head/; revision=72196
* Fix memoryleaks with device_get_children().Jeroen Ruigrok van der Werven2001-02-081-0/+2
| | | | | | | Approved by: wpaul Notes: svn path=/head/; revision=72186
* Grrrrr. That last commit was supposed to be to the head, not to -stableBill Paul2000-12-121-0/+1
| | | | | | | | | (even though I want the fixes in -stable anyway). I'm sure I'm going to get flamed now for committing to -stable and -current too quickly. *sigh* Notes: svn path=/head/; revision=69925
* Remove unneeded #include <machine/clock.h>Poul-Henning Kamp2000-10-151-1/+0
| | | | Notes: svn path=/head/; revision=67164
* Remove ~25 unneeded #include <sys/conf.h>Poul-Henning Kamp2000-04-191-1/+0
| | | | | | | Remove ~60 unneeded #include <sys/malloc.h> Notes: svn path=/head/; revision=59391
* Change && to || in probe routine so that the mlphy driver doesn'tBill Paul2000-04-141-1/+1
| | | | | | | | | | incorrectly attach itself to ThunderLAN adapters which happen to have a PHY who's model number happens out to be 0. Problem reported by: Peter L. Thomas <Pete@painless-computing.com> Notes: svn path=/head/; revision=59235
* $Id$ -> $FreeBSD$Peter Wemm1999-08-281-1/+1
| | | | Notes: svn path=/head/; revision=50480
* Add miibus drivers for the ThunderLAN internal PHY and the Micro LinearBill Paul1999-08-271-0/+456
ML6692 PHY. The Micro Linear driver is my own; the ThunderLAN driver is a port of the NetBSD driver with various hacks. The ML driver is necessary to support the Olicom OC-2326 ThunderLAN-based NIC. Also regenerated miidevs.h to pick up the proper 'obtained from' revision string. Notes: svn path=/head/; revision=50461