From nobody Sat Oct 17 21:38:07 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 4j6Zt83NVfz6wqt4 for ; Sat, 17 Oct 2026 21:38:08 +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 4j6Zt80N8xz55Qp for ; Sat, 17 Oct 2026 21:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792273088; 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=yd/IqsnHGZqw+Gr7ysidwhRj424N5zprLiYJGpzXCXE=; b=qr+1Hi1sFTn+SYgTwDIDQCg03UHn/mSB/vbc+FzYuB5dy48DSgRxbOm1NRomGa88JKT+BG 8C2LtUkp4hPoAiubSZgJF3kngvZsAWA8QwQYkW69rPLzYAHlkYnmDNK1C6qLo3Zvpko+5B aCoHbgM4b2KBjsU1rI2ekyHVs1yVUv+qP2I4HBclKXQsNlCmMPwD+8GEDQT8VViaukWy73 SeIERK/apjPcJIMJvsBax+izXVyQi2RiDme2JxkD20W+UESuhbLLdBK66TfR4dWEwxdFuO Yu+VweRN3F7hXGqc+ORu3s8fJ5rRpRTK9cRjKKc4SpluWRer1zBRQ6G+wlVIyg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792273088; b=EosKKGgKxRJgZyxzMTTKFolfswKhcC98ArEsAFHP9npHrROwH1K4jq3XHIKAMam5jUbtXs Cp140c962leLsPcY02vhIaT7amVgkvrqSfM3wSGrI07xk4pgAqAqnKRq92LQcl7WDZYfXm R/5nJfDzmwcFLYGohW3UO/UB3iuaIBexPfRb/9sc57sNRZ5bMD0YtpQLzetmKWDc83DeIt lIQr/xIh4qf7XznQEN3Q3aMhc4jKIkbvUtw7MJAZs03yMnrQyx2wx8s9UoBoG+6pjSQM+U d4t8ZN3dFcfWXO7oVR4FmUTGomXHNwhKsWAPr5gGzFmAoAdPENqrwhqBL3uh8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792273088; 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=yd/IqsnHGZqw+Gr7ysidwhRj424N5zprLiYJGpzXCXE=; b=wStFcr3asmTLc7Y5/V4f5WCSGgjHc8v+8SS5RXXBzqGeq8rClipCbTq/z8y3ID9h3yRj1a N25sNSbiqmdn8DbSfdYIEdhRoKNFBOa0CXeuMMosl/kI/OYJ+5FNOuhWWCleVQ4iFhpT75 nct7wVT6mIjCsH8VpJgcHByE9tqSOzBzoPvsMyQvTdqrGGpaPDeRdVsetvG1pP+bYLJD/3 eh92mtnw+RvJP8FjIv9MpLI9JUtWuL3zjtyWgex5hTLD2cPPhUsSK9DHuX+nuJaMYilIYf QmGMrAhjG+LRCUZoCkbcB6QTfn/r0ExhD9xIs4uJ3k2rnLvJD6TXQyuonzk6aw== 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 4j6Zt76GjYzKSG for ; Sat, 17 Oct 2026 21:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ed32 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 17 Oct 2026 21:38:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 176fd23c88e8 - main - iwm: ensure NIC is alive during txq enable List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 176fd23c88e8f7e3736389547c4a2990736911e7 Auto-Submitted: auto-generated Date: Sat, 17 Oct 2026 21:38:07 +0000 Message-Id: <6ad3eabf.3ed32.669ec61a@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=176fd23c88e8f7e3736389547c4a2990736911e7 commit 176fd23c88e8f7e3736389547c4a2990736911e7 Author: Adrian Chadd AuthorDate: 2026-10-17 21:32:01 +0000 Commit: Adrian Chadd CommitDate: 2026-10-17 21:32:01 +0000 iwm: ensure NIC is alive during txq enable I broke this in a previous commit. OpenBSD already has the NIC nailed alive but FreeBSD's codebase currently does not. Locally tested: * 7260, 9260, STA mode Fixes: 0a12ff65b9647a6e31471e5d27a8692b4adb6803 Differential Revision: https://reviews.freebsd.org/D60823 --- sys/dev/iwm/if_iwm.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c index 94963c17312c..1bd07fa07102 100644 --- a/sys/dev/iwm/if_iwm.c +++ b/sys/dev/iwm/if_iwm.c @@ -1706,9 +1706,10 @@ iwm_enable_ac_txq(struct iwm_softc *sc, int qid, int fifo) { int err; - if (!sc->cmd_hold_nic_awake) { - device_printf(sc->sc_dev, "%s: NIC not awake\n", __func__); - return (ENXIO); + if (!iwm_nic_lock(sc)) { + device_printf(sc->sc_dev, "%s: cannot enable txq %d\n", + __func__, qid); + return EBUSY; } IWM_WRITE(sc, IWM_HBUS_TARG_WRPTR, qid << 8 | 0); @@ -1719,6 +1720,10 @@ iwm_enable_ac_txq(struct iwm_softc *sc, int qid, int fifo) err = iwm_clear_bits_prph(sc, IWM_SCD_AGGR_SEL, (1 << qid)); if (err) { + iwm_nic_unlock(sc); + device_printf(sc->sc_dev, + "%s: cannot clear aggr_sel for txq %d\n", + __func__, qid); return err; } @@ -1747,6 +1752,8 @@ iwm_enable_ac_txq(struct iwm_softc *sc, int qid, int fifo) iwm_write_prph(sc, IWM_SCD_EN_CTRL, iwm_read_prph(sc, IWM_SCD_EN_CTRL) | (1 << qid)); + iwm_nic_unlock(sc); + return 0; }