From nobody Thu Oct 15 02:19:07 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 4j4sFm1hlNz6w6S3 for ; Thu, 15 Oct 2026 02:19: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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j4sFl5yj5z4hGr for ; Thu, 15 Oct 2026 02:19:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792030747; 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=h/OHIft/FDzbWgAhMcyFjLRP8pwNwNnStlaOZ7m837M=; b=Lkk1uCshA9GvjWXeE0yAtKuuG5POZa6IwRm6G2k1UY40KJf3FKzmVr9UJLX4aO/XodwULw p7ob4jRvOJdsEVELx4yfosIlEOoW7XNUHvu8qDkZpridKN3mBQEGUC6g2Nf80uXdZDLDxk lsAeP0Up/yuWsILJpxyXwLm9iNyPI/08dSPktjBns0vuo1GfQgZCJmMWukViqiq1qEpUD5 7amB3zTlndfz9cjNgR7hIlnZMOCtMP7pqD6DpDCryBYxkHyOVpngk6LbMFaHhghP7ThlPF c/r7n1zcqfjq6Vh5OvLqdhMkoGg+BmJJbh7ks/2NL99T3LHJpm64pZFNvgVNqQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792030747; b=sD+eFDRbXj+ehGusApvxuf1SJBwpB3bRVk8tu6NsxB8SCa2kCPeZ/2Y2l4Ax+qYeLmF2lo FODV5T/AJ5njX96siVSGR1gSF8U03NWnrnuVulvPyClAkOTZeTdA1h1YmfbJOkPt3HjQ2L ut62JkxSRyiM4t3w7jDGLA5XTUCVugVl+W7eGMY6Sve3df7j3QdgItqvqnyT1kaamop88H vfOHwQoxfhHNOHPzFTwe4lPR41rmNJqcBDyohnNnvc43d+Cb9ysWsIplxHwO9j2zlURpqc 6ZaOTHUaQvEqrVLj7NaTI6sivrKu0ufXSJyz13vjVugZ2U8ZFAhaVFO68H+gIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792030747; 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=h/OHIft/FDzbWgAhMcyFjLRP8pwNwNnStlaOZ7m837M=; b=s9aUax8Kbi3MYqAQQPOXiNmnBG2xbvh0d2yB1eX3QeM/MyWeKGxqguj4rGFXc9+xlFOddF lAN47qEKhnC8S9JfQEJ8OO8tBtuUWxb07igWipCuNeB23hSMt5ffWAjfKiJ0iW5MaVM/h0 raVSHV9GG39vqD0JpoPHKXAd9iFn9ngh8rzwPicKPqMPEIUpqMZuCRWVozNBLIASkkz+aA YwzXWqm0h98kAsM71AMRvgNp8y5k4R80RTcUmi0JZQopVdF+0427Dz8IG7NjCyU/aXdD1K eO/MA63oUmBPytc/IQO95DYbvlIGjeODMgQP+GPwqRW9n5SJAf45I9gEKwAbGw== 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 4j4sFl4lDTz1Rf0 for ; Thu, 15 Oct 2026 02:19:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21be8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 15 Oct 2026 02:19:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: c27ed49a46f8 - main - iwm: add return status to set/clear prph bits 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c27ed49a46f8cc4228ed7d420b703b4872ee46d7 Auto-Submitted: auto-generated Date: Thu, 15 Oct 2026 02:19:07 +0000 Message-Id: <6ad0381b.21be8.5a95823f@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=c27ed49a46f8cc4228ed7d420b703b4872ee46d7 commit c27ed49a46f8cc4228ed7d420b703b4872ee46d7 Author: Adrian Chadd AuthorDate: 2026-10-15 01:50:15 +0000 Commit: Adrian Chadd CommitDate: 2026-10-15 01:50:16 +0000 iwm: add return status to set/clear prph bits This brings these functions inline with OpenBSD Locally tested: * 3160, STA mode * 7260, STA mode * 8260, STA mode * 9260, STA mode Obtained from: OpenBSD a6e25c727a2214219715b51ba6af2221d7e0d674 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D60211 --- sys/dev/iwm/if_iwm_pcie_trans.c | 13 +++++++------ sys/dev/iwm/if_iwm_pcie_trans.h | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/sys/dev/iwm/if_iwm_pcie_trans.c b/sys/dev/iwm/if_iwm_pcie_trans.c index 39b96f66fbde..8b3d9d98a59b 100644 --- a/sys/dev/iwm/if_iwm_pcie_trans.c +++ b/sys/dev/iwm/if_iwm_pcie_trans.c @@ -308,31 +308,32 @@ iwm_nic_unlock(struct iwm_softc *sc) IWM_CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ); } -void +int iwm_set_bits_mask_prph(struct iwm_softc *sc, uint32_t reg, uint32_t bits, uint32_t mask) { uint32_t val; - /* XXX: no error path? */ if (iwm_nic_lock(sc)) { val = iwm_read_prph(sc, reg) & mask; val |= bits; iwm_write_prph(sc, reg, val); iwm_nic_unlock(sc); + return 0; } + return EBUSY; } -void +int iwm_set_bits_prph(struct iwm_softc *sc, uint32_t reg, uint32_t bits) { - iwm_set_bits_mask_prph(sc, reg, bits, ~0); + return iwm_set_bits_mask_prph(sc, reg, bits, ~0); } -void +int iwm_clear_bits_prph(struct iwm_softc *sc, uint32_t reg, uint32_t bits) { - iwm_set_bits_mask_prph(sc, reg, 0, ~bits); + return iwm_set_bits_mask_prph(sc, reg, 0, ~bits); } /* diff --git a/sys/dev/iwm/if_iwm_pcie_trans.h b/sys/dev/iwm/if_iwm_pcie_trans.h index a236009802a6..e313a123d567 100644 --- a/sys/dev/iwm/if_iwm_pcie_trans.h +++ b/sys/dev/iwm/if_iwm_pcie_trans.h @@ -117,10 +117,10 @@ extern int iwm_poll_bit(struct iwm_softc *sc, int reg, uint32_t bits, uint32_t mask, int timo); extern int iwm_nic_lock(struct iwm_softc *sc); extern void iwm_nic_unlock(struct iwm_softc *sc); -extern void iwm_set_bits_mask_prph(struct iwm_softc *sc, +extern int iwm_set_bits_mask_prph(struct iwm_softc *sc, uint32_t reg, uint32_t bits, uint32_t mask); -extern void iwm_set_bits_prph(struct iwm_softc *sc, uint32_t reg, uint32_t bits); -extern void iwm_clear_bits_prph(struct iwm_softc *sc, uint32_t reg, uint32_t bits); +extern int iwm_set_bits_prph(struct iwm_softc *sc, uint32_t reg, uint32_t bits); +extern int iwm_clear_bits_prph(struct iwm_softc *sc, uint32_t reg, uint32_t bits); extern void iwm_enable_rfkill_int(struct iwm_softc *sc); extern int iwm_check_rfkill(struct iwm_softc *sc); extern int iwm_set_hw_ready(struct iwm_softc *sc);