From nobody Wed Feb 26 19:31:49 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 4Z34NP6m3Qz5nksY; Wed, 26 Feb 2025 19:31:49 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z34NP3lw0z3dhw; Wed, 26 Feb 2025 19:31:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740598309; 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=9R9VtWgfozUtTK/Cx8zjZ2c4CsakGmm62ZyWDNjmu0s=; b=bq6ZSQMt/VWd84Js4s3PL1kdw/EoT1JQrhGlqQwqGu7WGCCG2dLK8RYnVZstZv9yfm5lHX /X00feTXJo6pNPCZ+3fhDJJ3Trt55aWvDtIlRtog5IRGCtopt+ivPqtJnbOyO2VZuBvJHt nRLo6wJhymFB7z8CUAY8lJkDw8azyLu/O1yY9Qo2BH8zVKXwKIhrP1xicKQ5wYK/RQEdfl seZOhxAIJxcFtCsdnSqg2YK/keEGEMFSYEwZO7mUIuHarsI/4VgLIwP2e1eqlHL2xuHXDK aFImv/ii2SNl06FnNRgWD+J8T5MhBW57/UjbEYvIcRLBOZZ+OyKIBpERlRSDNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740598309; a=rsa-sha256; cv=none; b=FrvDl4EWifzer10L4a0ahxcc/RTAmo5NOxqcXYAvPteMJIWRxwOlJISQPov8XvuQhcFNeQ IQ69v6i9DU//b9xTjErwFwUitTKa+g3OCPVFyMIsCACWKafYUfswKeWmEvDa1qUUYz7GET WsikrbIYOhlFneeIytG/8hFrTAityeCnxsDaPZf2cszVE5Iq2hp1w6Faqr9J6Wc35CLSb4 pv8hqf1Xce1Y5wYFK9ACuBUcAQ3oRo4jDGmehrifL9287k9CgI5P/EV6otuSipyceqENeR YrOS+ilU2IfYbwuok0EkAWZGO56ioVWsav/8M18tZ+McPHN6a+SG0G9CX9lCgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740598309; 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=9R9VtWgfozUtTK/Cx8zjZ2c4CsakGmm62ZyWDNjmu0s=; b=oSEJGUIRo/I7DZHE9M01DE9RlypvTKQPH+g+AcEn1eo3wl8u9g3/L/xdfatKGaiQGDHjWD YDX9YJitwyVjq4WvhhobdgsGRKEIuXcagJGkcpPsbjSwJvMtk74oen8XhRimQKZtyWdsRa hpnF1AURCdsRvMSwg4LVr8oaAxlAmnNa6doXXiPaWNvvxUsKEmlaVfNOQZoXCeakL3N2BF E9Y1I2HxOHF++Izvtl6UsGQDmjBr/MwF+nrUIWph6rADNGOMjLcn0gBtc0sm8odsjYDDcE aZIYrN0MlC9cOaentb/wSt3CgjxLEmZTk/RP7vK1m5RoEuaQeEbYTYvqyncIjw== 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 4Z34NP3CFbz1PTy; Wed, 26 Feb 2025 19:31:49 +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 51QJVnWs018888; Wed, 26 Feb 2025 19:31:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51QJVnfr018885; Wed, 26 Feb 2025 19:31:49 GMT (envelope-from git) Date: Wed, 26 Feb 2025 19:31:49 GMT Message-Id: <202502261931.51QJVnfr018885@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: ff0e22f88d04 - main - net80211: add ieee80211_phy_vht_get_mcs_kbit() 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: ff0e22f88d041da2a146d70140a535c57b40c16d Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=ff0e22f88d041da2a146d70140a535c57b40c16d commit ff0e22f88d041da2a146d70140a535c57b40c16d Author: Adrian Chadd AuthorDate: 2025-01-15 05:09:27 +0000 Commit: Adrian Chadd CommitDate: 2025-02-26 19:31:25 +0000 net80211: add ieee80211_phy_vht_get_mcs_kbit() Add ieee80211_phy_vht_get_mcs_kbit(), which calculates the VHT rate in kbit/sec. Differential Revision: https://reviews.freebsd.org/D48612 --- sys/net80211/ieee80211_phy.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ sys/net80211/ieee80211_phy.h | 2 ++ 2 files changed, 87 insertions(+) diff --git a/sys/net80211/ieee80211_phy.c b/sys/net80211/ieee80211_phy.c index 9c2b1197564a..eb96d74a2bd9 100644 --- a/sys/net80211/ieee80211_phy.c +++ b/sys/net80211/ieee80211_phy.c @@ -707,3 +707,88 @@ ieee80211_phy_vht_validate_mcs(enum ieee80211_sta_rx_bw bw, uint8_t nss, return ((mask & (1 << mcs)) != 0); } + +struct mcs_entry { + int n_sym; /* Number of bits per symbol */ + int cod_n; /* Coding rate numerator */ + int cod_d; /* Coding rate denominator */ +}; + +/* + * These parameters are taken from 802.11-2020 Table 21-29 + * (VHT-MCSs for Mandatory 20 MHZ, Nss=1). + * + * n_sym corresponds to "Nbpscs", cod_n/cod_d corresponds to + * "R". + */ +static struct mcs_entry mcs_entries[] = { + { 1, 1, 2 }, /* MCS0 */ + { 2, 1, 2 }, + { 2, 3, 4 }, + { 4, 1, 2 }, + { 4, 3, 4 }, + { 6, 2, 3 }, + { 6, 3, 4 }, + { 6, 5, 6 }, + { 8, 3, 4 }, + { 8, 5, 6 }, /* MCS9 */ +}; + +/** + * @brief Calculate the bitrate of the given VHT MCS rate. + * + * @param bw Channel bandwidth (enum ieee80211_sta_rx_bw) + * @param nss Number of spatial streams, 1..8 + * @param mcs MCS, 0..9 + * @param is_shortgi True if short guard-interval (400nS) + * false otherwise (800nS) + * + * @returns The bitrate in kbit/sec. + */ +uint32_t +ieee80211_phy_vht_get_mcs_kbit(enum ieee80211_sta_rx_bw bw, + uint8_t nss, uint8_t mcs, bool is_shortgi) +{ + uint32_t sym_len, n_carriers; + + /* Validate MCS 0..9, NSS 1..8 */ + if (mcs > 9) + return (0); + if (nss == 0 || nss > 8) + return (0); + + /* + * Short-GI - 3.6uS symbol time, long-GI - 4.0uS symbol time + * + * See 802.11-2020 Table 21-5 (Timing-related constraints.) + */ + if (is_shortgi) + sym_len = 36; + else + sym_len = 40; + + /* + * Calculate the number of carriers for the given channel bandwidth + * + * See 802.11-2020 Table 21-5 (Timing-related constraints.) + */ + switch (bw) { + case IEEE80211_STA_RX_BW_20: + n_carriers = 52; + break; + case IEEE80211_STA_RX_BW_40: + n_carriers = 108; + break; + case IEEE80211_STA_RX_BW_80: + n_carriers = 234; + break; + case IEEE80211_STA_RX_BW_160: + n_carriers = 468; + break; + default: + return (0); + } + + return ((n_carriers * mcs_entries[mcs].n_sym * mcs_entries[mcs].cod_n * + nss * 10000) / (mcs_entries[mcs].cod_d * sym_len)); +} diff --git a/sys/net80211/ieee80211_phy.h b/sys/net80211/ieee80211_phy.h index 466f59584f2c..749b082e34e9 100644 --- a/sys/net80211/ieee80211_phy.h +++ b/sys/net80211/ieee80211_phy.h @@ -227,6 +227,8 @@ uint16_t ieee80211_phy_vht_get_mcs_mask(enum ieee80211_sta_rx_bw, uint8_t); bool ieee80211_phy_vht_validate_mcs(enum ieee80211_sta_rx_bw, uint8_t, uint8_t); +uint32_t ieee80211_phy_vht_get_mcs_kbit(enum ieee80211_sta_rx_bw, + uint8_t, uint8_t, bool); #endif /* _KERNEL */ #endif /* !_NET80211_IEEE80211_PHY_H_ */