 @@ -1,14 +1,14 @@
-/*	$NetBSD: rgephy.c,v 1.55 2019/06/05 17:50:06 triaxx Exp $	*/
+/*	$NetBSD: rgephy.c,v 1.56 2019/10/11 03:40:01 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.55 2019/06/05 17:50:06 triaxx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.56 2019/10/11 03:40:01 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>
 @@ -65,26 +65,27 @@ static void	rgephy_attach(device_t, devi
 struct rgephy_softc {
 	struct mii_softc mii_sc;
 	bool mii_no_rx_delay;
 };
 CFATTACH_DECL_NEW(rgephy, sizeof(struct rgephy_softc),
     rgephy_match, rgephy_attach, mii_phy_detach, mii_phy_activate);
 static int	rgephy_service(struct mii_softc *, struct mii_data *, int);
 static void	rgephy_status(struct mii_softc *);
 static int	rgephy_mii_phy_auto(struct mii_softc *);
 static void	rgephy_reset(struct mii_softc *);
 static bool	rgephy_linkup(struct mii_softc *);
 static void	rgephy_loop(struct mii_softc *);
 static void	rgephy_load_dspcode(struct mii_softc *);
 static const struct mii_phy_funcs rgephy_funcs = {
 	rgephy_service, rgephy_status, rgephy_reset,
 };
 static const struct mii_phydesc rgephys[] = {
 	MII_PHY_DESC(xxREALTEK, RTL8169S),
 	MII_PHY_DESC(REALTEK, RTL8169S),
 	MII_PHY_DESC(REALTEK, RTL8251),
 	MII_PHY_END,
 };
 @@ -285,46 +286,29 @@ rgephy_service(struct mii_softc *sc, str
 			/*
 			 * Reset autonegotiation timer to 0 to make sure
 			 * the future autonegotiation start with 0.
 			 */
 			sc->mii_ticks = 0;
 			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 (sc->mii_mpd_rev >= RGEPHY_8211F) {
+		if (rgephy_linkup(sc)) {
-			/* RTL8211F */
+			sc->mii_ticks = 0;
-			PHY_READ(sc, RGEPHY_MII_PHYSR, &reg);
+			break;
 			if (reg & RGEPHY_PHYSR_LINK) {
 				sc->mii_ticks = 0;
 				break;
 		} else if (sc->mii_mpd_rev >= RGEPHY_8211B) {
 			/* RTL8211B(L) */
 			PHY_READ(sc, RGEPHY_MII_SSR, &reg);
 			if (reg & RGEPHY_SSR_LINK) {
 				sc->mii_ticks = 0;
 				break;
 		} else {
 			PHY_READ(sc, RTK_GMEDIASTAT, &reg);
 			if ((reg & RTK_GMEDIASTAT_LINK) != 0) {
 				sc->mii_ticks = 0;
 				break;
+		}
 		/* Announce link loss right after it happens. */
 		if (sc->mii_ticks++ == 0)
 			break;
 		/* Only retry autonegotiation every mii_anegticks seconds. */
 		if (sc->mii_ticks <= sc->mii_anegticks)
 			return 0;
 		rgephy_mii_phy_auto(sc);
 		break;
+	}
 @@ -335,48 +319,60 @@ rgephy_service(struct mii_softc *sc, str
 	/*
 	 * Callback if something changed. Note that we need to poke
 	 * the DSP on the RealTek PHYs if the media changes.
 	 */
 	if (sc->mii_media_active != mii->mii_media_active ||
 	    sc->mii_media_status != mii->mii_media_status ||
 	    cmd == MII_MEDIACHG) {
 		rgephy_load_dspcode(sc);
+	}
 	mii_phy_update(sc, cmd);
 	return 0;
+}
 static bool
 rgephy_linkup(struct mii_softc *sc)
+{
 	bool linkup = false;
 	uint16_t reg;
 	if (sc->mii_mpd_rev >= RGEPHY_8211F) {
 		PHY_READ(sc, RGEPHY_MII_PHYSR, &reg);
 		if (reg & RGEPHY_PHYSR_LINK)
 			linkup = true;
 	} else if (sc->mii_mpd_rev >= RGEPHY_8211B) {
 		PHY_READ(sc, RGEPHY_MII_SSR, &reg);
 		if (reg & RGEPHY_SSR_LINK)
 			linkup = true;
 	} 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;
 	mii->mii_media_status = IFM_AVALID;
 	mii->mii_media_active = IFM_ETHER;
-	if (sc->mii_mpd_rev >= RGEPHY_8211F) {
+	if (rgephy_linkup(sc))
-		PHY_READ(sc, RGEPHY_MII_PHYSR, &physr);
+		mii->mii_media_status |= IFM_ACTIVE;
 		if (physr & RGEPHY_PHYSR_LINK)
 			mii->mii_media_status |= IFM_ACTIVE;
 	} else if (sc->mii_mpd_rev >= RGEPHY_8211B) {
 		PHY_READ(sc, RGEPHY_MII_SSR, &ssr);
 		if (ssr & RGEPHY_SSR_LINK)
 			mii->mii_media_status |= IFM_ACTIVE;
 	} else {
 		PHY_READ(sc, RTK_GMEDIASTAT, &gstat);
 		if ((gstat & RTK_GMEDIASTAT_LINK) != 0)
 			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;
 		return;
+	}
 	if ((bmcr & BMCR_LOOP) != 0)
 		mii->mii_media_active |= IFM_LOOP;