[src/netbsd-10]: src/sys/dev/mii Pull up following revision(s) (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/5f77f5c8fd3d
branches:  netbsd-10
changeset: 376530:5f77f5c8fd3d
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Jun 21 22:11:29 2023 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #208):

        sys/dev/mii/ciphy.c: revision 1.42
        sys/dev/mii/brgphy.c: revision 1.91
        sys/dev/mii/mii_physubr.c: revision 1.102
        sys/dev/mii/ipgphy.c: revision 1.11
        sys/dev/mii/tlphy.c: revision 1.72
        sys/dev/mii/jmphy.c: revision 1.5
        sys/dev/mii/urlphy.c: revision 1.40
        sys/dev/mii/atphy.c: revision 1.31

Retry autonegotiation every mii_anegticks seconds instead of mii_anegticks+1.

diffstat:

 sys/dev/mii/atphy.c       |  6 +++---
 sys/dev/mii/brgphy.c      |  6 +++---
 sys/dev/mii/ciphy.c       |  6 +++---
 sys/dev/mii/ipgphy.c      |  6 +++---
 sys/dev/mii/jmphy.c       |  4 ++--
 sys/dev/mii/mii_physubr.c |  6 +++---
 sys/dev/mii/tlphy.c       |  6 +++---
 sys/dev/mii/urlphy.c      |  6 +++---
 8 files changed, 23 insertions(+), 23 deletions(-)

diffs (207 lines):

diff -r e607c4ded1f1 -r 5f77f5c8fd3d sys/dev/mii/atphy.c
--- a/sys/dev/mii/atphy.c       Wed Jun 21 22:05:30 2023 +0000
+++ b/sys/dev/mii/atphy.c       Wed Jun 21 22:11:29 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atphy.c,v 1.30 2020/03/15 23:04:50 thorpej Exp $ */
+/*     $NetBSD: atphy.c,v 1.30.22.1 2023/06/21 22:11:29 martin 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.30 2020/03/15 23:04:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.30.22.1 2023/06/21 22:11:29 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -323,7 +323,7 @@ done:
                        break;
 
                /* Only retry autonegotiation every mii_anegticks seconds. */
-               if (sc->mii_ticks <= sc->mii_anegticks)
+               if (sc->mii_ticks < sc->mii_anegticks)
                        break;
 
                atphy_mii_phy_auto(sc);
diff -r e607c4ded1f1 -r 5f77f5c8fd3d sys/dev/mii/brgphy.c
--- a/sys/dev/mii/brgphy.c      Wed Jun 21 22:05:30 2023 +0000
+++ b/sys/dev/mii/brgphy.c      Wed Jun 21 22:11:29 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: brgphy.c,v 1.90 2020/05/25 19:48:38 jmcneill Exp $     */
+/*     $NetBSD: brgphy.c,v 1.90.20.1 2023/06/21 22:11:29 martin Exp $  */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.90 2020/05/25 19:48:38 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.90.20.1 2023/06/21 22:11:29 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -424,7 +424,7 @@ setit:
 
                /* Only retry autonegotiation every mii_anegticks seconds. */
                KASSERT(sc->mii_anegticks != 0);
-               if (sc->mii_ticks <= sc->mii_anegticks)
+               if (sc->mii_ticks < sc->mii_anegticks)
                        break;
 
                brgphy_mii_phy_auto(sc);
diff -r e607c4ded1f1 -r 5f77f5c8fd3d sys/dev/mii/ciphy.c
--- a/sys/dev/mii/ciphy.c       Wed Jun 21 22:05:30 2023 +0000
+++ b/sys/dev/mii/ciphy.c       Wed Jun 21 22:11:29 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ciphy.c,v 1.41 2020/08/24 04:23:41 msaitoh Exp $ */
+/* $NetBSD: ciphy.c,v 1.41.20.1 2023/06/21 22:11:29 martin Exp $ */
 
 /*-
  * Copyright (c) 2004
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.41 2020/08/24 04:23:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.41.20.1 2023/06/21 22:11:29 martin Exp $");
 
 /*
  * Driver for the Cicada CS8201 10/100/1000 copper PHY.
@@ -270,7 +270,7 @@ setit:
                        break;
 
                /* Only retry autonegotiation every N seconds. */
-               if (sc->mii_ticks <= sc->mii_anegticks)
+               if (sc->mii_ticks < sc->mii_anegticks)
                        break;
 
                mii_phy_auto_restart(sc);
diff -r e607c4ded1f1 -r 5f77f5c8fd3d sys/dev/mii/ipgphy.c
--- a/sys/dev/mii/ipgphy.c      Wed Jun 21 22:05:30 2023 +0000
+++ b/sys/dev/mii/ipgphy.c      Wed Jun 21 22:11:29 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipgphy.c,v 1.10 2020/03/15 23:04:50 thorpej Exp $ */
+/*     $NetBSD: ipgphy.c,v 1.10.24.1 2023/06/21 22:11:29 martin Exp $ */
 /*     $OpenBSD: ipgphy.c,v 1.19 2015/07/19 06:28:12 yuo Exp $ */
 
 /*-
@@ -33,7 +33,7 @@
  * Driver for the IC Plus IP1000A/IP1001 10/100/1000 PHY.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipgphy.c,v 1.10 2020/03/15 23:04:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipgphy.c,v 1.10.24.1 2023/06/21 22:11:29 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -237,7 +237,7 @@ done:
                        break;
 
                /* Only retry autonegotiation every mii_anegticks seconds. */
-               if (sc->mii_ticks <= sc->mii_anegticks)
+               if (sc->mii_ticks < sc->mii_anegticks)
                        break;
 
                sc->mii_ticks = 0;
diff -r e607c4ded1f1 -r 5f77f5c8fd3d sys/dev/mii/jmphy.c
--- a/sys/dev/mii/jmphy.c       Wed Jun 21 22:05:30 2023 +0000
+++ b/sys/dev/mii/jmphy.c       Wed Jun 21 22:11:29 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: jmphy.c,v 1.4 2020/03/15 23:04:50 thorpej Exp $ */
+/*     $NetBSD: jmphy.c,v 1.4.24.1 2023/06/21 22:11:29 martin Exp $ */
 /*     $OpenBSD: jmphy.c,v 1.6 2015/03/14 03:38:48 jsg Exp $   */
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari%FreeBSD.org@localhost>
@@ -174,7 +174,7 @@ jmphy_service(struct mii_softc *sc, stru
                /* Announce link loss right after it happens. */
                if (sc->mii_ticks++ == 0)
                        break;
-               if (sc->mii_ticks <= sc->mii_anegticks)
+               if (sc->mii_ticks < sc->mii_anegticks)
                        return 0;
 
                sc->mii_ticks = 0;
diff -r e607c4ded1f1 -r 5f77f5c8fd3d sys/dev/mii/mii_physubr.c
--- a/sys/dev/mii/mii_physubr.c Wed Jun 21 22:05:30 2023 +0000
+++ b/sys/dev/mii/mii_physubr.c Wed Jun 21 22:11:29 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mii_physubr.c,v 1.101 2022/08/23 01:05:50 riastradh Exp $      */
+/*     $NetBSD: mii_physubr.c,v 1.101.4.1 2023/06/21 22:11:29 martin Exp $     */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.101 2022/08/23 01:05:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.101.4.1 2023/06/21 22:11:29 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -390,7 +390,7 @@ mii_phy_tick(struct mii_softc *sc)
         * Only retry autonegotiation every N seconds.
         */
        KASSERT(sc->mii_anegticks != 0);
-       if (sc->mii_ticks <= sc->mii_anegticks)
+       if (sc->mii_ticks < sc->mii_anegticks)
                return EJUSTRETURN;
 
        if (mii_phy_auto_restart(sc) == EJUSTRETURN)
diff -r e607c4ded1f1 -r 5f77f5c8fd3d sys/dev/mii/tlphy.c
--- a/sys/dev/mii/tlphy.c       Wed Jun 21 22:05:30 2023 +0000
+++ b/sys/dev/mii/tlphy.c       Wed Jun 21 22:11:29 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tlphy.c,v 1.71 2020/07/07 08:44:12 msaitoh Exp $       */
+/*     $NetBSD: tlphy.c,v 1.71.20.1 2023/06/21 22:11:29 martin Exp $   */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.71 2020/07/07 08:44:12 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.71.20.1 2023/06/21 22:11:29 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -290,7 +290,7 @@ tlphy_service(struct mii_softc *sc, stru
 
                /* Only retry autonegotiation every mii_anegticks seconds. */
                KASSERT(sc->mii_anegticks != 0);
-               if (sc->mii_ticks <= sc->mii_anegticks)
+               if (sc->mii_ticks < sc->mii_anegticks)
                        break;
 
                tlphy_auto(tsc);
diff -r e607c4ded1f1 -r 5f77f5c8fd3d sys/dev/mii/urlphy.c
--- a/sys/dev/mii/urlphy.c      Wed Jun 21 22:05:30 2023 +0000
+++ b/sys/dev/mii/urlphy.c      Wed Jun 21 22:11:29 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: urlphy.c,v 1.39 2022/01/08 17:35:05 riastradh Exp $    */
+/*     $NetBSD: urlphy.c,v 1.39.4.1 2023/06/21 22:11:29 martin Exp $   */
 /*
  * Copyright (c) 2001, 2002
  *     Shingo WATANABE <nabe%nabechan.org@localhost>.  All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urlphy.c,v 1.39 2022/01/08 17:35:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urlphy.c,v 1.39.4.1 2023/06/21 22:11:29 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -199,7 +199,7 @@ urlphy_service(struct mii_softc *sc, str
 
                /* Only retry autonegotiation every N seconds. */
                KASSERT(sc->mii_anegticks != 0);
-               if (sc->mii_ticks <= sc->mii_anegticks)
+               if (sc->mii_ticks < sc->mii_anegticks)
                        return 0;
 
                if (mii_phy_auto_restart(sc) == EJUSTRETURN)