From nobody Fri Aug 29 13:18:55 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 4cCzPD0krRz65Vyv; Fri, 29 Aug 2025 13:18:56 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCzPC69hfz3V7Y; Fri, 29 Aug 2025 13:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756473535; 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=9rmbZ1lCY3g4HPPl+kJ1vq3ZkoEMVpfGeT4dkx7+ZKk=; b=p1427GZyYJjc0w+YH6KrM19Tcbl8P0405OkllyEga+9hEwqn7szRM3GItwBn8wwX91PBjV I7HmOD6bqS7CRyVxZ4mWkmnguLnz7KeyGn/qYvXV0gQ3uZZAfrz9lqh80BCf53oXI3EKv8 Z3dbzo3PwO4rCxzRRVNKoPJ/Jwfp6fy29hgTc7NVyz7L69nmLw7tfjJ+jBHzhNg7JXG66E 9rzrNiArcMa0AfULYB5fTeNj0w6uzUSmb8tpokw53HwmA0hbCmw72ClkKXg3tl6dAN/Fc+ z6HNMKbtO4me7iV//SD/cUCnLZsotz2iRiKVW7RMQ+fyEWWucPdX1KDnzF9SfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756473535; 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=9rmbZ1lCY3g4HPPl+kJ1vq3ZkoEMVpfGeT4dkx7+ZKk=; b=ntkr+pIeg5tRwZzqFYfzjCD1FkHCCV+j6IZcKMJaHQH3IN9Jo8UmXBvAoVVl7zPfNYUwD7 PZcWAZrerivGBnA5eWWtcLLk4heKR5wON89F6iaAFgazZ1RxAgh/oUwO4gpWEdClXQ4xf8 OPxi7Y8P3YXmnURSiZ5yxNTAZpNFcNg7qm0ga0YtwK01fluQ021K/5C/uqwOYqhuRTBCMx pmEQtVgnjv+jciGq68q7tmxmnLqFVwUuZA7BORvEyXZaMUnmP33PeWDVommv8fUyAURuaS dD2e2kGtlIhZCnGiVBujqVVgqIlbiFjf/OECsZH807y4tE0Z6GfzTFlG2jcVCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756473535; a=rsa-sha256; cv=none; b=pY2Lf8/BbOLjH9VgUvd23xcKieMUOnBhxMP/chOx9QB5cH25ejS70JDf0RdyfQvAE3uZea ezm4Ph6n7SFXLbZ5ToSe/BGj5fuAdFRhshKJ4V9W3b2lHF+/ygk8J/c/6a/eVuiWtXaK80 TJJEObwKK+whaCTArtaocqbT28j8yFtLT1Z8cp0JWKKOBdMLz7FF74Yq+0egmbmbwkcr0v DrtQDYMFLapmUKYymDdfjQEAklP8o/x7Y+4/pF+yi0ilNoZX9ZNGOBkh1Tz8ROR0yPaCkA PCNciMZWOFIyMSZ1s6BQpG9BCeZ3ejQvyDASugpDl4SNUG9+B4tD3nESiphDBA== 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 4cCzPC5lhxzhQW; Fri, 29 Aug 2025 13:18:55 +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 57TDItH7072092; Fri, 29 Aug 2025 13:18:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57TDItrp072089; Fri, 29 Aug 2025 13:18:55 GMT (envelope-from git) Date: Fri, 29 Aug 2025 13:18:55 GMT Message-Id: <202508291318.57TDItrp072089@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a99462b0c9e4 - main - rtw88: ensure channel definitions have band set 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a99462b0c9e4421d8d6b4e2f1ee9128284fced3f Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a99462b0c9e4421d8d6b4e2f1ee9128284fced3f commit a99462b0c9e4421d8d6b4e2f1ee9128284fced3f Author: Bjoern A. Zeeb AuthorDate: 2025-08-27 21:31:10 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-08-29 13:18:41 +0000 rtw88: ensure channel definitions have band set A Linux definition of a channel has freq, hw_value, band, and flags. rtw88 so far only set the first two but never set the band on the channel. This sorted out channels from scanning (at least after updates) but possibly also led to other unnoticed circumstances. Use the macros from rtw89 and replicate the information properly filling band on each channel definition as well. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/rtw88/main.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/sys/contrib/dev/rtw88/main.c b/sys/contrib/dev/rtw88/main.c index 021d076808e0..963b73f35350 100644 --- a/sys/contrib/dev/rtw88/main.c +++ b/sys/contrib/dev/rtw88/main.c @@ -57,6 +57,62 @@ module_param_named(support_vht, rtw_vht_support, bool, 0644); MODULE_PARM_DESC(support_vht, "Set to Y to enable VHT support"); #endif +#if defined(__FreeBSD__) +/* Macros based on rtw89::core.c. */ +#define RTW88_DEF_CHAN(_freq, _hw_val, _flags, _band) \ + { .center_freq = _freq, .hw_value = _hw_val, .flags = _flags, .band = _band, } +#define RTW88_DEF_CHAN_2G(_freq, _hw_val) \ + RTW88_DEF_CHAN(_freq, _hw_val, 0, NL80211_BAND_2GHZ) +#define RTW88_DEF_CHAN_5G(_freq, _hw_val) \ + RTW88_DEF_CHAN(_freq, _hw_val, 0, NL80211_BAND_5GHZ) +#define RTW88_DEF_CHAN_5G_NO_HT40MINUS(_freq, _hw_val) \ + RTW88_DEF_CHAN(_freq, _hw_val, IEEE80211_CHAN_NO_HT40MINUS, NL80211_BAND_5GHZ) + +static struct ieee80211_channel rtw_channeltable_2g[] = { + RTW88_DEF_CHAN_2G(2412, 1), + RTW88_DEF_CHAN_2G(2417, 2), + RTW88_DEF_CHAN_2G(2422, 3), + RTW88_DEF_CHAN_2G(2427, 4), + RTW88_DEF_CHAN_2G(2432, 5), + RTW88_DEF_CHAN_2G(2437, 6), + RTW88_DEF_CHAN_2G(2442, 7), + RTW88_DEF_CHAN_2G(2447, 8), + RTW88_DEF_CHAN_2G(2452, 9), + RTW88_DEF_CHAN_2G(2457, 10), + RTW88_DEF_CHAN_2G(2462, 11), + RTW88_DEF_CHAN_2G(2467, 12), + RTW88_DEF_CHAN_2G(2472, 13), + RTW88_DEF_CHAN_2G(2484, 14), +}; + +static struct ieee80211_channel rtw_channeltable_5g[] = { + RTW88_DEF_CHAN_5G(5180, 36), + RTW88_DEF_CHAN_5G(5200, 40), + RTW88_DEF_CHAN_5G(5220, 44), + RTW88_DEF_CHAN_5G(5240, 48), + RTW88_DEF_CHAN_5G(5260, 52), + RTW88_DEF_CHAN_5G(5280, 56), + RTW88_DEF_CHAN_5G(5300, 60), + RTW88_DEF_CHAN_5G(5320, 64), + RTW88_DEF_CHAN_5G(5500, 100), + RTW88_DEF_CHAN_5G(5520, 104), + RTW88_DEF_CHAN_5G(5540, 108), + RTW88_DEF_CHAN_5G(5560, 112), + RTW88_DEF_CHAN_5G(5580, 116), + RTW88_DEF_CHAN_5G(5600, 120), + RTW88_DEF_CHAN_5G(5620, 124), + RTW88_DEF_CHAN_5G(5640, 128), + RTW88_DEF_CHAN_5G(5660, 132), + RTW88_DEF_CHAN_5G(5680, 136), + RTW88_DEF_CHAN_5G(5700, 140), + RTW88_DEF_CHAN_5G(5720, 144), + RTW88_DEF_CHAN_5G(5745, 149), + RTW88_DEF_CHAN_5G(5765, 153), + RTW88_DEF_CHAN_5G(5785, 157), + RTW88_DEF_CHAN_5G(5805, 161), + RTW88_DEF_CHAN_5G_NO_HT40MINUS(5825, 165), +}; +#elif deifned(__linux__) static struct ieee80211_channel rtw_channeltable_2g[] = { {.center_freq = 2412, .hw_value = 1,}, {.center_freq = 2417, .hw_value = 2,}, @@ -102,6 +158,7 @@ static struct ieee80211_channel rtw_channeltable_5g[] = { {.center_freq = 5825, .hw_value = 165, .flags = IEEE80211_CHAN_NO_HT40MINUS}, }; +#endif static struct ieee80211_rate rtw_ratetable[] = { {.bitrate = 10, .hw_value = 0x00,},