From nobody Thu Oct 15 02:19:05 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 4j4sFk0T34z6w6VQ for ; Thu, 15 Oct 2026 02:19:06 +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 4j4sFj4Z2Vz4hNQ for ; Thu, 15 Oct 2026 02:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792030745; 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=gmPz3uovo2K6q2vsslCFQK0YpSBK0R4PHEPk+M76yVY=; b=kI/liQgs5zpyVjoOhNC5BRibMUiiZgZP3yjziKGP1aavErpgP3Sx6JCZ/NZhvcsXM2ihd3 s5FqmL7eHG6fqQGrvnyBvwM4VpAUMB+gyfhzHFau6MbaZ8ezxPe6cSOU5vsOtr8593BbBF 3FBDgUHg3A3lHwQvlKUVjZ37fPU7cnFD1PckPRtk4/2RQ7cOH0qBEh3xHcENJa4roLBCww +9C8VUsLsn93qJHYX5Mbeh+h3xcinFmYIHHpb3GIuNyLmaiVxP+SO6fTNEAHdpeYhogr9m 6tpmRy+TM/GUTsMaVl68JOviIUEWNAwPjV6ZtU8PrPpeoQOl/tE0LH8t7oR2uw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792030745; b=GnfmxhenCZYnC9zIg84uRkaKSacGWydZGLlLNhuBCO77/qZ+phZ4PDN0Xwqzr2u/+2Jm4g 0UZcNwkLCvem0OcWqvXUR81sUbNkUnRTaIJ9I+mgp90p6MsNEingqANyiQAmOAVdGG215k kmANjWwTDDT9rfUnfw2OvaMoE2kGkP6v1CvZNhCC4YrivfAi4Zq/4NbEI44T1f93OWtLy5 HVFRVj7pkEyyT5twXG7jphrmqOjG4fC7S3jXHaSaEG8aKm8NiOcgs+SWkBqopew7uig2Gp ywMfpJPHxfo6mlgPFhkknln3WrRCGhi2Xe9+n4kw/FEJmHqj4CQUqGCPRs+d/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792030745; 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=gmPz3uovo2K6q2vsslCFQK0YpSBK0R4PHEPk+M76yVY=; b=s4tgr5Stwx+JuO4Ea87gnMOYOXRuocQSBDUKQMg3k7kXC8t+fK8J2SETevTWdS59s203BS nt8G41G8cJaw5SiqCR5LHSdZbjB198XlRV5RxTpIUcDFusle5bASfIyicg+cLdRlKAq+NA hKDtC9z8m01I36OAB4IHp3jrS+thuXdvRRv8DyFyaPzpbovS/tVjRxv0MiJ7+NNjAYnZDx N4SPQJ9zUz2pY1022JdFacXdUuqlE0trXsWYtPLflv3zBM0A9PISnVYyJYr+OudiA7ob+c S/OjWDfFbusUsTTcs8TrbZc9XrSQZZnufjA9F9VuPoib46UBZD4vAF7BzvnU/g== 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 4j4sFj3WvCz1RNG for ; Thu, 15 Oct 2026 02:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 224a3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 15 Oct 2026 02:19:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: ed92055cb8e7 - main - iwm: bring IWM_CSR_HW_IF_CONFIG_REG programming in line with openbsd 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: ed92055cb8e72d0a2055dc3e2f8fa96853c71d50 Auto-Submitted: auto-generated Date: Thu, 15 Oct 2026 02:19:05 +0000 Message-Id: <6ad03819.224a3.39001eac@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=ed92055cb8e72d0a2055dc3e2f8fa96853c71d50 commit ed92055cb8e72d0a2055dc3e2f8fa96853c71d50 Author: Adrian Chadd AuthorDate: 2026-10-15 01:49:16 +0000 Commit: Adrian Chadd CommitDate: 2026-10-15 01:49:18 +0000 iwm: bring IWM_CSR_HW_IF_CONFIG_REG programming in line with openbsd bring the iwm_nic_config() / IWM_CSR_HW_IF_CONFIG_REG programming in line with openbsd. Locally tested: * 3160 STA mode * 7260 STA mode * 8260 STA mode * 9260 STA mode Obtained from: OpenBSD a6e25c727a2214219715b51ba6af2221d7e0d674 Differential Revision: https://reviews.freebsd.org/D60081 --- sys/dev/iwm/if_iwm.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c index 610156681272..dd154e44aa8f 100644 --- a/sys/dev/iwm/if_iwm.c +++ b/sys/dev/iwm/if_iwm.c @@ -1469,7 +1469,7 @@ static void iwm_nic_config(struct iwm_softc *sc) { uint8_t radio_cfg_type, radio_cfg_step, radio_cfg_dash; - uint32_t reg_val = 0; + uint32_t mask, val, reg_val = 0; uint32_t phy_config = iwm_get_phy_config(sc); radio_cfg_type = (phy_config & IWM_FW_PHY_CFG_RADIO_TYPE) >> @@ -1490,15 +1490,18 @@ iwm_nic_config(struct iwm_softc *sc) reg_val |= radio_cfg_step << IWM_CSR_HW_IF_CONFIG_REG_POS_PHY_STEP; reg_val |= radio_cfg_dash << IWM_CSR_HW_IF_CONFIG_REG_POS_PHY_DASH; - IWM_WRITE(sc, IWM_CSR_HW_IF_CONFIG_REG, - IWM_CSR_HW_IF_CONFIG_REG_MSK_MAC_DASH | + mask = IWM_CSR_HW_IF_CONFIG_REG_MSK_MAC_DASH | IWM_CSR_HW_IF_CONFIG_REG_MSK_MAC_STEP | IWM_CSR_HW_IF_CONFIG_REG_MSK_PHY_STEP | IWM_CSR_HW_IF_CONFIG_REG_MSK_PHY_DASH | IWM_CSR_HW_IF_CONFIG_REG_MSK_PHY_TYPE | IWM_CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI | - IWM_CSR_HW_IF_CONFIG_REG_BIT_MAC_SI | - reg_val); + IWM_CSR_HW_IF_CONFIG_REG_BIT_MAC_SI; + + val = IWM_READ(sc, IWM_CSR_HW_IF_CONFIG_REG); + val &= ~mask; + val |= reg_val; + IWM_WRITE(sc, IWM_CSR_HW_IF_CONFIG_REG, val); IWM_DPRINTF(sc, IWM_DEBUG_RESET, "Radio type=0x%x-0x%x-0x%x\n", radio_cfg_type,