From nobody Fri Jan 17 16:05:30 2025 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 4YZPhp5dVsz5l88m; Fri, 17 Jan 2025 16:05:30 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YZPhp4M8nz4949; Fri, 17 Jan 2025 16:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737129930; 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=w5zXWvcdcM20hTI6MV/tt4xzldwcdQHSMt2laJiPbuA=; b=CSZwkIDGHpcAIpTYeaYeVXJO5eQ0EPTZtd2C701iOnZoEYRvFym6Wh8C6wvURqtB7tJNJM sdQR8Cd91iLVXeabtzC158VlvQ8WiLQW35ADXpc9f0qByDjezPX4AirDjW2Yn572tC6oc7 uok5HfDIc4ndLNQXohVna/K7ZkRyTM757fW6nQ+HZMwLDZPFt+JqeB5bQmQK4S3TDs67NS tQ46oC3oK4xHOKCXt073wg75jSPeYGQpFm5aGcSYAaMdBdk0vqnWRiamRZeDN3QYLIB0Ng /ALQH6RuF+EXfsSBx0AjHCuI6vWPQtxLWMUQ4P0RHvLL/Se+LaX0juf+/rIXiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737129930; 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=w5zXWvcdcM20hTI6MV/tt4xzldwcdQHSMt2laJiPbuA=; b=j1I7PVET5Q+nCLeeR3gL/tvFFGHM4h3Yw0LuzrR8VLQ8niop/hHIabqQNG4mdhk7YF5139 gaGkAoMbWRBk0by4R5qzZ5BEaKchZjhK2hS8EM4NLeA8X2LCxjjUVXrakUR1KOipPg/7qI ZdJ4feksB6tCibBsw8EOHjsRtLdH1cT0S7NuGFAgsZJkplJ6/pGUdMP2VwLcNfIiak6a0u 6j/w9ojg/LphOCKLrTwuFWg4ZuKzKfYaDHiAcQB9Aucy5W2VdLO/YJhFyjrKOL37XJKihe vYhFLKns17cDQh9eV1fq+qHe6MvKaeKEYs4g1OOUdA9ptat9pMWxosBJ7YF/XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737129930; a=rsa-sha256; cv=none; b=mEYoaDWpm0NtT/r+PGQscrCzBAJjV6DUKvjbEjMeoa+TcHsIgZc0drAQiuz5MTDhEH/GHp CKI2L/Jjd1ff63KPZW7fcMxM7gQ0stJfM0/VnsQqe1VorU7W+jHdk52u7KY/MJhFoVOjXn Xe/niZZzbq424Fe24ysxqfeurDXNP4frCxq97PZvTjLM7jgxQUBg2RqwG+PjZzCSUxKkdH e5vInbCkDHSeRjMWp9p8h7izN5Xi7XTyG2hvH1wwi8SlIJO4bD10VZz7weRzxfwK5fLvhv 591i+Lf9WKmeqMvvGsj+ZAUwJRHTqKq1IlklXNKuLjAlHSFdjnDZdlBclUu/Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YZPhp3jqNz981; Fri, 17 Jan 2025 16:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50HG5UWk067037; Fri, 17 Jan 2025 16:05:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HG5U1j067034; Fri, 17 Jan 2025 16:05:30 GMT (envelope-from git) Date: Fri, 17 Jan 2025 16:05:30 GMT Message-Id: <202501171605.50HG5U1j067034@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: d7df65349960 - main - iwm: add sku_cap_mimo_disable; populate sku_cap_11n_enable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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: d7df65349960c96f3982c21ee1d4eaaab2a4ca74 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=d7df65349960c96f3982c21ee1d4eaaab2a4ca74 commit d7df65349960c96f3982c21ee1d4eaaab2a4ca74 Author: Adrian Chadd AuthorDate: 2024-12-27 03:48:55 +0000 Commit: Adrian Chadd CommitDate: 2025-01-17 16:05:13 +0000 iwm: add sku_cap_mimo_disable; populate sku_cap_11n_enable This is a flag to be used to disable >1 antenna support, even if the radio supports it. Also populate sku_cap_11n_enable, which indicates HT is available. It's a no-op right now; it's one of the requirements for properly configuring HT support and transmit/receive antenna configurations. Obtained from: OpenBSD (at a6e25c727a2214219715b51ba6af2221d7e0d674, 22-Oct-2021) Differential Revision: https://reviews.freebsd.org/D48210 Reviewed by: bz --- sys/dev/iwm/if_iwm.c | 3 ++- sys/dev/iwm/if_iwmvar.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c index 15ef139fd5a5..248bfd056580 100644 --- a/sys/dev/iwm/if_iwm.c +++ b/sys/dev/iwm/if_iwm.c @@ -2220,7 +2220,8 @@ iwm_parse_nvm_data(struct iwm_softc *sc, sku = iwm_get_sku(sc, nvm_sw, phy_sku); data->sku_cap_band_24GHz_enable = sku & IWM_NVM_SKU_CAP_BAND_24GHZ; data->sku_cap_band_52GHz_enable = sku & IWM_NVM_SKU_CAP_BAND_52GHZ; - data->sku_cap_11n_enable = 0; + data->sku_cap_11n_enable = sku & IWM_NVM_SKU_CAP_11N_ENABLE; + data->sku_cap_mimo_disable = sku & IWM_NVM_SKU_CAP_MIMO_DISABLE; data->n_hw_addrs = iwm_get_n_hw_addrs(sc, nvm_sw); diff --git a/sys/dev/iwm/if_iwmvar.h b/sys/dev/iwm/if_iwmvar.h index 63201e5b3120..f31057c07b9b 100644 --- a/sys/dev/iwm/if_iwmvar.h +++ b/sys/dev/iwm/if_iwmvar.h @@ -200,6 +200,7 @@ struct iwm_nvm_data { int sku_cap_11n_enable; int sku_cap_amt_enable; int sku_cap_ipan_enable; + int sku_cap_mimo_disable; uint8_t radio_cfg_type; uint8_t radio_cfg_step;