Date: Fri, 3 Aug 2012 05:39:33 +0000 (UTC) From: Tim Kientzle <kientzle@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r239004 - in projects/armv6/sys: arm/conf conf dev/mii modules/mii Message-ID: <201208030539.q735dXmi076293@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kientzle Date: Fri Aug 3 05:39:32 2012 New Revision: 239004 URL: http://svn.freebsd.org/changeset/base/239004 Log: Split the SMSC LAN8710A into a separate PHY module. It's not really that similar to the SEEQ PHYs supported by smcphy.c. Added: projects/armv6/sys/dev/mii/smscphy.c - copied, changed from r238269, projects/armv6/sys/dev/mii/smcphy.c Modified: projects/armv6/sys/arm/conf/BEAGLEBONE projects/armv6/sys/conf/files projects/armv6/sys/dev/mii/smcphy.c projects/armv6/sys/modules/mii/Makefile Modified: projects/armv6/sys/arm/conf/BEAGLEBONE ============================================================================== --- projects/armv6/sys/arm/conf/BEAGLEBONE Fri Aug 3 05:31:12 2012 (r239003) +++ projects/armv6/sys/arm/conf/BEAGLEBONE Fri Aug 3 05:39:32 2012 (r239004) @@ -111,7 +111,7 @@ device da # Direct Access (disks) device loop device ether device mii -device smcphy +device smscphy device cpsw device bpf Modified: projects/armv6/sys/conf/files ============================================================================== --- projects/armv6/sys/conf/files Fri Aug 3 05:31:12 2012 (r239003) +++ projects/armv6/sys/conf/files Fri Aug 3 05:39:32 2012 (r239004) @@ -1591,6 +1591,7 @@ dev/mii/rgephy.c optional miibus | rgep dev/mii/rlphy.c optional miibus | rlphy dev/mii/rlswitch.c optional rlswitch dev/mii/smcphy.c optional miibus | smcphy +dev/mii/smscphy.c optional miibus | smscphy dev/mii/tdkphy.c optional miibus | tdkphy dev/mii/tlphy.c optional miibus | tlphy dev/mii/truephy.c optional miibus | truephy Modified: projects/armv6/sys/dev/mii/smcphy.c ============================================================================== --- projects/armv6/sys/dev/mii/smcphy.c Fri Aug 3 05:31:12 2012 (r239003) +++ projects/armv6/sys/dev/mii/smcphy.c Fri Aug 3 05:39:32 2012 (r239004) @@ -26,7 +26,8 @@ __FBSDID("$FreeBSD$"); /* - * Driver for the internal PHY on the SMSC LAN91C111. + * Driver for the SEEQ 80220 and 84220. + * (Originally developed for the internal PHY on the SMSC LAN91C111.) */ #include <sys/param.h> @@ -79,7 +80,6 @@ DRIVER_MODULE(smcphy, miibus, smcphy_dri static const struct mii_phydesc smcphys[] = { MII_PHY_DESC(SEEQ, 80220), MII_PHY_DESC(SEEQ, 84220), - MII_PHY_DESC(SMC, LAN8710A), MII_PHY_END }; Copied and modified: projects/armv6/sys/dev/mii/smscphy.c (from r238269, projects/armv6/sys/dev/mii/smcphy.c) ============================================================================== --- projects/armv6/sys/dev/mii/smcphy.c Sun Jul 8 23:50:57 2012 (r238269, copy source) +++ projects/armv6/sys/dev/mii/smscphy.c Fri Aug 3 05:39:32 2012 (r239004) @@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$"); /* - * Driver for the internal PHY on the SMSC LAN91C111. + * Driver for the SMSC LAN8710A */ #include <sys/param.h> @@ -49,61 +49,52 @@ __FBSDID("$FreeBSD$"); #include "miibus_if.h" -static int smcphy_probe(device_t); -static int smcphy_attach(device_t); +static int smscphy_probe(device_t); +static int smscphy_attach(device_t); -static int smcphy_service(struct mii_softc *, struct mii_data *, int); -static void smcphy_reset(struct mii_softc *); -static void smcphy_auto(struct mii_softc *, int); -static void smcphy_status(struct mii_softc *); +static int smscphy_service(struct mii_softc *, struct mii_data *, int); +static void smscphy_auto(struct mii_softc *, int); +static void smscphy_status(struct mii_softc *); -static device_method_t smcphy_methods[] = { +static device_method_t smscphy_methods[] = { /* device interface */ - DEVMETHOD(device_probe, smcphy_probe), - DEVMETHOD(device_attach, smcphy_attach), + DEVMETHOD(device_probe, smscphy_probe), + DEVMETHOD(device_attach, smscphy_attach), DEVMETHOD(device_detach, mii_phy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD_END }; -static devclass_t smcphy_devclass; +static devclass_t smscphy_devclass; -static driver_t smcphy_driver = { - "smcphy", - smcphy_methods, +static driver_t smscphy_driver = { + "smscphy", + smscphy_methods, sizeof(struct mii_softc) }; -DRIVER_MODULE(smcphy, miibus, smcphy_driver, smcphy_devclass, 0, 0); +DRIVER_MODULE(smscphy, miibus, smscphy_driver, smscphy_devclass, 0, 0); -static const struct mii_phydesc smcphys[] = { - MII_PHY_DESC(SEEQ, 80220), - MII_PHY_DESC(SEEQ, 84220), +static const struct mii_phydesc smscphys[] = { MII_PHY_DESC(SMC, LAN8710A), MII_PHY_END }; -static const struct mii_phy_funcs smcphy80220_funcs = { - smcphy_service, - smcphy_status, +static const struct mii_phy_funcs smscphy_funcs = { + smscphy_service, + smscphy_status, mii_phy_reset }; -static const struct mii_phy_funcs smcphy_funcs = { - smcphy_service, - smcphy_status, - smcphy_reset -}; - static int -smcphy_probe(device_t dev) +smscphy_probe(device_t dev) { - return (mii_phy_dev_probe(dev, smcphys, BUS_PROBE_DEFAULT)); + return (mii_phy_dev_probe(dev, smscphys, BUS_PROBE_DEFAULT)); } static int -smcphy_attach(device_t dev) +smscphy_attach(device_t dev) { struct mii_softc *sc; struct mii_attach_args *ma; @@ -111,10 +102,7 @@ smcphy_attach(device_t dev) sc = device_get_softc(dev); ma = device_get_ivars(dev); - if (MII_MODEL(ma->mii_id2) == MII_MODEL_SEEQ_80220) - mpf = &smcphy80220_funcs; - else - mpf = &smcphy_funcs; + mpf = &smscphy_funcs; mii_phy_dev_attach(dev, MIIF_NOISOLATE | MIIF_NOMANPAUSE, mpf, 1); mii_phy_setmedia(sc); @@ -122,7 +110,7 @@ smcphy_attach(device_t dev) } static int -smcphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) +smscphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct ifmedia_entry *ife; int reg; @@ -142,7 +130,7 @@ smcphy_service(struct mii_softc *sc, str switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: - smcphy_auto(sc, ife->ifm_media); + smscphy_auto(sc, ife->ifm_media); break; default: @@ -179,7 +167,7 @@ smcphy_service(struct mii_softc *sc, str sc->mii_ticks = 0; PHY_RESET(sc); - smcphy_auto(sc, ife->ifm_media); + smscphy_auto(sc, ife->ifm_media); break; } @@ -192,31 +180,7 @@ smcphy_service(struct mii_softc *sc, str } static void -smcphy_reset(struct mii_softc *sc) -{ - u_int bmcr; - int timeout; - - PHY_WRITE(sc, MII_BMCR, BMCR_RESET); - - for (timeout = 2; timeout > 0; timeout--) { - DELAY(50000); - bmcr = PHY_READ(sc, MII_BMCR); - if ((bmcr & BMCR_RESET) == 0) - break; - } - - if (bmcr & BMCR_RESET) - device_printf(sc->mii_dev, "reset failed\n"); - - PHY_WRITE(sc, MII_BMCR, 0x3000); - - /* Mask interrupts, we poll instead. */ - PHY_WRITE(sc, 0x1e, 0xffc0); -} - -static void -smcphy_auto(struct mii_softc *sc, int media) +smscphy_auto(struct mii_softc *sc, int media) { uint16_t anar; @@ -230,7 +194,7 @@ smcphy_auto(struct mii_softc *sc, int me } static void -smcphy_status(struct mii_softc *sc) +smscphy_status(struct mii_softc *sc) { struct mii_data *mii; uint32_t bmcr, bmsr, status; @@ -261,12 +225,12 @@ smcphy_status(struct mii_softc *sc) } } - status = PHY_READ(sc, 0x12); - if (status & 0x0080) + status = PHY_READ(sc, 0x1F); + if (status & 0x0008) mii->mii_media_active |= IFM_100_TX; else mii->mii_media_active |= IFM_10_T; - if (status & 0x0040) + if (status & 0x0010) mii->mii_media_active |= IFM_FDX | mii_phy_flowstatus(sc); else mii->mii_media_active |= IFM_HDX; Modified: projects/armv6/sys/modules/mii/Makefile ============================================================================== --- projects/armv6/sys/modules/mii/Makefile Fri Aug 3 05:31:12 2012 (r239003) +++ projects/armv6/sys/modules/mii/Makefile Fri Aug 3 05:39:32 2012 (r239004) @@ -8,7 +8,8 @@ SRCS+= ciphy.c device_if.h SRCS+= e1000phy.c gentbi.c icsphy.c ip1000phy.c jmphy.c lxtphy.c SRCS+= miibus_if.c miibus_if.h mii.c miidevs.h mii_bitbang.c mii_physubr.c SRCS+= mlphy.c nsgphy.c nsphy.c nsphyter.c pci_if.h pnaphy.c qsphy.c -SRCS+= rdcphy.c rgephy.c rlphy.c smcphy.c tdkphy.c tlphy.c truephy.c +SRCS+= rdcphy.c rgephy.c rlphy.c smcphy.c +SRCS+= smscphy.c tdkphy.c tlphy.c truephy.c SRCS+= ukphy.c ukphy_subr.c SRCS+= xmphy.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208030539.q735dXmi076293>