From nobody Mon Aug 31 18:09:20 2026 X-Original-To: dev-commits-src-branches@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 4hYcSx2CdLz6r91F for ; Mon, 31 Aug 2026 18:09:21 +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 4hYcSw4N0cz3Tmj for ; Mon, 31 Aug 2026 18:09:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788199760; 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=jqV2A3sAOZ9TdUdTh4fMEIw15KySwgBJ/79O6cBk4KE=; b=kNLlKwQYsOV5PgtzW1HpGG8ogfYWx7HhAaox/bt4BpB2zVhsTMqi2Tue6/jfaEs0d8dkrK UWhcl8Ksji5xYh+mUM3o/VdyojyjJqbCYrWG47PLTMgkOqfAYZeo819rORZjGCU8ZAmzky o7SmkYHZfw3zZBMnyWcScREYopDaMeuSQze7m+25Cat6ntw2kBFEsrl5ICLRqq5R6JfrNZ s+cjstMDVbARSFYx3WZtehLfM2PB23aLohhAUOhNT7Eg/HAAQPhEhgPZu5sOYWJZThvQPe 7fyHD04+wLm0QF/67BtrF8SfkYINQlRvJimUtSuiX4FrAVXvCad5JuOtO7HUAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788199760; a=rsa-sha256; cv=none; b=eyMibNq68x7WkMyS2CPhdh6SJ2z1CuSCPtzGSHZ77t4oeu8N3RovzDHoHp7o+yLTB10uS0 iHHKCOGVswzghDITp4bL7aCnwtcUxAhcHRuPIvZNPpyMm2fqjxOEdh7wItrGrf1H+hQ1/C tkvFz3MI1CfkKN55bZ1i/iVmbBDaDBcJIxnsmExPOPinnULBywZJFqqlEYf6/8EWaPtqtW SlLV9iGIBnrGxWDWBuZZZrumXzzl6tI3vEWCFSUl3Q4Cn1oQRPJL3EwxWoYbz28sedgRF+ TIsYYO2eeGlfuJIsDLsVFJJZvdKaRDmiddUd/mA/7xsXFkmOBUVlERWYpzhmnA== 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=1788199760; 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=jqV2A3sAOZ9TdUdTh4fMEIw15KySwgBJ/79O6cBk4KE=; b=OFmfW3sce6vRwuMee2oJvm5vG6KSKLIr1jxXC62nAWYTwV8K3o5TpykfaOmTn6h1Sxs5ZW dmIm+gZhJ1w89y4xe9TxTW1B4LazB95T1sbNRee8Ni/fNeR96uwAcZ+AAXwqiyrAgiTuyV ts3mX3hwA1qhVz6d+oAM1U1AOqZOtrmzMMGhR4uelxgYF1537ZRWLhfG2A+XpB8jYNqdfy RDk2L6n/johMrzmDPceciWk24IZ1M15ynBioosggZs0vxHLQF34mYFgGLIS5/eq0KxvmCu bM0hZ4GjPIdDxDwbE+KU5+VKM7esA4gdWW2VeUPZP7jL2CSn7EbsA899PGZaSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hYcSw2yLfz6tL for ; Mon, 31 Aug 2026 18:09:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c719 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 31 Aug 2026 18:09:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Nick Price From: Ed Maste Subject: git: b15ed4f7a75b - stable/15 - aq(4): arm PHY thermal shutdown only where a sensor exists List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b15ed4f7a75bd5f197202efc4023b2b87d3d95d3 Auto-Submitted: auto-generated Date: Mon, 31 Aug 2026 18:09:20 +0000 Message-Id: <6a95c350.3c719.79468d6a@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b15ed4f7a75bd5f197202efc4023b2b87d3d95d3 commit b15ed4f7a75bd5f197202efc4023b2b87d3d95d3 Author: Nick Price AuthorDate: 2026-08-15 02:05:59 +0000 Commit: Ed Maste CommitDate: 2026-08-31 18:08:47 +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 6dbf809bafe1421fbf3cdd952748b15437b7c72a) --- 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);