Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp2186988pxk; Sat, 5 Sep 2020 11:43:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2mXeUwp6hNFg6jquBoDmmtFX07WPEhmDIHPwC4EeRwmPl1WnikG9mS2hpfH51TiXtaYMm X-Received: by 2002:a17:906:7856:: with SMTP id p22mr13255571ejm.262.1599331396130; Sat, 05 Sep 2020 11:43:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599331396; cv=none; d=google.com; s=arc-20160816; b=Mwoetgz8bqSsA5F8nFo9FBc+E2crCQPgc/Gi0Vm4m/jN1uKaPwVn+n00nyRYSu7QGi VUy6+Tp4d77cXiQRgu/LDVFZ/Qvbl5vP/6dCGDaVwTxX9GCG8kd/GqF7SLZEO7UxDrno Obf96abjsiWyrhk3VH9EhravcF/sqoc4mLqzogCbhOM3CRzlKKI6Ln1N1ubnmvtjDFlM yHhlMe4THqVhdkZ3xyY2ksXoYQuBKFEiBSYhfjr8Duu46fVa09yGVN9AmVkBVbM6Gmnl 3pwEK4pLC8b/LOZJH0tO2EM5Yli3FzinP7H49xV57E/XCxeZAywgwRLnWyyafkN7QXzH tPPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:message-id :user-agent:references:in-reply-to:subject:cc:to:from:date :mime-version; bh=DAHw0qtQBGjQ6yuDT1IaUm7bD4z2RWn6VeBzth7fe/8=; b=L5sb2vCb+Xwe5+geku1Bdjydi82vfnroObVB+UZTxpQTEp5zjwnEhu9DNNwMXpqYb1 z41kvQs5eFnNBA14yFzjiRNj6Yq5e8L3tL/LN9L5CCKruejOPkXbQMYHCsR867HBuE2H Y5Nce9oq3hmnIAD9dbSIPiWe39Rb5jwflNSWND7F3LAY5GPB00lZ/0ujVvIlsUN/WiUp RnRoXRQcIzXLG+TSsOY1TQRt5vOxwXz+c1tYXgXrC4cGcHGPqLbQWCn9T7jpxENrU5K5 0ZXZLpeDYtV7K0NZIBtc4fJmqcCYiI2WKhKqz0bJ5U0p2oTmaK36bUHeVwuJwnDD14ma 22CA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bu8si6275162edb.516.2020.09.05.11.42.34; Sat, 05 Sep 2020 11:43:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728563AbgIESis (ORCPT + 99 others); Sat, 5 Sep 2020 14:38:48 -0400 Received: from mail.adapt-ip.com ([173.164.178.19]:38944 "EHLO web.adapt-ip.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728393AbgIESir (ORCPT ); Sat, 5 Sep 2020 14:38:47 -0400 Received: from localhost (localhost [127.0.0.1]) by web.adapt-ip.com (Postfix) with ESMTP id A790E4F96E7; Sat, 5 Sep 2020 18:38:46 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at web.adapt-ip.com Received: from web.adapt-ip.com ([127.0.0.1]) by localhost (web.adapt-ip.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id HAwEHy1Rs-Ba; Sat, 5 Sep 2020 18:38:43 +0000 (UTC) Received: from mail.ibsgaard.io (c-73-223-60-234.hsd1.ca.comcast.net [73.223.60.234]) (Authenticated sender: thomas@adapt-ip.com) by web.adapt-ip.com (Postfix) with ESMTPSA id 6D0FD4F312A; Sat, 5 Sep 2020 18:38:43 +0000 (UTC) MIME-Version: 1.0 Date: Sat, 05 Sep 2020 11:38:42 -0700 From: Thomas Pedersen To: Johannes Berg Cc: linux-wireless Subject: Re: [PATCH v2 03/22] cfg80211: regulatory: handle S1G channels In-Reply-To: <20200831205600.21058-4-thomas@adapt-ip.com> References: <20200831205600.21058-1-thomas@adapt-ip.com> <20200831205600.21058-4-thomas@adapt-ip.com> User-Agent: Roundcube Webmail/1.4.7 Message-ID: <44089020f46d6164de74318bddc2bc9e@adapt-ip.com> X-Sender: thomas@adapt-ip.com Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On 2020-08-31 13:55, Thomas Pedersen wrote: > S1G channels have a minimum bandwidth of 1Mhz, and there > is a 1:1 mapping of allowed bandwidth to channel number. > > Signed-off-by: Thomas Pedersen > > --- > > v2: > - drop the freq_reg_info() interface changes and move the > check for S1G band inside. Fixes a driver compile > error. > - fix iterating past bws[] in __freq_reg_info() by > setting initial element to 0. > Reported-by: kernel test robot > --- > net/wireless/reg.c | 70 ++++++++++++++++++++++++++++++++++++++-------- > 1 file changed, 58 insertions(+), 12 deletions(-) > > diff --git a/net/wireless/reg.c b/net/wireless/reg.c > index 0ab7808fcec8..be6f54b70ad3 100644 > --- a/net/wireless/reg.c > +++ b/net/wireless/reg.c > @@ -1617,9 +1617,11 @@ __freq_reg_info(struct wiphy *wiphy, u32 > center_freq, u32 min_bw) > { > const struct ieee80211_regdomain *regd = reg_get_regdomain(wiphy); > const struct ieee80211_reg_rule *reg_rule = NULL; > + const u32 bws[] = {0, 1, 2, 4, 5, 8, 10, 16, 20}; > + int i = sizeof(bws) / sizeof(u32) - 1; This could be 'int i = ARRAY_SIZE(bws) - 1'. > u32 bw; > > - for (bw = MHZ_TO_KHZ(20); bw >= min_bw; bw = bw / 2) { > + for (bw = MHZ_TO_KHZ(bws[i]); bw >= min_bw; bw = > MHZ_TO_KHZ(bws[i--])) { > reg_rule = freq_reg_info_regd(center_freq, regd, bw); > if (!IS_ERR(reg_rule)) > return reg_rule; > @@ -1631,7 +1633,9 @@ __freq_reg_info(struct wiphy *wiphy, u32 > center_freq, u32 min_bw) > const struct ieee80211_reg_rule *freq_reg_info(struct wiphy *wiphy, > u32 center_freq) > { > - return __freq_reg_info(wiphy, center_freq, MHZ_TO_KHZ(20)); > + u32 min_bw = center_freq < MHZ_TO_KHZ(1000) ? 1 : 20; > + > + return __freq_reg_info(wiphy, center_freq, MHZ_TO_KHZ(min_bw)); > } > EXPORT_SYMBOL(freq_reg_info); > > @@ -1659,6 +1663,7 @@ static uint32_t reg_rule_to_chan_bw_flags(const > struct ieee80211_regdomain *regd > { > const struct ieee80211_freq_range *freq_range = NULL; > u32 max_bandwidth_khz, center_freq_khz, bw_flags = 0; > + bool is_s1g = chan->band == NL80211_BAND_S1GHZ; > > freq_range = ®_rule->freq_range; > > @@ -1678,16 +1683,57 @@ static uint32_t > reg_rule_to_chan_bw_flags(const struct ieee80211_regdomain *regd > MHZ_TO_KHZ(20))) > bw_flags |= IEEE80211_CHAN_NO_20MHZ; > > - if (max_bandwidth_khz < MHZ_TO_KHZ(10)) > - bw_flags |= IEEE80211_CHAN_NO_10MHZ; > - if (max_bandwidth_khz < MHZ_TO_KHZ(20)) > - bw_flags |= IEEE80211_CHAN_NO_20MHZ; > - if (max_bandwidth_khz < MHZ_TO_KHZ(40)) > - bw_flags |= IEEE80211_CHAN_NO_HT40; > - if (max_bandwidth_khz < MHZ_TO_KHZ(80)) > - bw_flags |= IEEE80211_CHAN_NO_80MHZ; > - if (max_bandwidth_khz < MHZ_TO_KHZ(160)) > - bw_flags |= IEEE80211_CHAN_NO_160MHZ; > + if (is_s1g) { > + /* S1G is strict about non overlapping channels. We can > + * calculate which bandwidth is allowed per channel by finding > + * the largest bandwidth which cleanly divides the freq_range. > + */ > + int edge_offset; > + int ch_bw = max_bandwidth_khz; > + > + while (ch_bw) { > + edge_offset = (center_freq_khz - ch_bw / 2) - > + freq_range->start_freq_khz; > + if (edge_offset % ch_bw == 0) { > + switch (KHZ_TO_MHZ(ch_bw)) { > + case 1: > + bw_flags |= IEEE80211_CHAN_1MHZ; > + break; > + case 2: > + bw_flags |= IEEE80211_CHAN_2MHZ; > + break; > + case 4: > + bw_flags |= IEEE80211_CHAN_4MHZ; > + break; > + case 8: > + bw_flags |= IEEE80211_CHAN_8MHZ; > + break; > + case 16: > + bw_flags |= IEEE80211_CHAN_16MHZ; > + break; > + default: > + /* If we got here, no bandwidths fit on > + * this frequency, ie. band edge. > + */ > + bw_flags |= IEEE80211_CHAN_DISABLED; > + break; > + } > + break; > + } > + ch_bw /= 2; > + } > + } else { > + if (max_bandwidth_khz < MHZ_TO_KHZ(10)) > + bw_flags |= IEEE80211_CHAN_NO_10MHZ; > + if (max_bandwidth_khz < MHZ_TO_KHZ(20)) > + bw_flags |= IEEE80211_CHAN_NO_20MHZ; > + if (max_bandwidth_khz < MHZ_TO_KHZ(40)) > + bw_flags |= IEEE80211_CHAN_NO_HT40; > + if (max_bandwidth_khz < MHZ_TO_KHZ(80)) > + bw_flags |= IEEE80211_CHAN_NO_80MHZ; > + if (max_bandwidth_khz < MHZ_TO_KHZ(160)) > + bw_flags |= IEEE80211_CHAN_NO_160MHZ; > + } > return bw_flags; > } -- thomas