From patchwork Mon Nov 6 07:33:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-CY Lee X-Patchwork-Id: 742201 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB14DC4167B for ; Mon, 6 Nov 2023 07:33:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230321AbjKFHdf (ORCPT ); Mon, 6 Nov 2023 02:33:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229881AbjKFHde (ORCPT ); Mon, 6 Nov 2023 02:33:34 -0500 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1718093 for ; Sun, 5 Nov 2023 23:33:24 -0800 (PST) X-UUID: c222e80e7c7611ee8051498923ad61e6-20231106 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=sEgSEnQbFXgxG6NeOQ04GanNJBjCDl7IpccGy+iMAlw=; b=EOX72Ly7Z8SX0UigHCb7fNhBKhV991/F04LFzu+WxDMaliyXkPZ9E82Hr36s8Ic+beQafVoie21qqIxWbsLP3vZFnI6zh8oAwy88JSJ5XXpxqsBZvRm6eL4KMvz+t/wnMQQ7L1OaBfFRZg1UMdAbnq/oWL+RAYSW8L5fkwAWWS4=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.33, REQID:d15f5c0f-2efa-438e-ae8a-a423beff73ee, IP:0, U RL:0,TC:0,Content:28,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:28 X-CID-META: VersionHash:364b77b, CLOUDID:edebb95f-c89d-4129-91cb-8ebfae4653fc, B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:4,EDM:-3,IP:nil,U RL:11|1,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR: NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_ULN X-UUID: c222e80e7c7611ee8051498923ad61e6-20231106 Received: from mtkmbs14n2.mediatek.inc [(172.21.101.76)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1369643972; Mon, 06 Nov 2023 15:33:20 +0800 Received: from mtkmbs11n1.mediatek.inc (172.21.101.185) by MTKMBS14N1.mediatek.inc (172.21.101.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Mon, 6 Nov 2023 15:33:16 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Mon, 6 Nov 2023 15:33:16 +0800 From: Michael-CY Lee To: linux-wireless CC: Johannes Berg , Felix Fietkau , Lorenzo Bianconi , Evelyn Tsai , Money Wang , linux-mediatek , Michael-CY Lee Subject: [PATCH 1/2] wifi: mac80211: Add utilities for converting op_class Date: Mon, 6 Nov 2023 15:33:00 +0800 Message-ID: <20231106073301.7351-1-michael-cy.lee@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-AS-Result: No-10--2.734600-8.000000 X-TMASE-MatchedRID: eRTSjinPTx/LmQtq4MlK+Y3NgkEqAN0Rdp9Xbh4iYgemg3jaUxa3Xm7H Y6NYk3sysRIB98XGTDmkeU7arquyzm94Ipa1otxo0Xw0ILvo/uUK3n1SHen81Wd6vNuG6Cqyd08 /L3uZvStYCJ44nEJdXtzwcvqyVpsQ98hoZRVgb5UxKOWR6zQpr7yfV74eQpk+myiLZetSf8mfop 0ytGwvXiq2rl3dzGQ1GpeevGsoI5dBAEXSY1UI/iMsdLUlYLDS+iTL84G/4otWuHo0DYuXYodN4 vE6BmvAX6lC/7CWuLjRL+K7ck5di/l6T6YtYwawQkjxHSeqDeEXRoPmWO3jekxwdkPqCq7vDEyN +J8hd+jCS9WgDXVPCn7cGd19dSFd X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--2.734600-8.000000 X-TMASE-Version: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-SNTS-SMTP: 4F19A249D6128A7C53E8164A4BC0866B8BEDCC4B55ADC3827A215E8E8EA2E2372000:8 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org These utilities include converting op_class to nl80211 channel width and center frequency. Signed-off-by: Michael-CY Lee Signed-off-by: Money Wang --- include/net/cfg80211.h | 25 ++++++++ net/wireless/util.c | 127 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index b137a33a1b68..a226d1cae7f7 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -8669,6 +8669,31 @@ void cfg80211_ch_switch_started_notify(struct net_device *dev, bool ieee80211_operating_class_to_band(u8 operating_class, enum nl80211_band *band); +/** + * ieee80211_operating_class_to_center_freq - convert operating class to + * center frequency + * + * @operating_class: the operating class to convert + * @chan: the ieee80211_channel to convert + * @center_freq1: cneter frequency 1 pointer to fill + * @center_freq2: cneter frequency 2 pointer to fill + * + * Returns %true if the conversion was successful, %false otherwise. + */ +bool ieee80211_operating_class_to_center_freq(u8 operating_class, + struct ieee80211_channel *chan, + u32 *center_freq1, + u32 *center_freq2); + +/** + * ieee80211_operating_class_to_chan_width - convert operating class to + * nl80211 channel width + * + * @operating_class: the operating class to convert + */ +enum nl80211_chan_width +ieee80211_operating_class_to_chan_width(u8 operating_class); + /** * ieee80211_chandef_to_operating_class - convert chandef to operation class * diff --git a/net/wireless/util.c b/net/wireless/util.c index 626b858b4b35..08a62dd5a855 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -2017,6 +2017,133 @@ bool ieee80211_operating_class_to_band(u8 operating_class, } EXPORT_SYMBOL(ieee80211_operating_class_to_band); +bool ieee80211_operating_class_to_center_freq(u8 operating_class, + struct ieee80211_channel *chan, + u32 *center_freq1, + u32 *center_freq2) +{ + u32 control_freq, offset; + enum nl80211_band band; + + control_freq = chan->center_freq; + if (!ieee80211_operating_class_to_band(operating_class, &band)) + return false; + + if (band != chan->band) + return false; + + if (control_freq >= 5955) + offset = control_freq - 5955; + else if (control_freq >= 5745) + offset = control_freq - 5745; + else if (control_freq >= 5180) + offset = control_freq - 5180; + offset /= 20; + + *center_freq2 = 0; + switch (operating_class) { + case 81: /* 2 GHz band; 20 MHz; channels 1..13 */ + case 82: /* 2 GHz band; 20 MHz; channel 14 */ + case 115: /* 5 GHz band; 20 MHz; channels 36,40,44,48 */ + case 118: /* 5 GHz band; 20 MHz; channels 52,56,60,64 */ + case 121: /* 5 GHz band; 20 MHz; channels 100..144 */ + case 124: /* 5 GHz band; 20 MHz; channels 149,153,157,161 */ + case 125: /* 5 GHz band; 20 MHz; channels 149..177 */ + case 131: /* 6 GHz band; 20 MHz; channels 1..233*/ + case 136: /* 6 GHz band; 20 MHz; channel 2 */ + *center_freq1 = control_freq; + return true; + case 83: /* 2 GHz band; 40 MHz; channels 1..9 */ + case 116: /* 5 GHz band; 40 MHz; channels 36,44 */ + case 119: /* 5 GHz band; 40 MHz; channels 52,60 */ + case 122: /* 5 GHz band; 40 MHz; channels 100,108,116,124,132,140 */ + case 126: /* 5 GHz band; 40 MHz; channels 149,157,165,173 */ + *center_freq1 = control_freq + 10; + return true; + case 84: /* 2 GHz band; 40 MHz; channels 5..13 */ + case 117: /* 5 GHz band; 40 MHz; channels 40,48 */ + case 120: /* 5 GHz band; 40 MHz; channels 56,64 */ + case 123: /* 5 GHz band; 40 MHz; channels 104,112,120,128,136,144 */ + case 127: /* 5 GHz band; 40 MHz; channels 153,161,169,177 */ + *center_freq1 = control_freq - 10; + return true; + case 132: /* 6 GHz band; 40 MHz; channels 1,5,..,229*/ + *center_freq1 = control_freq + 10 - (offset & 1) * 20; + return true; + case 128: /* 5 GHz band; 80 MHz; channels 36..64,100..144,149..177 */ + *center_freq1 = control_freq + 30 - (offset & 3) * 20; + return true; + case 130: /* 5 GHz band; 80+80 MHz; channels 36..64,100..144,149..177 */ + /* TODO How to know the center_freq2 of 80+80 MHz?*/ + *center_freq1 = 0; + return false; + case 133: /* 6 GHz band; 80 MHz; channels 1,5,..,229 */ + *center_freq1 = control_freq + 30 - (offset & 3) * 20; + return true; + case 129: /* 5 GHz band; 160 MHz; channels 36..64,100..144,149..177 */ + *center_freq1 = control_freq + 70 - (offset & 7) * 20; + return true; + case 134: /* 6 GHz band; 160 MHz; channels 1,5,..,229 */ + *center_freq1 = control_freq + 70 - (offset & 7) * 20; + return true; + case 135: /* 6 GHz band; 80+80 MHz; channels 1,5,..,229 */ + /* TODO How to know the center_freq2 of 80+80 MHz?*/ + *center_freq1 = 0; + return false; + case 137: /* 6 GHz band; 320 MHz; channels 1,5,..,229 */ + /* TODO it's 320 MHz-1 or 320 MHz-2 channelization? */ + *center_freq1 = 0; + return false; + default: + return false; + } +} +EXPORT_SYMBOL(ieee80211_operating_class_to_center_freq); + +enum nl80211_chan_width +ieee80211_operating_class_to_chan_width(u8 operating_class) +{ + switch (operating_class) { + case 81: /* 2 GHz band; 20 MHz; channels 1..13 */ + case 82: /* 2 GHz band; 20 MHz; channel 14 */ + case 115: /* 5 GHz band; 20 MHz; channels 36,40,44,48 */ + case 118: /* 5 GHz band; 20 MHz; channels 52,56,60,64 */ + case 121: /* 5 GHz band; 20 MHz; channels 100..144 */ + case 124: /* 5 GHz band; 20 MHz; channels 149,153,157,161 */ + case 125: /* 5 GHz band; 20 MHz; channels 149..177 */ + case 131: /* 6 GHz band; 20 MHz; channels 1..233*/ + case 136: /* 6 GHz band; 20 MHz; channel 2 */ + return NL80211_CHAN_WIDTH_20; + case 83: /* 2 GHz band; 40 MHz; channels 1..9 */ + case 84: /* 2 GHz band; 40 MHz; channels 5..13 */ + case 116: /* 5 GHz band; 40 MHz; channels 36,44 */ + case 117: /* 5 GHz band; 40 MHz; channels 40,48 */ + case 119: /* 5 GHz band; 40 MHz; channels 52,60 */ + case 120: /* 5 GHz band; 40 MHz; channels 56,64 */ + case 122: /* 5 GHz band; 40 MHz; channels 100,108,116,124,132,140 */ + case 123: /* 5 GHz band; 40 MHz; channels 104,112,120,128,136,144 */ + case 126: /* 5 GHz band; 40 MHz; channels 149,157,165,173 */ + case 127: /* 5 GHz band; 40 MHz; channels 153,161,169,177 */ + case 132: /* 6 GHz band; 40 MHz; channels 1,5,..,229*/ + return NL80211_CHAN_WIDTH_40; + case 128: /* 5 GHz band; 80 MHz; channels 36..64,100..144,149..177 */ + case 133: /* 6 GHz band; 80 MHz; channels 1,5,..,229 */ + return NL80211_CHAN_WIDTH_80; + case 130: /* 5 GHz band; 80+80 MHz; channels 36..64,100..144,149..177 */ + case 135: /* 6 GHz band; 80+80 MHz; channels 1,5,..,229 */ + return NL80211_CHAN_WIDTH_80P80; + case 129: /* 5 GHz band; 160 MHz; channels 36..64,100..144,149..177 */ + case 134: /* 6 GHz band; 160 MHz; channels 1,5,..,229 */ + return NL80211_CHAN_WIDTH_160; + case 137: /* 6 GHz band; 320 MHz; channels 1,5,..,229 */ + return NL80211_CHAN_WIDTH_320; + default: + WARN_ON(1); + return NL80211_CHAN_WIDTH_20_NOHT; + } +} +EXPORT_SYMBOL(ieee80211_operating_class_to_chan_width); + bool ieee80211_chandef_to_operating_class(struct cfg80211_chan_def *chandef, u8 *op_class) {