[src/trunk]: src/sys/dev/mii atphy, ciphy, ihphy and rgephy are gigabit PHY, ...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/340495cb9164
branches:  trunk
changeset: 787279:340495cb9164
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Sun Jun 09 08:42:16 2013 +0000

description:
atphy, ciphy, ihphy and rgephy are gigabit PHY, so not only check IFM_AUTO
for autonegotiation but also check IFM_1000_T, too.

diffstat:

 sys/dev/mii/atphy.c  |  7 ++++---
 sys/dev/mii/ciphy.c  |  7 ++++---
 sys/dev/mii/ihphy.c  |  7 ++++---
 sys/dev/mii/rgephy.c |  7 ++++---
 4 files changed, 16 insertions(+), 12 deletions(-)

diffs (112 lines):

diff -r 7ef48dbcdaec -r 340495cb9164 sys/dev/mii/atphy.c
--- a/sys/dev/mii/atphy.c       Sun Jun 09 06:29:01 2013 +0000
+++ b/sys/dev/mii/atphy.c       Sun Jun 09 08:42:16 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atphy.c,v 1.13 2013/06/06 03:10:48 msaitoh Exp $ */
+/*     $NetBSD: atphy.c,v 1.14 2013/06/09 08:42:16 msaitoh Exp $ */
 /*     $OpenBSD: atphy.c,v 1.1 2008/09/25 20:47:16 brad Exp $  */
 
 /*-
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.13 2013/06/06 03:10:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.14 2013/06/09 08:42:16 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -264,7 +264,8 @@
                /*
                 * Only used for autonegotiation.
                 */
-               if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) {
+               if ((IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) &&
+                   (IFM_SUBTYPE(ife->ifm_media) != IFM_1000_T)) {
                        sc->mii_ticks = 0;
                        break;
                }
diff -r 7ef48dbcdaec -r 340495cb9164 sys/dev/mii/ciphy.c
--- a/sys/dev/mii/ciphy.c       Sun Jun 09 06:29:01 2013 +0000
+++ b/sys/dev/mii/ciphy.c       Sun Jun 09 08:42:16 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ciphy.c,v 1.20 2013/06/06 03:10:48 msaitoh Exp $ */
+/* $NetBSD: ciphy.c,v 1.21 2013/06/09 08:42:16 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2004
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.20 2013/06/06 03:10:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.21 2013/06/09 08:42:16 msaitoh Exp $");
 
 /*
  * Driver for the Cicada CS8201 10/100/1000 copper PHY.
@@ -257,7 +257,8 @@
                /*
                 * Only used for autonegotiation.
                 */
-               if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO)
+               if ((IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) &&
+                   (IFM_SUBTYPE(ife->ifm_media) != IFM_1000_T))
                        break;
 
                /*
diff -r 7ef48dbcdaec -r 340495cb9164 sys/dev/mii/ihphy.c
--- a/sys/dev/mii/ihphy.c       Sun Jun 09 06:29:01 2013 +0000
+++ b/sys/dev/mii/ihphy.c       Sun Jun 09 08:42:16 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ihphy.c,v 1.2 2011/05/20 06:06:59 msaitoh Exp $        */
+/*     $NetBSD: ihphy.c,v 1.3 2013/06/09 08:42:16 msaitoh Exp $        */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ihphy.c,v 1.2 2011/05/20 06:06:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ihphy.c,v 1.3 2013/06/09 08:42:16 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -217,7 +217,8 @@
                /*
                 * Only used for autonegotiation.
                 */
-               if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO)
+               if ((IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) &&
+                   (IFM_SUBTYPE(ife->ifm_media) != IFM_1000_T))
                        return 0;
 
                if (mii_phy_tick(sc) == EJUSTRETURN)
diff -r 7ef48dbcdaec -r 340495cb9164 sys/dev/mii/rgephy.c
--- a/sys/dev/mii/rgephy.c      Sun Jun 09 06:29:01 2013 +0000
+++ b/sys/dev/mii/rgephy.c      Sun Jun 09 08:42:16 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rgephy.c,v 1.30 2013/06/06 03:10:48 msaitoh Exp $      */
+/*     $NetBSD: rgephy.c,v 1.31 2013/06/09 08:42:16 msaitoh Exp $      */
 
 /*
  * Copyright (c) 2003
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.30 2013/06/06 03:10:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.31 2013/06/09 08:42:16 msaitoh Exp $");
 
 
 /*
@@ -288,7 +288,8 @@
                /*
                 * Only used for autonegotiation.
                 */
-               if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO)
+               if ((IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) &&
+                   (IFM_SUBTYPE(ife->ifm_media) != IFM_1000_T))
                        break;
 
                /*