Module Name: src Committed By: msaitoh Date: Wed Feb 22 08:09:10 UTC 2023
Modified Files: src/sys/dev/mii: atphy.c brgphy.c ciphy.c ipgphy.c jmphy.c mii_physubr.c tlphy.c urlphy.c Log Message: Retry autonegotiation every mii_anegticks seconds instead of mii_anegticks+1. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/dev/mii/atphy.c cvs rdiff -u -r1.90 -r1.91 src/sys/dev/mii/brgphy.c cvs rdiff -u -r1.41 -r1.42 src/sys/dev/mii/ciphy.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/mii/ipgphy.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/mii/jmphy.c cvs rdiff -u -r1.101 -r1.102 src/sys/dev/mii/mii_physubr.c cvs rdiff -u -r1.71 -r1.72 src/sys/dev/mii/tlphy.c cvs rdiff -u -r1.39 -r1.40 src/sys/dev/mii/urlphy.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/atphy.c diff -u src/sys/dev/mii/atphy.c:1.30 src/sys/dev/mii/atphy.c:1.31 --- src/sys/dev/mii/atphy.c:1.30 Sun Mar 15 23:04:50 2020 +++ src/sys/dev/mii/atphy.c Wed Feb 22 08:09:09 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: atphy.c,v 1.30 2020/03/15 23:04:50 thorpej Exp $ */ +/* $NetBSD: atphy.c,v 1.31 2023/02/22 08:09:09 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.30 2020/03/15 23:04:50 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.31 2023/02/22 08:09:09 msaitoh 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); Index: src/sys/dev/mii/brgphy.c diff -u src/sys/dev/mii/brgphy.c:1.90 src/sys/dev/mii/brgphy.c:1.91 --- src/sys/dev/mii/brgphy.c:1.90 Mon May 25 19:48:38 2020 +++ src/sys/dev/mii/brgphy.c Wed Feb 22 08:09:09 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: brgphy.c,v 1.90 2020/05/25 19:48:38 jmcneill Exp $ */ +/* $NetBSD: brgphy.c,v 1.91 2023/02/22 08:09:09 msaitoh 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.91 2023/02/22 08:09:09 msaitoh 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); Index: src/sys/dev/mii/ciphy.c diff -u src/sys/dev/mii/ciphy.c:1.41 src/sys/dev/mii/ciphy.c:1.42 --- src/sys/dev/mii/ciphy.c:1.41 Mon Aug 24 04:23:41 2020 +++ src/sys/dev/mii/ciphy.c Wed Feb 22 08:09:09 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ciphy.c,v 1.41 2020/08/24 04:23:41 msaitoh Exp $ */ +/* $NetBSD: ciphy.c,v 1.42 2023/02/22 08:09:09 msaitoh 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.42 2023/02/22 08:09:09 msaitoh 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); Index: src/sys/dev/mii/ipgphy.c diff -u src/sys/dev/mii/ipgphy.c:1.10 src/sys/dev/mii/ipgphy.c:1.11 --- src/sys/dev/mii/ipgphy.c:1.10 Sun Mar 15 23:04:50 2020 +++ src/sys/dev/mii/ipgphy.c Wed Feb 22 08:09:09 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ipgphy.c,v 1.10 2020/03/15 23:04:50 thorpej Exp $ */ +/* $NetBSD: ipgphy.c,v 1.11 2023/02/22 08:09:09 msaitoh 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.11 2023/02/22 08:09:09 msaitoh 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; Index: src/sys/dev/mii/jmphy.c diff -u src/sys/dev/mii/jmphy.c:1.4 src/sys/dev/mii/jmphy.c:1.5 --- src/sys/dev/mii/jmphy.c:1.4 Sun Mar 15 23:04:50 2020 +++ src/sys/dev/mii/jmphy.c Wed Feb 22 08:09:09 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: jmphy.c,v 1.4 2020/03/15 23:04:50 thorpej Exp $ */ +/* $NetBSD: jmphy.c,v 1.5 2023/02/22 08:09:09 msaitoh Exp $ */ /* $OpenBSD: jmphy.c,v 1.6 2015/03/14 03:38:48 jsg Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yong...@freebsd.org> @@ -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; Index: src/sys/dev/mii/mii_physubr.c diff -u src/sys/dev/mii/mii_physubr.c:1.101 src/sys/dev/mii/mii_physubr.c:1.102 --- src/sys/dev/mii/mii_physubr.c:1.101 Tue Aug 23 01:05:50 2022 +++ src/sys/dev/mii/mii_physubr.c Wed Feb 22 08:09:09 2023 @@ -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.102 2023/02/22 08:09:09 msaitoh 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.102 2023/02/22 08:09:09 msaitoh 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) Index: src/sys/dev/mii/tlphy.c diff -u src/sys/dev/mii/tlphy.c:1.71 src/sys/dev/mii/tlphy.c:1.72 --- src/sys/dev/mii/tlphy.c:1.71 Tue Jul 7 08:44:12 2020 +++ src/sys/dev/mii/tlphy.c Wed Feb 22 08:09:09 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: tlphy.c,v 1.71 2020/07/07 08:44:12 msaitoh Exp $ */ +/* $NetBSD: tlphy.c,v 1.72 2023/02/22 08:09:09 msaitoh 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.72 2023/02/22 08:09:09 msaitoh 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); Index: src/sys/dev/mii/urlphy.c diff -u src/sys/dev/mii/urlphy.c:1.39 src/sys/dev/mii/urlphy.c:1.40 --- src/sys/dev/mii/urlphy.c:1.39 Sat Jan 8 17:35:05 2022 +++ src/sys/dev/mii/urlphy.c Wed Feb 22 08:09:09 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: urlphy.c,v 1.39 2022/01/08 17:35:05 riastradh Exp $ */ +/* $NetBSD: urlphy.c,v 1.40 2023/02/22 08:09:09 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002 * Shingo WATANABE <n...@nabechan.org>. 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.40 2023/02/22 08:09:09 msaitoh 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)