 @@ -1,14 +1,14 @@
-/* $NetBSD: ciphy.c,v 1.34 2019/04/11 09:14:07 msaitoh Exp $ */
+/* $NetBSD: ciphy.c,v 1.35 2019/10/11 09:29:04 msaitoh Exp $ */
 /*-
  * Copyright (c) 2004
  *	Bill Paul <wpaul@windriver.com>.  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.
 @@ -25,27 +25,27 @@
  * 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.
+ *
  * FreeBSD: src/sys/dev/mii/ciphy.c,v 1.2 2005/01/06 01:42:55 imp Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.34 2019/04/11 09:14:07 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.35 2019/10/11 09:29:04 msaitoh Exp $");
 /*
  * Driver for the Cicada CS8201 10/100/1000 copper PHY.
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/bus.h>
 #include <net/if.h>
 @@ -287,27 +287,27 @@ setit:
 	if (sc->mii_media_active != mii->mii_media_active ||
 	    sc->mii_media_status != mii->mii_media_status ||
 	    cmd == MII_MEDIACHG) {
 		ciphy_fixup(sc);
+	}
 	mii_phy_update(sc, cmd);
 	return 0;
+}
 static void
 ciphy_status(struct mii_softc *sc)
+{
 	struct mii_data *mii = sc->mii_pdata;
-	uint16_t bmsr, bmcr;
+	uint16_t bmsr, bmcr, gtsr;
 	mii->mii_media_status = IFM_AVALID;
 	mii->mii_media_active = IFM_ETHER;
 	PHY_READ(sc, MII_BMSR, &bmsr);
 	PHY_READ(sc, MII_BMSR, &bmsr);
 	if (bmsr & BMSR_LINK)
 		mii->mii_media_status |= IFM_ACTIVE;
 	PHY_READ(sc, MII_BMCR, &bmcr);
 	if (bmcr & BMCR_LOOP)
 @@ -333,36 +333,39 @@ ciphy_status(struct mii_softc *sc)
 		mii->mii_media_active |= IFM_1000_T;
 		break;
 	default:
 		aprint_error_dev(sc->mii_dev, "unknown PHY speed %x\n",
 		    bmsr & CIPHY_AUXCSR_SPEED);
 		break;
+	}
 	if (bmsr & CIPHY_AUXCSR_FDX)
 		mii->mii_media_active |= IFM_FDX;
 	else
 		mii->mii_media_active |= IFM_HDX;
-	return;
+	if (IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_T) {
 		PHY_READ(sc, MII_GTSR, &gtsr);
 		if ((gtsr & GTSR_MS_RES) != 0)
 			mii->mii_media_active |= IFM_ETH_MASTER;
+	}
+}
 static void
 ciphy_reset(struct mii_softc *sc)
+{
 	mii_phy_reset(sc);
 	DELAY(1000);
 	return;
+}
 static inline int
 PHY_SETBIT(struct mii_softc *sc, int y, uint16_t z)
+{
 	uint16_t _tmp;
 	int rv;
 	if ((rv = PHY_READ(sc, y, &_tmp)) != 0)
 		return rv;
 	return PHY_WRITE(sc, y, _tmp | z);
+}
 @@ -427,16 +430,14 @@ ciphy_fixup(struct mii_softc *sc)
 		else
 			PHY_CLRBIT(sc, CIPHY_MII_10BTCSR, CIPHY_10BTCSR_ECHO);
 		break;
 	case MII_MODEL_CICADA_VSC8211:
 	case MII_MODEL_CICADA_CS8244:
 	case MII_MODEL_VITESSE_VSC8601:
 		break;
 	default:
 		aprint_error_dev(sc->mii_dev, "unknown CICADA PHY model %x\n",
 		    model);
 		break;
+	}
 	return;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rgephy.c,v 1.56 2019/10/11 03:40:01 msaitoh Exp $	*/
+/*	$NetBSD: rgephy.c,v 1.57 2019/10/11 09:29:04 msaitoh Exp $	*/
 /*
  * Copyright (c) 2003
  *	Bill Paul <wpaul@windriver.com>.  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.
 @@ -23,27 +23,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.56 2019/10/11 03:40:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.57 2019/10/11 09:29:04 msaitoh Exp $");
 /*
  * Driver for the RealTek 8169S/8110S internal 10/100/1000 PHY.
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/socket.h>
 @@ -346,27 +346,27 @@ rgephy_linkup(struct mii_softc *sc)
 	} else {
 		PHY_READ(sc, RTK_GMEDIASTAT, &reg);
 		if ((reg & RTK_GMEDIASTAT_LINK) != 0)
 			linkup = true;
+	}
 	return linkup;
+}
 static void
 rgephy_status(struct mii_softc *sc)
+{
 	struct mii_data *mii = sc->mii_pdata;
-	uint16_t gstat, bmsr, bmcr, physr, ssr;
+	uint16_t gstat, bmsr, bmcr, gtsr, physr, ssr;
 	mii->mii_media_status = IFM_AVALID;
 	mii->mii_media_active = IFM_ETHER;
 	if (rgephy_linkup(sc))
 		mii->mii_media_status |= IFM_ACTIVE;
 	PHY_READ(sc, MII_BMSR, &bmsr);
 	PHY_READ(sc, MII_BMCR, &bmcr);
 	if ((bmcr & BMCR_ISO) != 0) {
 		mii->mii_media_active |= IFM_NONE;
 		mii->mii_media_status = 0;
 @@ -432,26 +432,32 @@ rgephy_status(struct mii_softc *sc)
 			mii->mii_media_active |= IFM_1000_T;
 		else if ((gstat & RTK_GMEDIASTAT_100MBPS) != 0)
 			mii->mii_media_active |= IFM_100_TX;
 		else if ((gstat & RTK_GMEDIASTAT_10MBPS) != 0)
 			mii->mii_media_active |= IFM_10_T;
 		else
 			mii->mii_media_active |= IFM_NONE;
 		if ((gstat & RTK_GMEDIASTAT_FDX) != 0)
 			mii->mii_media_active |= mii_phy_flowstatus(sc) |
 			    IFM_FDX;
 		else
 			mii->mii_media_active |= IFM_HDX;
+	}
 	if (IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_T) {
 		PHY_READ(sc, MII_GTSR, &gtsr);
 		if ((gtsr & GTSR_MS_RES) != 0)
 			mii->mii_media_active |= IFM_ETH_MASTER;
+	}
+}
 static int
 rgephy_mii_phy_auto(struct mii_softc *mii)
+{
 	int anar;
 	mii->mii_ticks = 0;
 	rgephy_loop(mii);
 	rgephy_reset(mii);
 	anar = BMSR_MEDIA_TO_ANAR(mii->mii_capabilities) | ANAR_CSMA;
 	if (mii->mii_flags & MIIF_DOPAUSE)