Module Name:    src
Committed By:   jmcneill
Date:           Fri Aug 21 12:22:22 UTC 2015

Modified Files:
        src/sys/dev/mii: rgephy.c

Log Message:
Disable link down power save mode and energy efficient ethernet on RTL8211F.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/mii/rgephy.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/mii/rgephy.c
diff -u src/sys/dev/mii/rgephy.c:1.39 src/sys/dev/mii/rgephy.c:1.40
--- src/sys/dev/mii/rgephy.c:1.39	Tue Mar 31 21:01:02 2015
+++ src/sys/dev/mii/rgephy.c	Fri Aug 21 12:22:22 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: rgephy.c,v 1.39 2015/03/31 21:01:02 jmcneill Exp $	*/
+/*	$NetBSD: rgephy.c,v 1.40 2015/08/21 12:22:22 jmcneill Exp $	*/
 
 /*
  * Copyright (c) 2003
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.39 2015/03/31 21:01:02 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.40 2015/08/21 12:22:22 jmcneill Exp $");
 
 
 /*
@@ -637,10 +637,9 @@ rgephy_reset(struct mii_softc *sc)
 	} else if (sc->mii_mpd_rev == 6) {
 		/* RTL8211F */
 		phycr1 = PHY_READ(sc, RGEPHY_MII_PHYCR1);
-		if ((phycr1 & RGEPHY_PHYCR1_MDI_MMCE) != 0) {
-			phycr1 &= ~RGEPHY_PHYCR1_MDI_MMCE;
-			PHY_WRITE(sc, RGEPHY_MII_PHYCR1, phycr1);
-		}
+		phycr1 &= ~RGEPHY_PHYCR1_MDI_MMCE;
+		phycr1 &= ~RGEPHY_PHYCR1_ALDPS_EN;
+		PHY_WRITE(sc, RGEPHY_MII_PHYCR1, phycr1);
 	} else {
 		PHY_WRITE(sc, 0x1F, 0x0000);
 		PHY_WRITE(sc, 0x0e, 0x0000);
@@ -657,4 +656,14 @@ rgephy_reset(struct mii_softc *sc)
 	/* Step2: Restart NWay */
 	/* NWay enable and Restart NWay */
 	PHY_WRITE(sc, MII_BMCR, BMCR_RESET | BMCR_AUTOEN | BMCR_STARTNEG);
+
+	if (sc->mii_mpd_rev == 6) {
+		/* RTL8211F */
+		delay(10000);
+		/* disable EEE */
+		PHY_WRITE(sc, RGEPHY_MII_MACR, 0x0007);
+		PHY_WRITE(sc, RGEPHY_MII_MAADR, 0x003c);
+		PHY_WRITE(sc, RGEPHY_MII_MACR, 0x4007);
+		PHY_WRITE(sc, RGEPHY_MII_MAADR, 0x0000);
+	}
 }

Reply via email to