From nobody Fri Oct 30 17:34:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jGSrT0r69z6xFvD for ; Fri, 30 Oct 2026 17:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jGSrS72Pnz4XxM for ; Fri, 30 Oct 2026 17:34:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793381641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Kc0Bd0pRt46ru4N5FrmKd0Hzsa8tF9jrzc9tqDt6qs=; b=SmVHQAViErGUL6hcASnQbJHexqLTXo7EckGJDoz+apYNuZ9gWv/byIZB0jPraDkocYM9hM N3tI5LHUFrTkr+qdM6HLRngP/U84vHPMLjMFi+Z/nGIAbCuS1AN7AMJCNdxszPahhrkK+A m4X8O7tH8ZefJPFe0kvDQcn6D9t65Yi8jkgYe7EjplhUP21LR7PQMZuvK65YpbChHcWpdt jn4SWTKleh9DdYWvVNjKhKyB4c8OMi5o1Pw7903Pb0Uf6zsC5XNAqpnT7ONd7VRwN1vq3A z0iT0xeb+yoVUw7UPgBtDJG90qV0w9ZTuHcPoonnTKQD9cIqEpYrL+cOLm8bMw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793381641; b=XAASND5LPaGKhyBcGPUM0hyJanu5gIHgkHHb8sQLQRHNyvaKJNZK5YY8X33msSm2AQrs6I +kUsaMfHWX0/YDz6iSpecKIWl02kHDmk6Hq/iwWyUzaDeQVIi64Lyj+S12Z14+G/exkIAQ pfPX6159CYfCPyfDB8IMJlaetKS7U/qtU4zNwXXxBHdDnbt233nVSQlWhVKorC2F2AUV8D jLN8kNeETUkjLh4qWjLM9yeUK4WOlagc/KiQ1fGeEmlRAMlEeF8t0WmeC22w7gB57/pQqh Oau2jlzfvEAHFYvOlCbjB0+wCl5OnEPU4wJgQiLmbDCg70hViOsV8dx+jBB4xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793381641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Kc0Bd0pRt46ru4N5FrmKd0Hzsa8tF9jrzc9tqDt6qs=; b=CEwbXnG2l5r33BxEiB4M7LdX7AgtEO0gSULY6RLXIQN9bF8N5qninkmJwgS37oZ7515enc JsyPzY1NQFxzsbSyPAivA89BJ7QIatoqjLm+pEXuVvBXeZZZTNyhHVgPDtor87WK3DDXvm MV5mFLezcftUsuWvDPVyQ3MLNiMAb1gteukQz+p9l/wCqtfEkChxUdTIjXxlClseoSOCze OSFBi38kdlU49PDRgZyjhtidk/1TThKJFt5Am2l05/+5lbgVZjjCaIp5T8UsXyvUxg1Uyl d2sjCRaolTa/Q529UbaZGCIdrmcNbswaoBfHcBFOfsJrw07HPiqJ0TRMFmNDxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jGSrS60shzdr7 for ; Fri, 30 Oct 2026 17:34:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40388 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Oct 2026 17:34:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Rafael Kitover From: Kevin Bowling Subject: git: b85df7fd81c4 - stable/15 - ure(4): Fix spurious link flaps from MII List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b85df7fd81c429f49f2820829b5fb22228a97bb8 Auto-Submitted: auto-generated Date: Fri, 30 Oct 2026 17:34:00 +0000 Message-Id: <6ae4d508.40388.bccdbb6@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=b85df7fd81c429f49f2820829b5fb22228a97bb8 commit b85df7fd81c429f49f2820829b5fb22228a97bb8 Author: Rafael Kitover AuthorDate: 2026-03-16 10:32:17 +0000 Commit: Kevin Bowling CommitDate: 2026-10-30 17:33:50 +0000 ure(4): Fix spurious link flaps from MII A race condition in the MII layer causes spurious link down events. In `statchg`, on link down, check if the PHY reports the link as actually down using the BMSR register, if not, force the status of the link to back up and restart TX. Do the same in a MII `linkchg` handler. On actual link up, restart TX in case it went idle and down. PR: 252165 Signed-off-by: Rafael Kitover Reviewed by: pouria Differential Revision: https://reviews.freebsd.org/D55682 (cherry picked from commit 33e0568d30a687b3bbd3f00fd9b323ff031e39a2) --- sys/dev/usb/net/if_ure.c | 69 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 3 deletions(-) diff --git a/sys/dev/usb/net/if_ure.c b/sys/dev/usb/net/if_ure.c index 257051e6e379..aca510b3b863 100644 --- a/sys/dev/usb/net/if_ure.c +++ b/sys/dev/usb/net/if_ure.c @@ -128,6 +128,7 @@ static usb_callback_t ure_bulk_write_callback; static miibus_readreg_t ure_miibus_readreg; static miibus_writereg_t ure_miibus_writereg; static miibus_statchg_t ure_miibus_statchg; +static miibus_linkchg_t ure_miibus_linkchg; static uether_fn_t ure_attach_post; static uether_fn_t ure_init; @@ -184,6 +185,7 @@ static device_method_t ure_methods[] = { DEVMETHOD(miibus_readreg, ure_miibus_readreg), DEVMETHOD(miibus_writereg, ure_miibus_writereg), DEVMETHOD(miibus_statchg, ure_miibus_statchg), + DEVMETHOD(miibus_linkchg, ure_miibus_linkchg), DEVMETHOD_END }; @@ -443,6 +445,8 @@ ure_miibus_statchg(device_t dev) struct mii_data *mii; if_t ifp; int locked; + uint16_t bmsr; + bool new_link, old_link; sc = device_get_softc(dev); mii = GET_MII(sc); @@ -455,6 +459,7 @@ ure_miibus_statchg(device_t dev) (if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0) goto done; + old_link = (sc->sc_flags & URE_FLAG_LINK) ? true : false; sc->sc_flags &= ~URE_FLAG_LINK; if ((mii->mii_media_status & (IFM_ACTIVE | IFM_AVALID)) == (IFM_ACTIVE | IFM_AVALID)) { @@ -475,14 +480,72 @@ ure_miibus_statchg(device_t dev) } } - /* Lost link, do nothing. */ - if ((sc->sc_flags & URE_FLAG_LINK) == 0) - goto done; + new_link = (sc->sc_flags & URE_FLAG_LINK) ? true : false; + if (old_link && !new_link) { + /* + * MII layer reports link down. Verify by reading + * the PHY BMSR register directly. BMSR link status + * is latched-low, so read twice: first clears any + * stale latch, second gives current state. + */ + (void)ure_ocp_reg_read(sc, + URE_OCP_BASE_MII + MII_BMSR * 2); + bmsr = ure_ocp_reg_read(sc, + URE_OCP_BASE_MII + MII_BMSR * 2); + + if (bmsr & BMSR_LINK) { + /* + * PHY still has link. This is a spurious + * link-down from the MII polling race (see + * PR 252165). Restore IFM_ACTIVE so the + * subsequent MIIBUS_LINKCHG check in + * mii_phy_update sees no change. + */ + device_printf(dev, + "spurious link down (PHY link up), overriding\n"); + sc->sc_flags |= URE_FLAG_LINK; + mii->mii_media_status |= IFM_ACTIVE; + } + } done: if (!locked) URE_UNLOCK(sc); } +static void +ure_miibus_linkchg(device_t dev) +{ + struct ure_softc *sc; + struct mii_data *mii; + int locked; + uint16_t bmsr; + + sc = device_get_softc(dev); + mii = GET_MII(sc); + locked = mtx_owned(&sc->sc_mtx); + if (locked == 0) + URE_LOCK(sc); + + /* + * This is called by the default miibus linkchg handler + * before it calls if_link_state_change(). If the PHY + * still has link but the MII layer lost IFM_ACTIVE due + * to the polling race (see PR 252165), restore it so the + * notification goes out as LINK_STATE_UP rather than DOWN. + */ + if (mii != NULL && (mii->mii_media_status & IFM_ACTIVE) == 0) { + (void)ure_ocp_reg_read(sc, + URE_OCP_BASE_MII + MII_BMSR * 2); + bmsr = ure_ocp_reg_read(sc, + URE_OCP_BASE_MII + MII_BMSR * 2); + if (bmsr & BMSR_LINK) + mii->mii_media_status |= IFM_ACTIVE; + } + + if (locked == 0) + URE_UNLOCK(sc); +} + /* * Probe for a RTL8152/RTL8153/RTL8156 chip. */