From nobody Sun Aug 16 17:05:48 2026 X-Original-To: dev-commits-src-main@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 4hNMmX3G4yz6pLRs for ; Sun, 16 Aug 2026 17:05:48 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hNMmX1lvDz3WFX for ; Sun, 16 Aug 2026 17:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786899948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9x+7acv84tWgua+6Ig5X9mTCHi1e2RWZklxIEfQhjY4=; b=odDkRUs3xGi4fhnnzTQtFz6dF5DWCgtFe9+vdjrPyLTw89IM0ArUkQSMboer+A4Zqeh+3K Lc9BT8KECx9x0FL+/X8+iNjnebuv3LXyZ5BAtgi4gYPZcemwkuoVHFbh4ZW3A2xTS1BuML v5Hwrs902RgN7MVgWH5fsCbN63lSUSvPKM9mVfayprR0Brdb5tTNwLIKmZSuBkvXhM1PL2 JtruaBi9ln1wWDpU9SIYTfyOd9zq+IJfGbXCMqW/u+ETeh9sl8EpylSN+ZoFnkSCN6aPlI P19w77ftluvv36FZFryu5U3WZTgIhVwmewe7KbdL+eE5SrrLTWbtC76XPpfU/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786899948; a=rsa-sha256; cv=none; b=dmmhCjh6CdMcREWabEy0MFDKa7fcs4mMS+cLIeB+3nYeqNYN3OmE9oOX0zRIhrHWHb/gU5 dlCs/n5n4rFT3geM+3QEcOPMGbhTyhAXxOaOBKK6a9Z9pFFa3QPh3zvXDl1Y8A3hN54jrZ ++qBYalDvBWCtyX90LOt7W5WJbaVKMTRdM24+zEaxuJWDKyQpd319cU6LOpzseL+EfrmM+ vU2TTFCx6GaMYbLLaTB2I1i3YDsxqZ0Nl977dJ4nO9bMQh8gupU9zcBlIiOnAkthUO4dmU c5xKIMDMtoevyR7v26HbiZ78MBFQtMOyUC7PktRYEaJlarU9Oi7gblxNBfw5dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786899948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9x+7acv84tWgua+6Ig5X9mTCHi1e2RWZklxIEfQhjY4=; b=MLHDa0hRv2pXWOJ6WAB9TclPWp/rHXlLXhtQ2oZQt7z4ZaFYlf7ZAcHb7lpIKor1xpqEo5 bG65w90TZf+lM9N2r1kRyHXJMxPSVXn9NwsC+hiXYSM/NlsmSSg3YNo/hiDoW49eYDg5t7 ECso2reBNcFEysCEX20THytVgtmwvU1baQJUvkJVvLppdEZ7J1e10LrY37TgsNRQeB8ZuY kOJyVQTFxK4uR+Xp7kcQ6CHPghxeWnXr7C3Sproyl62ReFFQPKmhNurxEMEG9/T7yj9yAv t8D24myzr8RusaQlzkIzNXi/DdOrME0RlnECUV4zpXu+NtVY1TkLqKeBf/poiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hNMmX0Kd2zdN1 for ; Sun, 16 Aug 2026 17:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30242 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 16 Aug 2026 17:05:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Nick Price Subject: git: 6dbf809bafe1 - main - aq(4): arm PHY thermal shutdown only where a sensor exists List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: 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: nprice X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6dbf809bafe1421fbf3cdd952748b15437b7c72a Auto-Submitted: auto-generated Date: Sun, 16 Aug 2026 17:05:48 +0000 Message-Id: <6a81edec.30242.43ec705e@gitrepo.freebsd.org> The branch main has been updated by nprice: URL: https://cgit.FreeBSD.org/src/commit/?id=6dbf809bafe1421fbf3cdd952748b15437b7c72a commit 6dbf809bafe1421fbf3cdd952748b15437b7c72a Author: Nick Price AuthorDate: 2026-08-15 02:05:59 +0000 Commit: Nick Price CommitDate: 2026-08-16 17:05:23 +0000 aq(4): arm PHY thermal shutdown only where a sensor exists aq_fw2x_thermal_arm() reached for a copper PHY register that the fibre parts do not implement, so arming failed on every init and printed a warning for a capability the hardware cannot have. Return ENOTSUP when the firmware does not advertise a temperature sensor, matching aq_fw2x_get_temp(), and warn only for a genuine failure. Signed-off-by: Nick Price Accepted-by: adrian Approved-by: adrian (cherry picked from commit 3c7f1aa3b831431193106f8610b2142131d774f5) --- sys/dev/aq/aq_fw2x.c | 3 +++ sys/dev/aq/aq_main.c | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/dev/aq/aq_fw2x.c b/sys/dev/aq/aq_fw2x.c index 91a20cebb7d0..a4e584da2d65 100644 --- a/sys/dev/aq/aq_fw2x.c +++ b/sys/dev/aq/aq_fw2x.c @@ -657,6 +657,9 @@ aq_fw2x_thermal_arm(struct aq_hw* hw) uint16_t ctrl; int err; + if ((hw->fw_caps & FW2X_CAP_TEMPERATURE) == 0) + return (ENOTSUP); + mtx_lock(&hw->fw_mtx); aq_fw2x_phy_id_probe(hw); err = aq_fw2x_phy_read(hw, AQ_PHY_MMD_GLOBAL, AQ_PHY_THERMAL_CTRL_REG, diff --git a/sys/dev/aq/aq_main.c b/sys/dev/aq/aq_main.c index 9910c89d1c37..92a6cbde858a 100644 --- a/sys/dev/aq/aq_main.c +++ b/sys/dev/aq/aq_main.c @@ -782,10 +782,12 @@ aq_if_init(if_ctx_t ctx) softc->init_retries = 0; /* aq_hw_init reloads the PHY, resetting the thermal-shutdown arming. */ - if (hw->fw_ops->thermal_arm != NULL && - hw->fw_ops->thermal_arm(hw) != 0) - device_printf(softc->dev, - "could not arm PHY thermal shutdown\n"); + if (hw->fw_ops->thermal_arm != NULL) { + err = hw->fw_ops->thermal_arm(hw); + if (err != 0 && err != ENOTSUP) + device_printf(softc->dev, + "could not arm PHY thermal shutdown\n"); + } aq_if_media_status(ctx, &ifmr);