On Tue, Feb 15, 2011 at 12:32:20PM -0500, Loganaden Velvindron wrote:
> Hi,
>
> Yes, the diff does work with half/full duplex.
>
> I fixed the style issues & added checks for other being NULL. To
> test those changes, I disabled tlphy & ukphy, and tested the tl
> adapter with mlphy only. All modes work. I think it's better to
> be on the safe side and assume that the companion PHY may not be
> present at all (It could be damaged for instance).
>
... and here is a full diff including manpages and all the needed hooks to
make mlphy work.
If no one screams I will commit this end of this week
--
:wq Claudio
Index: share/man/man4/Makefile
===================================================================
RCS file: /cvs/src/share/man/man4/Makefile,v
retrieving revision 1.519
diff -u -p -r1.519 Makefile
--- share/man/man4/Makefile 15 Jan 2011 04:35:34 -0000 1.519
+++ share/man/man4/Makefile 23 Mar 2011 17:18:26 -0000
@@ -33,8 +33,8 @@ MAN= aac.4 ac97.4 acphy.4 \
kate.4 km.4 ksyms.4 kue.4 lc.4 lge.4 lii.4 lisa.4 lkm.4 lm.4 \
lmc.4 lmenv.4 lmn.4 lmtemp.4 lo.4 lofn.4 lpt.4 lxtphy.4 luphy.4 \
maestro.4 mainbus.4 malo.4 maxds.4 maxtmp.4 mbg.4 midi.4 mii.4 mfi.4 \
- moscom.4 mos.4 mpe.4 mpath.4 mpi.4 mpii.4 mpu.4 msk.4 msts.4 mtd.4 \
- mtdphy.4 multicast.4 mtio.4 myx.4 \
+ mlphy.4 moscom.4 mos.4 mpe.4 mpath.4 mpi.4 mpii.4 mpu.4 msk.4 msts.4 \
+ mtd.4 mtdphy.4 multicast.4 mtio.4 myx.4 \
ne.4 neo.4 netintro.4 nfe.4 nge.4 nmea.4 \
noct.4 nofn.4 nsclpcsio.4 nsgphy.4 nsphy.4 nsphyter.4 null.4 nviic.4 \
ohci.4 options.4 onewire.4 oosiop.4 osiop.4 otus.4 \
Index: share/man/man4/mlphy.4
===================================================================
RCS file: share/man/man4/mlphy.4
diff -N share/man/man4/mlphy.4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ share/man/man4/mlphy.4 23 Mar 2011 17:19:18 -0000
@@ -0,0 +1,43 @@
+.\" $OpenBSD$
+.\"
+.\" Copyright (c) 2011 Loganaden V. Velvindron <[email protected]>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.Dd $Mdocdate$
+.Dt MLPHY 4
+.Os
+.Sh NAME
+.Nm mlphy
+.Nd MicroLinear 6692 Ethernet PHY
+.Sh SYNOPSIS
+.Cd "mlphy* at mii?"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports MicroLinear 6692 10/100 Ethernet PHYs.
+The MicroLinear PHY only supports 100baseTX operation but can advertise
+10baseT operation for a possible companion PHY.
+.Sh SEE ALSO
+.Xr ifmedia 4 ,
+.Xr intro 4 ,
+.Xr mii 4 ,
+.Xr ifconfig 8
+.Sh BUGS
+The OUI and device identification of the MicroLinear 6692 PHY are
+undefined and so
+.Nm
+only attaches to
+.Xr tl 4
+devices using the
+.Xr tlphy 4
+as companion PHY.
Index: share/man/man4/tl.4
===================================================================
RCS file: /cvs/src/share/man/man4/tl.4,v
retrieving revision 1.19
diff -u -p -r1.19 tl.4
--- share/man/man4/tl.4 7 Jun 2008 21:36:19 -0000 1.19
+++ share/man/man4/tl.4 22 Mar 2011 15:55:31 -0000
@@ -41,6 +41,7 @@
.Sh SYNOPSIS
.Cd "tl* at pci?"
.Cd "lxtphy* at mii?"
+.Cd "mlphy* at mii?"
.Cd "nsphy* at mii?"
.Cd "tlphy* at mii?"
.Sh DESCRIPTION
@@ -119,6 +120,7 @@ allocating a pad buffer or collapsing an
.Xr ifmedia 4 ,
.Xr intro 4 ,
.Xr lxtphy 4 ,
+.Xr mlphy 4 ,
.Xr netintro 4 ,
.Xr nsphy 4 ,
.Xr pci 4 ,
Index: sys/arch/alpha/conf/GENERIC
===================================================================
RCS file: /cvs/src/sys/arch/alpha/conf/GENERIC,v
retrieving revision 1.220
diff -u -p -r1.220 GENERIC
--- sys/arch/alpha/conf/GENERIC 7 Mar 2011 07:05:50 -0000 1.220
+++ sys/arch/alpha/conf/GENERIC 22 Mar 2011 14:57:04 -0000
@@ -299,6 +299,7 @@ urlphy* at mii? # Realtek
RTL8150L in
rgephy* at mii? # Realtek 8169S/8110S PHY
ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY
ipgphy* at mii? # IC Plus IP1000A PHYs
+mlphy* at mii? # Micro Linear 6692 PHY
ukphy* at mii? # "unknown" PHYs
# sensors
Index: sys/arch/alpha/conf/RAMDISKBIG
===================================================================
RCS file: /cvs/src/sys/arch/alpha/conf/RAMDISKBIG,v
retrieving revision 1.81
diff -u -p -r1.81 RAMDISKBIG
--- sys/arch/alpha/conf/RAMDISKBIG 3 Jul 2010 03:59:16 -0000 1.81
+++ sys/arch/alpha/conf/RAMDISKBIG 22 Mar 2011 14:57:12 -0000
@@ -248,6 +248,7 @@ urlphy* at mii? # Realtek
RTL8150L in
rgephy* at mii? # Realtek 8169S/8110S PHY
ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY
ipgphy* at mii? # IC Plus IP1000A PHYs
+mlphy* at mii? # Micro Linear 6692 PHY
ukphy* at mii? # "unknown" PHYs
# ISA/EISA bus support
Index: sys/arch/i386/conf/GENERIC
===================================================================
RCS file: /cvs/src/sys/arch/i386/conf/GENERIC,v
retrieving revision 1.709
diff -u -p -r1.709 GENERIC
--- sys/arch/i386/conf/GENERIC 17 Feb 2011 20:14:30 -0000 1.709
+++ sys/arch/i386/conf/GENERIC 23 Mar 2011 17:26:13 -0000
@@ -704,6 +704,7 @@ jmphy* at mii? # JMicron
JMP202/JMP21
atphy* at mii? # Attansic F1 PHYs
rdcphy* at mii? # RDC R6040 PHY
ipgphy* at mii? # IC Plus IP1000A PHYs
+mlphy* at mii? # Micro Linear 6692 PHY
ukphy* at mii? # "unknown" PHYs
pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System
Index: sys/arch/i386/conf/RAMDISK_CD
===================================================================
RCS file: /cvs/src/sys/arch/i386/conf/RAMDISK_CD,v
retrieving revision 1.183
diff -u -p -r1.183 RAMDISK_CD
--- sys/arch/i386/conf/RAMDISK_CD 15 Jan 2011 04:39:27 -0000 1.183
+++ sys/arch/i386/conf/RAMDISK_CD 22 Mar 2011 14:57:35 -0000
@@ -436,6 +436,7 @@ jmphy* at mii? # JMicron
JMP202/JMP21
ipgphy* at mii? # IC Plus IP1000A PHYs
atphy* at mii? # Attansic F1 PHYs
rdcphy* at mii? # RDC R6040 PHY
+mlphy* at mii? # Micro Linear 6692 PHY
ukphy* at mii? # "unknown" PHYs
pseudo-device loop 1 # network loopback
Index: sys/dev/mii/files.mii
===================================================================
RCS file: /cvs/src/sys/dev/mii/files.mii,v
retrieving revision 1.30
diff -u -p -r1.30 files.mii
--- sys/dev/mii/files.mii 15 Jan 2011 04:35:34 -0000 1.30
+++ sys/dev/mii/files.mii 22 Mar 2011 14:54:57 -0000
@@ -140,3 +140,7 @@ file dev/mii/atphy.c atphy
device rdcphy: mii_phy
attach rdcphy at mii
file dev/mii/rdcphy.c rdcphy
+
+device mlphy: mii_phy
+attach mlphy at mii
+file dev/mii/mlphy.c mlphy
Index: sys/dev/mii/mlphy.c
===================================================================
RCS file: sys/dev/mii/mlphy.c
diff -N sys/dev/mii/mlphy.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sys/dev/mii/mlphy.c 22 Mar 2011 14:53:21 -0000
@@ -0,0 +1,385 @@
+/* $OpenBSD$ */
+
+/*-
+ * Copyright (c) 1997, 1998, 1999
+ * Bill Paul <wpaul <at> ctr.columbia.edu>. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Bill Paul.
+ * 4. Neither the name of the author nor the names of any co-contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*-
+ * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
+ * NASA Ames Research Center, and by Frank van der Linden.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1997 Manuel Bouyer. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Micro Linear 6692 PHY
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/device.h>
+#include <sys/socket.h>
+#include <sys/errno.h>
+
+#include <net/if.h>
+#include <net/if_media.h>
+
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+
+#define ML_STATE_AUTO_SELF 1
+#define ML_STATE_AUTO_OTHER 2
+
+struct mlphy_softc {
+ struct mii_softc ml_mii;
+ struct device *ml_dev;
+ int ml_state;
+ int ml_linked;
+};
+
+int mlphy_probe(struct device *, void *, void *);
+void mlphy_attach(struct device *, struct device *, void *);
+
+struct cfattach mlphy_ca = {
+ sizeof(struct mii_softc), mlphy_probe, mlphy_attach, mii_phy_detach,
+ mii_phy_activate
+};
+
+struct cfdriver mlphy_cd = {
+ NULL, "mlphy", DV_DULL
+};
+
+void mlphy_reset(struct mii_softc *);
+int mlphy_service(struct mii_softc *, struct mii_data *, int);
+void mlphy_status(struct mii_softc *);
+
+const struct mii_phy_funcs mlphy_funcs = {
+ mlphy_service, mlphy_status, mlphy_reset,
+};
+
+int
+mlphy_probe(struct device *parent, void *match, void *aux)
+{
+ struct mii_attach_args *ma = aux;
+
+ /*
+ * Micro Linear PHY reports oui == 0 model == 0
+ */
+ if (MII_OUI(ma->mii_id1, ma->mii_id2) != 0 ||
+ MII_MODEL(ma->mii_id2) != 0)
+ return (0);
+ /*
+ * Make sure the parent is a `tl'. So far, I have only
+ * encountered the 6692 on an Olicom card with a ThunderLAN
+ * controller chip.
+ */
+ if (strcmp(parent->dv_cfdata->cf_driver->cd_name, "tl") != 0)
+ return (0);
+
+ return (10);
+}
+
+void
+mlphy_attach(struct device *parent, struct device *self, void *aux)
+{
+ struct mlphy_softc *msc = (struct mlphy_softc *)self;
+ struct mii_softc *sc = (struct mii_softc *)self;
+ struct mii_attach_args *ma = aux;
+ struct mii_data *mii = ma->mii_data;
+
+ printf(": ML6692 100baseTX PHY\n");
+
+ sc->mii_inst = mii->mii_instance;
+ sc->mii_phy = ma->mii_phyno;
+ sc->mii_funcs = &mlphy_funcs;
+ sc->mii_pdata = mii;
+ sc->mii_flags = ma->mii_flags;
+ msc->ml_dev = parent;
+
+ mii_phy_reset(sc);
+
+ sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
+#define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL)
+ ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_LOOP, sc->mii_inst),
+ MII_MEDIA_100_TX);
+ ma->mii_capmask = ~sc->mii_capabilities;
+#undef ADD
+ if(sc->mii_capabilities & BMSR_MEDIAMASK)
+ mii_phy_add_media(sc);
+}
+
+int
+mlphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
+{
+ struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
+ struct mii_softc *other = NULL;
+ struct mlphy_softc *msc = (struct mlphy_softc *)sc;
+ int other_inst, reg;
+
+ LIST_FOREACH(other, &mii->mii_phys, mii_list)
+ if (other != sc)
+ break;
+
+ if ((sc->mii_dev.dv_flags & DVF_ACTIVE) == 0)
+ return (ENXIO);
+
+ switch (cmd) {
+ case MII_POLLSTAT:
+ /*
+ * If we're not polling our PHY instance, just return.
+ */
+ if (IFM_INST(ife->ifm_media) != sc->mii_inst)
+ return (0);
+ break;
+
+ case MII_MEDIACHG:
+ /*
+ * If the interface is not up, don't do anything.
+ */
+ if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
+ break;
+
+ switch (IFM_SUBTYPE(ife->ifm_media)) {
+ case IFM_AUTO:
+ msc->ml_state = ML_STATE_AUTO_SELF;
+ if (other != NULL) {
+ mii_phy_reset(other);
+ PHY_WRITE(other, MII_BMCR, BMCR_ISO);
+ }
+ (void)mii_phy_auto(sc, 0);
+ msc->ml_linked = 0;
+ break;
+ case IFM_10_T:
+ /*
+ * For 10baseT modes, reset and program the
+ * companion PHY (of any), then setup ourselves
+ * to match. This will put us in pass-through
+ * mode and let the companion PHY do all the
+ * work.
+ * BMCR data is stored in the ifmedia entry.
+ */
+ if (other != NULL) {
+ mii_phy_reset(other);
+ PHY_WRITE(other, MII_BMCR, ife->ifm_data);
+ }
+ mii_phy_setmedia(sc);
+ msc->ml_state = 0;
+ break;
+ case IFM_100_TX:
+ /*
+ * For 100baseTX modes, reset and isolate the
+ * companion PHY (if any), then setup ourselves
+ * accordingly.
+ *
+ * BMCR data is stored in the ifmedia entry.
+ */
+ if (other != NULL) {
+ mii_phy_reset(other);
+ PHY_WRITE(other, MII_BMCR, BMCR_ISO);
+ }
+ mii_phy_setmedia(sc);
+ msc->ml_state = 0;
+ break;
+ default:
+ return (EINVAL);
+ }
+ break;
+ case MII_TICK:
+ /*
+ * If interface is not up, don't do anything
+ */
+ if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
+ return (0);
+ /*
+ * Only used for autonegotiation.
+ */
+ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO)
+ break;
+ /*
+ * Check to see if we have link. If we do, we don't
+ * need to restart the autonegotiation process. Read
+ * the BMSR twice in case it's latched.
+ * If we're in a 10Mbps mode, check the link of the
+ * 10Mbps PHY. Sometimes the Micro Linear PHY's
+ * linkstat bit will clear while the linkstat bit of
+ * the companion PHY will remain set.
+ */
+ if (msc->ml_state == ML_STATE_AUTO_OTHER) {
+ reg = PHY_READ(other, MII_BMSR) |
+ PHY_READ(other, MII_BMSR);
+ } else {
+ reg = PHY_READ(sc, MII_BMSR) |
+ PHY_READ(sc, MII_BMSR);
+ }
+
+ if (reg & BMSR_LINK) {
+ if (!msc->ml_linked) {
+ msc->ml_linked = 1;
+ mlphy_status(sc);
+ }
+ break;
+ }
+ /*
+ * Only retry autonegotiation every 5 seconds.
+ */
+ if (++sc->mii_ticks <= MII_ANEGTICKS)
+ break;
+
+ sc->mii_ticks = 0;
+ msc->ml_linked = 0;
+ mii->mii_media_active = IFM_NONE;
+ mii_phy_reset(sc);
+ msc->ml_state = ML_STATE_AUTO_SELF;
+ if (other != NULL) {
+ mii_phy_reset(other);
+ PHY_WRITE(other, MII_BMCR, BMCR_ISO);
+ }
+ mii_phy_auto(sc, 0);
+ break;
+
+ case MII_DOWN:
+ mii_phy_down(sc);
+ return (0);
+ }
+
+ /* Update the media status. */
+ if (msc->ml_state == ML_STATE_AUTO_OTHER && other != NULL) {
+ other_inst = other->mii_inst;
+ other->mii_inst = sc->mii_inst;
+ if (IFM_INST(ife->ifm_media) == other->mii_inst)
+ (void) PHY_SERVICE(other, mii, MII_POLLSTAT);
+ other->mii_inst = other_inst;
+ sc->mii_media_active = other->mii_media_active;
+ sc->mii_media_status = other->mii_media_status;
+ } else
+ ukphy_status(sc);
+
+ /* Callback if something changed. */
+ mii_phy_update(sc, cmd);
+ return (0);
+}
+
+void
+mlphy_reset(struct mii_softc *sc)
+{
+ int reg;
+
+ mii_phy_reset(sc);
+ reg = PHY_READ(sc, MII_BMCR);
+ reg &= ~BMCR_AUTOEN;
+ PHY_WRITE(sc, MII_BMCR, reg);
+}
+
+/*
+ * If we negotiate a 10Mbps mode, we need to check for an alternate
+ * PHY and make sure it's enabled and set correctly.
+ */
+void
+mlphy_status(struct mii_softc *sc)
+{
+ struct mlphy_softc *msc = (struct mlphy_softc *)sc;
+ struct mii_data *mii = sc->mii_pdata;
+ struct mii_softc *other = NULL;
+
+ /* See if there's another PHY on the bus with us. */
+ LIST_FOREACH(other, &mii->mii_phys, mii_list)
+ if (other != sc)
+ break;
+
+ ukphy_status(sc);
+
+ if (IFM_SUBTYPE(mii->mii_media_active) != IFM_10_T) {
+ msc->ml_state = ML_STATE_AUTO_SELF;
+ if (other != NULL) {
+ mii_phy_reset(other);
+ PHY_WRITE(other, MII_BMCR, BMCR_ISO);
+ }
+ }
+
+ if (IFM_SUBTYPE(mii->mii_media_active) == IFM_10_T) {
+ msc->ml_state = ML_STATE_AUTO_OTHER;
+ mlphy_reset(&msc->ml_mii);
+ PHY_WRITE(&msc->ml_mii, MII_BMCR, BMCR_ISO);
+ if (other != NULL) {
+ mii_phy_reset(other);
+ mii_phy_auto(other, 1);
+ }
+ }
+}
