| Message ID | 20220711010816.45927-2-kieran.frewen@morsemicro.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | Additional support for 802.11ah (S1G) | expand |
On 7/10/2022 6:08 PM, Kieran Frewen wrote: > Extend the S1G regulatory information to support all regulatory > domains. An reg_s1g.h file is included containing structs with key > regulatory class information. These structs were required to ensure > the right combination of information was available to a series of > functions which support the mapping between frequencies, bandwidths, > and channels. > > Signed-off-by: Kieran Frewen <kieran.frewen@morsemicro.com> > Signed-off-by: Bassem Dawood <bassem@morsemicro.com> I would expect the S-O-B for the person posting the patches to be last. And it is not clear what is Bassem's contributionsince he's not listed as the patch author or as a Co-developed-by > --- > net/wireless/reg.c | 50 ++++++-- > net/wireless/reg_s1g.h | 281 +++++++++++++++++++++++++++++++++++++++++ > net/wireless/util.c | 31 ++++- > 3 files changed, 349 insertions(+), 13 deletions(-) > create mode 100644 net/wireless/reg_s1g.h > > diff --git a/net/wireless/reg.c b/net/wireless/reg.c > index c7383ede794f..d9ed6b619164 100644 > --- a/net/wireless/reg.c > +++ b/net/wireless/reg.c > @@ -62,6 +62,7 @@ > #include "reg.h" > #include "rdev-ops.h" > #include "nl80211.h" > +#include "reg_s1g.h" > > /* > * Grace period we give before making sure all current interfaces reside on > @@ -1737,26 +1738,44 @@ static uint32_t reg_rule_to_chan_bw_flags(const struct ieee80211_regdomain *regd > * the largest bandwidth which cleanly divides the freq_range. > */ > int edge_offset; > - int ch_bw = max_bandwidth_khz; > + int ch_bw, freq_end, freq_start, class_idx; > + unsigned int i; > + const struct s1g_oper_class *oper = reg_s1g_get_oper_class(regd->alpha2); > + > + for (i = 0; i < oper->class_count; i++) { > + if (center_freq_khz >= oper->class[i].start_freq && > + center_freq_khz <= oper->class[i].end_freq) { > + class_idx = i; > + break; > + } > + } is the for loop above *guaranteed* to find a matching class? the logic below uses class_idx without verifying that it has actually been initialized > + > + ch_bw = oper->class[class_idx].max_bw_khz; > + freq_start = oper->class[class_idx].start_freq; > + freq_end = oper->class[class_idx].end_freq; > > 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: > + if (oper->class[class_idx].align_to_end) > + edge_offset = freq_end - > + (center_freq_khz - (ch_bw) / 2); > + else > + edge_offset = (center_freq_khz - (ch_bw) / 2) - > + freq_start; > + if (edge_offset % (ch_bw) == 0) { > + switch (ch_bw) { > + case MHZ_TO_KHZ(1): > bw_flags |= IEEE80211_CHAN_1MHZ; > break; > - case 2: > + case MHZ_TO_KHZ(2): > bw_flags |= IEEE80211_CHAN_2MHZ; > break; > - case 4: > + case MHZ_TO_KHZ(4): > bw_flags |= IEEE80211_CHAN_4MHZ; > break; > - case 8: > + case MHZ_TO_KHZ(8): > bw_flags |= IEEE80211_CHAN_8MHZ; > break; > - case 16: > + case MHZ_TO_KHZ(16): > bw_flags |= IEEE80211_CHAN_16MHZ; > break; > default: > @@ -2555,9 +2574,16 @@ static void handle_channel_custom(struct wiphy *wiphy, > const struct ieee80211_reg_rule *reg_rule = NULL; > const struct ieee80211_power_rule *power_rule = NULL; > u32 bw, center_freq_khz; > + bool is_s1g = chan->band == NL80211_BAND_S1GHZ; > > - center_freq_khz = ieee80211_channel_to_khz(chan); > - for (bw = MHZ_TO_KHZ(20); bw >= min_bw; bw = bw / 2) { > + if (is_s1g) { > + bw = MHZ_TO_KHZ(16); > + min_bw = MHZ_TO_KHZ(1); > + } else { > + bw = MHZ_TO_KHZ(20); > + } > + > + for (; bw >= min_bw; bw = bw / 2) { > reg_rule = freq_reg_info_regd(center_freq_khz, regd, bw); > if (!IS_ERR(reg_rule)) > break; > diff --git a/net/wireless/reg_s1g.h b/net/wireless/reg_s1g.h > new file mode 100644 > index 000000000000..69dd4e2cd4d3 > --- /dev/null > +++ b/net/wireless/reg_s1g.h > @@ -0,0 +1,281 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +#ifndef __NET_WIRELESS_REG_S1G_H > +#define __NET_WIRELESS_REG_S1G_H > + > +#include "reg.h" > + > +/** > + * Struct cca_class > + * > + * The specifics of a cca level classification used to validate bw/frequency > + * combinations in a regulatory domain > + * @band_start: The channel starting frequency for that CCA classification would be nice to given units for frequency > + * @start_freq: The start of the valid frequency range for the CCA > + * classification > + * @end_freq: The end of the valid frequency range for the CCA classification > + * @max_bw_khz: The maximum valid bw for the CCA classification > + * @align_to_end: True if the maximum valid BW for the range is aligned to the > + * end_freq > + * @supported_chan: A list of supported channel indexes > + * @n_supported_chan: A count of the supported channels for this CCA > + * classification > + */ > +struct s1g_cca_classification { > + u32 band_start; > + u32 start_freq; > + u32 end_freq; > + u32 max_bw_khz; > + u8 align_to_end; bool? > + const u8 *supported_chan; > + u8 n_supported_chan; > +}; > + > + > +/** > + > + * Struct s1g_oper_class > + * > + * An aggregated view of the operating classes for a single regulatory > + * domain > + * @cc: country code based upon usage suggest you clarify this is a 2-character code > + * @class_count: The number of CCA level classifications that exist > + * within that country > + * @class: The specifics of a CCA level classification within a regulatory > + * domain. > + */ > +struct s1g_oper_class { > + char *cc; why a pointer and not an array (a cc[3] array padded to 4 bytes would consume less space than a pointer on 64-bit architecture) > + int class_count; > + struct s1g_cca_classification class[]; > +}; > + i'm surprise the rest of the patch for this file isn't in a .c file. won't the contents below be replicated into every compilation unit that includes this header file? > +/* The following channel lists have been retrieved from > + * IEEE Std 802.11-2020 Table E-5 > + */ > +static const u8 us_supported_channels[] = { > + 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, > + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, > + 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, > + 34, 35, 37, 38, 39, 40, 41, 42, 43, 44, > + 45, 46, 47, 48, 49, 50, 51 > +}; > + > +static const u8 eu_supported_channels_863[] = { > + 1, 3, 5, 7, 9 > +}; > + > +static const u8 eu_supported_channels_901_4[] = { > + 33, 35 > +}; > + > +static const u8 jp_supported_channels[] = { > + 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21 > +}; > + > +static const u8 kr_supported_channels[] = { > + 1, 2, 3, 5, 6, 7, 8, 9, 10, 11 > +}; > + > +static const u8 sg_supported_channels_863[] = { > + 7, 9, 10, 11 > +}; > + > +static const u8 sg_supported_channels_902[] = { > + 37, 38, 39, 40, 41, 42, 43, 45 > +}; > + > +static const u8 au_nz_supported_channels[] = { > + 27, 29, 30, 31, 32, 33, 34, 35, 37, 38, 39, > + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, > + 51 > +}; > + > + > +/* The following s1g_oper_class structs are taken from > + * IEEE Std 802.11-2020 Table E-5 > + */ > +static const struct s1g_oper_class country_class_au = { > + .cc = "AU", > + .class_count = 2, > + .class = { > + { > + .band_start = 902000, > + .start_freq = 915000, > + .end_freq = 920000, > + .max_bw_khz = MHZ_TO_KHZ(4), > + .align_to_end = 0, > + .supported_chan = au_nz_supported_channels, > + .n_supported_chan = sizeof(au_nz_supported_channels), > + }, > + { > + .band_start = 902000, > + .start_freq = 920000, > + .end_freq = 928000, > + .max_bw_khz = MHZ_TO_KHZ(8), > + .align_to_end = 1, > + .supported_chan = NULL, > + .n_supported_chan = 0, > + } > + }, > +}; > + > +static const struct s1g_oper_class country_class_nz = { > + .cc = "NZ", > + .class_count = 2, > + .class = { > + { > + .band_start = 902000, > + .start_freq = 915000, > + .end_freq = 924000, > + .max_bw_khz = MHZ_TO_KHZ(8), > + .align_to_end = 0, > + .supported_chan = au_nz_supported_channels, > + .n_supported_chan = sizeof(au_nz_supported_channels), > + }, > + { > + .band_start = 902000, > + .start_freq = 924000, > + .end_freq = 928000, > + .max_bw_khz = MHZ_TO_KHZ(8), > + .align_to_end = 0, > + .supported_chan = NULL, > + .n_supported_chan = 0, > + } > + }, > +}; > + > +static const struct s1g_oper_class country_class_us = { > + .cc = "US", > + .class_count = 3, > + .class = { > + { > + .band_start = 902000, > + .start_freq = 902000, > + .end_freq = 904000, > + .max_bw_khz = MHZ_TO_KHZ(16), > + .align_to_end = 0, > + .supported_chan = us_supported_channels, > + .n_supported_chan = sizeof(us_supported_channels), > + }, > + { > + .band_start = 902000, > + .start_freq = 920000, > + .end_freq = 928000, > + .max_bw_khz = MHZ_TO_KHZ(16), > + .align_to_end = 0, > + .supported_chan = NULL, > + .n_supported_chan = 0, > + }, > + { > + .band_start = 902000, > + .start_freq = 904000, > + .end_freq = 920000, > + .max_bw_khz = MHZ_TO_KHZ(16), > + .align_to_end = 0, > + .supported_chan = NULL, > + .n_supported_chan = 0, > + } > + }, > +}; > + > +static const struct s1g_oper_class country_class_sg = { > + .cc = "SG", > + .class_count = 2, > + .class = { > + { > + .band_start = 863000, > + .start_freq = 866000, > + .end_freq = 869000, > + .max_bw_khz = MHZ_TO_KHZ(2), > + .align_to_end = 1, > + .supported_chan = sg_supported_channels_863, > + .n_supported_chan = sizeof(sg_supported_channels_863), > + }, > + { > + .band_start = 902000, > + .start_freq = 920000, > + .end_freq = 925000, > + .max_bw_khz = MHZ_TO_KHZ(4), > + .align_to_end = 0, > + .supported_chan = sg_supported_channels_902, > + .n_supported_chan = sizeof(sg_supported_channels_902), > + }, > + }, > +}; > + > +static const struct s1g_oper_class country_class_kr = { > + .cc = "KR", > + .class_count = 1, > + .class = { > + { > + .band_start = 917500, > + .start_freq = 917500, > + .end_freq = 923500, > + .max_bw_khz = MHZ_TO_KHZ(4), > + .align_to_end = 1, > + .supported_chan = kr_supported_channels, > + .n_supported_chan = sizeof(kr_supported_channels), > + } > + }, > +}; > + > +static const struct s1g_oper_class country_class_eu = { > + .cc = "EU", > + .class_count = 1, > + .class = { > + { > + .band_start = 863000, > + .start_freq = 863000, > + .end_freq = 868000, > + .max_bw_khz = MHZ_TO_KHZ(1), > + .align_to_end = 0, > + .supported_chan = eu_supported_channels_863, > + .n_supported_chan = sizeof(eu_supported_channels_863), > + }, > + { > + .band_start = 901400, > + .start_freq = 917400, > + .end_freq = 919400, > + .max_bw_khz = MHZ_TO_KHZ(1), > + .align_to_end = 0, > + .supported_chan = eu_supported_channels_901_4, > + .n_supported_chan = sizeof(eu_supported_channels_901_4), > + } > + }, > +}; > + > +static const struct s1g_oper_class country_class_jp = { > + .cc = "JP", > + .class_count = 1, > + .class = { > + { > + .band_start = 916500, > + .start_freq = 916500, > + .end_freq = 927500, > + .max_bw_khz = MHZ_TO_KHZ(1), > + .supported_chan = jp_supported_channels, > + .n_supported_chan = sizeof(jp_supported_channels), > + } > + }, > +}; > + > +static const struct s1g_oper_class *reg_s1g_get_oper_class(const char *cc) > +{ > + if (!strcmp(cc, "EU")) > + return &country_class_eu; > + if (!strcmp(cc, "SG")) > + return &country_class_sg; > + if (!strcmp(cc, "US")) > + return &country_class_us; > + if (!strcmp(cc, "AU")) > + return &country_class_au; > + if (!strcmp(cc, "KR")) > + return &country_class_kr; > + if (!strcmp(cc, "JP")) > + return &country_class_jp; > + if (!strcmp(cc, "NZ")) > + return &country_class_nz; > + return &country_class_us; > +} > + > +#endif /*__NET_WIRELESS_REG_S1G_H */ > diff --git a/net/wireless/util.c b/net/wireless/util.c > index b7257862e0fe..412403d29c22 100644 > --- a/net/wireless/util.c > +++ b/net/wireless/util.c > @@ -22,6 +22,7 @@ > #include <linux/nospec.h> > #include "core.h" > #include "rdev-ops.h" > +#include "reg_s1g.h" > > > const struct ieee80211_rate * > @@ -72,6 +73,23 @@ u32 ieee80211_mandatory_rates(struct ieee80211_supported_band *sband, > } > EXPORT_SYMBOL(ieee80211_mandatory_rates); > > +static u32 ieee80211_s1g_base_freq(int chan) > +{ > + const struct ieee80211_regdomain *regd = rtnl_dereference(cfg80211_regdomain); > + const struct s1g_oper_class *oper = reg_s1g_get_oper_class(regd->alpha2); > + u8 i, j, index = 0; > + > + if (oper->class_count > 1) > + for (i = 0; i < oper->class_count; i++) > + for (j = 0; j < oper->class[i].n_supported_chan; j++) > + if (oper->class[i].supported_chan[j] == chan) { > + index = i; > + goto out; > + } > +out: > + return oper->class[index].band_start; > +} > + > u32 ieee80211_channel_to_freq_khz(int chan, enum nl80211_band band) > { > /* see 802.11 17.3.8.3.2 and Annex J > @@ -104,7 +122,7 @@ u32 ieee80211_channel_to_freq_khz(int chan, enum nl80211_band band) > return MHZ_TO_KHZ(56160 + chan * 2160); > break; > case NL80211_BAND_S1GHZ: > - return 902000 + chan * 500; > + return ieee80211_s1g_base_freq(chan) + chan * 500; > default: > ; > } > @@ -112,6 +130,17 @@ u32 ieee80211_channel_to_freq_khz(int chan, enum nl80211_band band) > } > EXPORT_SYMBOL(ieee80211_channel_to_freq_khz); > > +u32 ieee80211_s1g_channel_to_freq_khz(int chan) > +{ > + u32 base = ieee80211_s1g_base_freq(chan); > + > + if (!base) how can this be 0 since ieee80211_s1g_base_freq() always returns oper->class[index].band_start and none of the entries has 0 as a band_start? > + return 0; > + > + return (base + chan * 500); > +} > +EXPORT_SYMBOL(ieee80211_s1g_channel_to_freq_khz); > + > enum nl80211_chan_width > ieee80211_s1g_channel_width(const struct ieee80211_channel *chan) > {
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index c7383ede794f..d9ed6b619164 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -62,6 +62,7 @@ #include "reg.h" #include "rdev-ops.h" #include "nl80211.h" +#include "reg_s1g.h" /* * Grace period we give before making sure all current interfaces reside on @@ -1737,26 +1738,44 @@ static uint32_t reg_rule_to_chan_bw_flags(const struct ieee80211_regdomain *regd * the largest bandwidth which cleanly divides the freq_range. */ int edge_offset; - int ch_bw = max_bandwidth_khz; + int ch_bw, freq_end, freq_start, class_idx; + unsigned int i; + const struct s1g_oper_class *oper = reg_s1g_get_oper_class(regd->alpha2); + + for (i = 0; i < oper->class_count; i++) { + if (center_freq_khz >= oper->class[i].start_freq && + center_freq_khz <= oper->class[i].end_freq) { + class_idx = i; + break; + } + } + + ch_bw = oper->class[class_idx].max_bw_khz; + freq_start = oper->class[class_idx].start_freq; + freq_end = oper->class[class_idx].end_freq; 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: + if (oper->class[class_idx].align_to_end) + edge_offset = freq_end - + (center_freq_khz - (ch_bw) / 2); + else + edge_offset = (center_freq_khz - (ch_bw) / 2) - + freq_start; + if (edge_offset % (ch_bw) == 0) { + switch (ch_bw) { + case MHZ_TO_KHZ(1): bw_flags |= IEEE80211_CHAN_1MHZ; break; - case 2: + case MHZ_TO_KHZ(2): bw_flags |= IEEE80211_CHAN_2MHZ; break; - case 4: + case MHZ_TO_KHZ(4): bw_flags |= IEEE80211_CHAN_4MHZ; break; - case 8: + case MHZ_TO_KHZ(8): bw_flags |= IEEE80211_CHAN_8MHZ; break; - case 16: + case MHZ_TO_KHZ(16): bw_flags |= IEEE80211_CHAN_16MHZ; break; default: @@ -2555,9 +2574,16 @@ static void handle_channel_custom(struct wiphy *wiphy, const struct ieee80211_reg_rule *reg_rule = NULL; const struct ieee80211_power_rule *power_rule = NULL; u32 bw, center_freq_khz; + bool is_s1g = chan->band == NL80211_BAND_S1GHZ; - center_freq_khz = ieee80211_channel_to_khz(chan); - for (bw = MHZ_TO_KHZ(20); bw >= min_bw; bw = bw / 2) { + if (is_s1g) { + bw = MHZ_TO_KHZ(16); + min_bw = MHZ_TO_KHZ(1); + } else { + bw = MHZ_TO_KHZ(20); + } + + for (; bw >= min_bw; bw = bw / 2) { reg_rule = freq_reg_info_regd(center_freq_khz, regd, bw); if (!IS_ERR(reg_rule)) break; diff --git a/net/wireless/reg_s1g.h b/net/wireless/reg_s1g.h new file mode 100644 index 000000000000..69dd4e2cd4d3 --- /dev/null +++ b/net/wireless/reg_s1g.h @@ -0,0 +1,281 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __NET_WIRELESS_REG_S1G_H +#define __NET_WIRELESS_REG_S1G_H + +#include "reg.h" + +/** + * Struct cca_class + * + * The specifics of a cca level classification used to validate bw/frequency + * combinations in a regulatory domain + * @band_start: The channel starting frequency for that CCA classification + * @start_freq: The start of the valid frequency range for the CCA + * classification + * @end_freq: The end of the valid frequency range for the CCA classification + * @max_bw_khz: The maximum valid bw for the CCA classification + * @align_to_end: True if the maximum valid BW for the range is aligned to the + * end_freq + * @supported_chan: A list of supported channel indexes + * @n_supported_chan: A count of the supported channels for this CCA + * classification + */ +struct s1g_cca_classification { + u32 band_start; + u32 start_freq; + u32 end_freq; + u32 max_bw_khz; + u8 align_to_end; + const u8 *supported_chan; + u8 n_supported_chan; +}; + + +/** + + * Struct s1g_oper_class + * + * An aggregated view of the operating classes for a single regulatory + * domain + * @cc: country code + * @class_count: The number of CCA level classifications that exist + * within that country + * @class: The specifics of a CCA level classification within a regulatory + * domain. + */ +struct s1g_oper_class { + char *cc; + int class_count; + struct s1g_cca_classification class[]; +}; + +/* The following channel lists have been retrieved from + * IEEE Std 802.11-2020 Table E-5 + */ +static const u8 us_supported_channels[] = { + 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51 +}; + +static const u8 eu_supported_channels_863[] = { + 1, 3, 5, 7, 9 +}; + +static const u8 eu_supported_channels_901_4[] = { + 33, 35 +}; + +static const u8 jp_supported_channels[] = { + 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21 +}; + +static const u8 kr_supported_channels[] = { + 1, 2, 3, 5, 6, 7, 8, 9, 10, 11 +}; + +static const u8 sg_supported_channels_863[] = { + 7, 9, 10, 11 +}; + +static const u8 sg_supported_channels_902[] = { + 37, 38, 39, 40, 41, 42, 43, 45 +}; + +static const u8 au_nz_supported_channels[] = { + 27, 29, 30, 31, 32, 33, 34, 35, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + 51 +}; + + +/* The following s1g_oper_class structs are taken from + * IEEE Std 802.11-2020 Table E-5 + */ +static const struct s1g_oper_class country_class_au = { + .cc = "AU", + .class_count = 2, + .class = { + { + .band_start = 902000, + .start_freq = 915000, + .end_freq = 920000, + .max_bw_khz = MHZ_TO_KHZ(4), + .align_to_end = 0, + .supported_chan = au_nz_supported_channels, + .n_supported_chan = sizeof(au_nz_supported_channels), + }, + { + .band_start = 902000, + .start_freq = 920000, + .end_freq = 928000, + .max_bw_khz = MHZ_TO_KHZ(8), + .align_to_end = 1, + .supported_chan = NULL, + .n_supported_chan = 0, + } + }, +}; + +static const struct s1g_oper_class country_class_nz = { + .cc = "NZ", + .class_count = 2, + .class = { + { + .band_start = 902000, + .start_freq = 915000, + .end_freq = 924000, + .max_bw_khz = MHZ_TO_KHZ(8), + .align_to_end = 0, + .supported_chan = au_nz_supported_channels, + .n_supported_chan = sizeof(au_nz_supported_channels), + }, + { + .band_start = 902000, + .start_freq = 924000, + .end_freq = 928000, + .max_bw_khz = MHZ_TO_KHZ(8), + .align_to_end = 0, + .supported_chan = NULL, + .n_supported_chan = 0, + } + }, +}; + +static const struct s1g_oper_class country_class_us = { + .cc = "US", + .class_count = 3, + .class = { + { + .band_start = 902000, + .start_freq = 902000, + .end_freq = 904000, + .max_bw_khz = MHZ_TO_KHZ(16), + .align_to_end = 0, + .supported_chan = us_supported_channels, + .n_supported_chan = sizeof(us_supported_channels), + }, + { + .band_start = 902000, + .start_freq = 920000, + .end_freq = 928000, + .max_bw_khz = MHZ_TO_KHZ(16), + .align_to_end = 0, + .supported_chan = NULL, + .n_supported_chan = 0, + }, + { + .band_start = 902000, + .start_freq = 904000, + .end_freq = 920000, + .max_bw_khz = MHZ_TO_KHZ(16), + .align_to_end = 0, + .supported_chan = NULL, + .n_supported_chan = 0, + } + }, +}; + +static const struct s1g_oper_class country_class_sg = { + .cc = "SG", + .class_count = 2, + .class = { + { + .band_start = 863000, + .start_freq = 866000, + .end_freq = 869000, + .max_bw_khz = MHZ_TO_KHZ(2), + .align_to_end = 1, + .supported_chan = sg_supported_channels_863, + .n_supported_chan = sizeof(sg_supported_channels_863), + }, + { + .band_start = 902000, + .start_freq = 920000, + .end_freq = 925000, + .max_bw_khz = MHZ_TO_KHZ(4), + .align_to_end = 0, + .supported_chan = sg_supported_channels_902, + .n_supported_chan = sizeof(sg_supported_channels_902), + }, + }, +}; + +static const struct s1g_oper_class country_class_kr = { + .cc = "KR", + .class_count = 1, + .class = { + { + .band_start = 917500, + .start_freq = 917500, + .end_freq = 923500, + .max_bw_khz = MHZ_TO_KHZ(4), + .align_to_end = 1, + .supported_chan = kr_supported_channels, + .n_supported_chan = sizeof(kr_supported_channels), + } + }, +}; + +static const struct s1g_oper_class country_class_eu = { + .cc = "EU", + .class_count = 1, + .class = { + { + .band_start = 863000, + .start_freq = 863000, + .end_freq = 868000, + .max_bw_khz = MHZ_TO_KHZ(1), + .align_to_end = 0, + .supported_chan = eu_supported_channels_863, + .n_supported_chan = sizeof(eu_supported_channels_863), + }, + { + .band_start = 901400, + .start_freq = 917400, + .end_freq = 919400, + .max_bw_khz = MHZ_TO_KHZ(1), + .align_to_end = 0, + .supported_chan = eu_supported_channels_901_4, + .n_supported_chan = sizeof(eu_supported_channels_901_4), + } + }, +}; + +static const struct s1g_oper_class country_class_jp = { + .cc = "JP", + .class_count = 1, + .class = { + { + .band_start = 916500, + .start_freq = 916500, + .end_freq = 927500, + .max_bw_khz = MHZ_TO_KHZ(1), + .supported_chan = jp_supported_channels, + .n_supported_chan = sizeof(jp_supported_channels), + } + }, +}; + +static const struct s1g_oper_class *reg_s1g_get_oper_class(const char *cc) +{ + if (!strcmp(cc, "EU")) + return &country_class_eu; + if (!strcmp(cc, "SG")) + return &country_class_sg; + if (!strcmp(cc, "US")) + return &country_class_us; + if (!strcmp(cc, "AU")) + return &country_class_au; + if (!strcmp(cc, "KR")) + return &country_class_kr; + if (!strcmp(cc, "JP")) + return &country_class_jp; + if (!strcmp(cc, "NZ")) + return &country_class_nz; + return &country_class_us; +} + +#endif /*__NET_WIRELESS_REG_S1G_H */ diff --git a/net/wireless/util.c b/net/wireless/util.c index b7257862e0fe..412403d29c22 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -22,6 +22,7 @@ #include <linux/nospec.h> #include "core.h" #include "rdev-ops.h" +#include "reg_s1g.h" const struct ieee80211_rate * @@ -72,6 +73,23 @@ u32 ieee80211_mandatory_rates(struct ieee80211_supported_band *sband, } EXPORT_SYMBOL(ieee80211_mandatory_rates); +static u32 ieee80211_s1g_base_freq(int chan) +{ + const struct ieee80211_regdomain *regd = rtnl_dereference(cfg80211_regdomain); + const struct s1g_oper_class *oper = reg_s1g_get_oper_class(regd->alpha2); + u8 i, j, index = 0; + + if (oper->class_count > 1) + for (i = 0; i < oper->class_count; i++) + for (j = 0; j < oper->class[i].n_supported_chan; j++) + if (oper->class[i].supported_chan[j] == chan) { + index = i; + goto out; + } +out: + return oper->class[index].band_start; +} + u32 ieee80211_channel_to_freq_khz(int chan, enum nl80211_band band) { /* see 802.11 17.3.8.3.2 and Annex J @@ -104,7 +122,7 @@ u32 ieee80211_channel_to_freq_khz(int chan, enum nl80211_band band) return MHZ_TO_KHZ(56160 + chan * 2160); break; case NL80211_BAND_S1GHZ: - return 902000 + chan * 500; + return ieee80211_s1g_base_freq(chan) + chan * 500; default: ; } @@ -112,6 +130,17 @@ u32 ieee80211_channel_to_freq_khz(int chan, enum nl80211_band band) } EXPORT_SYMBOL(ieee80211_channel_to_freq_khz); +u32 ieee80211_s1g_channel_to_freq_khz(int chan) +{ + u32 base = ieee80211_s1g_base_freq(chan); + + if (!base) + return 0; + + return (base + chan * 500); +} +EXPORT_SYMBOL(ieee80211_s1g_channel_to_freq_khz); + enum nl80211_chan_width ieee80211_s1g_channel_width(const struct ieee80211_channel *chan) {