Module Name: src
Committed By: snj
Date: Thu Apr 30 19:15:10 UTC 2015
Modified Files:
src/sys/dev/mii [netbsd-7]: rgephy.c rgephyreg.h
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #722):
sys/dev/mii/rgephy.c: revision 1.39
sys/dev/mii/rgephyreg.h: revision 1.8
when resetting RTL8211F, make sure to disable manual MDI mode
To generate a diff of this commit:
cvs rdiff -u -r1.35.4.2 -r1.35.4.3 src/sys/dev/mii/rgephy.c
cvs rdiff -u -r1.6.34.1 -r1.6.34.2 src/sys/dev/mii/rgephyreg.h
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.35.4.2 src/sys/dev/mii/rgephy.c:1.35.4.3
--- src/sys/dev/mii/rgephy.c:1.35.4.2 Sat Mar 21 16:58:31 2015
+++ src/sys/dev/mii/rgephy.c Thu Apr 30 19:15:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rgephy.c,v 1.35.4.2 2015/03/21 16:58:31 snj Exp $ */
+/* $NetBSD: rgephy.c,v 1.35.4.3 2015/04/30 19:15:10 snj Exp $ */
/*
* Copyright (c) 2003
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.35.4.2 2015/03/21 16:58:31 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.35.4.3 2015/04/30 19:15:10 snj Exp $");
/*
@@ -619,7 +619,7 @@ rgephy_load_dspcode(struct mii_softc *sc
static void
rgephy_reset(struct mii_softc *sc)
{
- uint16_t ssr;
+ uint16_t ssr, phycr1;
mii_phy_reset(sc);
DELAY(1000);
@@ -634,6 +634,13 @@ rgephy_reset(struct mii_softc *sc)
ssr &= ~RGEPHY_SSR_ALDPS;
PHY_WRITE(sc, RGEPHY_MII_SSR, ssr);
}
+ } 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);
+ }
} else {
PHY_WRITE(sc, 0x1F, 0x0000);
PHY_WRITE(sc, 0x0e, 0x0000);
Index: src/sys/dev/mii/rgephyreg.h
diff -u src/sys/dev/mii/rgephyreg.h:1.6.34.1 src/sys/dev/mii/rgephyreg.h:1.6.34.2
--- src/sys/dev/mii/rgephyreg.h:1.6.34.1 Sat Mar 21 16:58:31 2015
+++ src/sys/dev/mii/rgephyreg.h Thu Apr 30 19:15:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rgephyreg.h,v 1.6.34.1 2015/03/21 16:58:31 snj Exp $ */
+/* $NetBSD: rgephyreg.h,v 1.6.34.2 2015/04/30 19:15:10 snj Exp $ */
/*
* Copyright (c) 2003
@@ -56,6 +56,9 @@
#define RGEPHY_SSR_JABBER 0x0001 /* Jabber */
/* RTL8211F */
+#define RGEPHY_MII_PHYCR1 0x18 /* PHY Specific control register 1 */
+#define RGEPHY_PHYCR1_MDI_MMCE __BIT(9)
+
#define RGEPHY_MII_PHYSR 0x1a /* PHY Specific status register */
#define RGEPHY_PHYSR_ALDPS __BIT(14)
#define RGEPHY_PHYSR_MDI_PLUG __BIT(13)
