| Message ID | 1558364020-11064-2-git-send-email-ailizaro@codeaurora.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | Add support for new channels on 60GHz band | expand |
Hi Alexei, Sorry for the long delay here. I have a few questions. Looking at this: > /** > + * struct ieee80211_sta_edmg_cap - EDMG capabilities > + * > + * This structure describes most essential parameters needed > + * to describe 802.11ay EDMG capabilities > + * > + * @channels: bitmap that indicates the 2.16 GHz channel(s) > + * that are allowed to be used for transmissions in the BSS. > + * Set to 0 indicate EDMG not supported. > + * @bw_config: Channel BW Configuration subfield encodes > + * the allowed channel bandwidth configurations > + */ > +struct ieee80211_sta_edmg_cap { > + u8 channels; > + u8 bw_config; > +}; What are the bits actually? Seems you should define some enum or so that shows which bits are used here? > * @center_freq1: center frequency of first segment > * @center_freq2: center frequency of second segment > * (only with 80+80 MHz) > + * @edmg_channels: bitmap that indicates the 2.16 GHz channel(s) > + * that are allowed to be used for transmissions in the BSS. > + * @edmg_bw_config: Channel BW Configuration subfield encodes > + * the allowed channel bandwidth configurations > */ > struct cfg80211_chan_def { > struct ieee80211_channel *chan; > enum nl80211_chan_width width; > u32 center_freq1; > u32 center_freq2; > + u8 edmg_channels; > + u8 edmg_bw_config; > }; This isn't clear to me. How can the capability and the configuration be exactly the same? In the capability, you should be able to capture multiple possible things, and in the setting only choose one? And if they really are the same, why not use the struct ieee80211_sta_edmg_cap here? Seems weird to me, but I don't know 11ay. Also, I think you should describe a bit more how this plays together with the existing settings. Will ->chan still be set, to something like the control channel? > /** > @@ -1144,15 +1169,17 @@ int cfg80211_check_station_change(struct wiphy *wiphy, > * @RATE_INFO_FLAGS_MCS: mcs field filled with HT MCS > * @RATE_INFO_FLAGS_VHT_MCS: mcs field filled with VHT MCS > * @RATE_INFO_FLAGS_SHORT_GI: 400ns guard interval > - * @RATE_INFO_FLAGS_60G: 60GHz MCS > + * @RATE_INFO_FLAGS_DMG: 60GHz MCS > * @RATE_INFO_FLAGS_HE_MCS: HE MCS information > + * @RATE_INFO_FLAGS_EDMG: 60GHz MCS in EDMG mode > */ > enum rate_info_flags { > RATE_INFO_FLAGS_MCS = BIT(0), > RATE_INFO_FLAGS_VHT_MCS = BIT(1), > RATE_INFO_FLAGS_SHORT_GI = BIT(2), > - RATE_INFO_FLAGS_60G = BIT(3), > + RATE_INFO_FLAGS_DMG = BIT(3), > RATE_INFO_FLAGS_HE_MCS = BIT(4), > + RATE_INFO_FLAGS_EDMG = BIT(5), > }; > > /** > @@ -1192,6 +1219,7 @@ enum rate_info_bw { > * @he_dcm: HE DCM value > * @he_ru_alloc: HE RU allocation (from &enum nl80211_he_ru_alloc, > * only valid if bw is %RATE_INFO_BW_HE_RU) > + * @n_bonded_ch: In case of EDMG the number of bonded channels (1-4) > */ > struct rate_info { > u8 flags; > @@ -1202,6 +1230,7 @@ struct rate_info { > u8 he_gi; > u8 he_dcm; > u8 he_ru_alloc; > + u8 n_bonded_ch; > }; It seems like this is missing corresponding nl80211.h changes? > @@ -2436,6 +2469,8 @@ struct cfg80211_connect_params { > const u8 *fils_erp_rrk; > size_t fils_erp_rrk_len; > bool want_1x; > + u8 edmg_channels; > + u8 edmg_bw_config; > }; Same question as above, why not embed the struct if it's the same? Again it seems like it shouldn't be the same though. > + * @NL80211_ATTR_WIPHY_EDMG_CHANNELS: bitmap that indicates the 2.16 GHz > + * channel(s) that are allowed to be used for EDMG transmissions in the > + * BSS as defined by IEEE 802.11 section 9.4.2.251. > + * @NL80211_ATTR_WIPHY_EDMG_BW_CONFIG: Channel BW Configuration subfield encodes > + * the allowed channel bandwidth configurations as defined by IEEE 802.11 > + * section 9.4.2.251, Table 13. This is unclear - "in the BSS" means nothing in this context, since you're using this to advertise capabilities? This isn't a BSS attribute, after all. Ah - but looking further, you use this to *set* the channel, not for capabilities... I guess that makes sense. > * @NL80211_BAND_ATTR_VHT_CAPA: VHT capabilities, as in the HT information IE > * @NL80211_BAND_ATTR_IFTYPE_DATA: nested array attribute, with each entry using > * attributes from &enum nl80211_band_iftype_attr > + * @NL80211_BAND_ATTR_EDMG_CHANNELS: bitmap that indicates the 2.16 GHz > + * channel(s) that are allowed to be used for EDMG transmissions in the > + * BSS as defined by IEEE 802.11 section 9.4.2.251. > + * @NL80211_BAND_ATTR_EDMG_BW_CONFIG: Channel BW Configuration subfield > + * encodes the allowed channel bandwidth configurations as defined by > + * IEEE 802.11 section 9.4.2.251, Table 13. > * @NL80211_BAND_ATTR_MAX: highest band attribute currently defined > * @__NL80211_BAND_ATTR_AFTER_LAST: internal use And ... that makes more sense than the global attribute I guess? > +static bool cfg80211_edmg_chandef_valid(const struct cfg80211_chan_def *chandef) > +{ > + int max_continuous = 0; > + int num_of_enabled = 0; > + int continuous = 0; do you mean "contiguous"? "continuous" doesn't make much sense? > + int i; > + > + if (!chandef->edmg_channels && !chandef->edmg_bw_config) > + return true; > + > + if ((!chandef->edmg_channels && chandef->edmg_bw_config) || > + (chandef->edmg_channels && !chandef->edmg_bw_config)) > + return false; There probably should be some kind of WARN_ON() check that validates you get here only if the ->chan is actually 60GHz? > +++ b/net/wireless/nl80211.c > @@ -288,6 +288,9 @@ static int validate_ie_attr(const struct nlattr *attr, > > [NL80211_ATTR_WIPHY_FREQ] = { .type = NLA_U32 }, > [NL80211_ATTR_WIPHY_CHANNEL_TYPE] = { .type = NLA_U32 }, > + [NL80211_ATTR_WIPHY_EDMG_CHANNELS] = { .type = NLA_U8 }, > + [NL80211_ATTR_WIPHY_EDMG_BW_CONFIG] = { .type = NLA_U8 }, You probably want something like NLA_POLICY_RANGE() here? This was only 1-4 IIRC? > + if (info->attrs[NL80211_ATTR_WIPHY_EDMG_CHANNELS]) { > + chandef->edmg_channels = > + nla_get_u8(info->attrs[NL80211_ATTR_WIPHY_EDMG_CHANNELS]); > + > + if (info->attrs[NL80211_ATTR_WIPHY_EDMG_BW_CONFIG]) > + chandef->edmg_bw_config = > + nla_get_u8(info->attrs[NL80211_ATTR_WIPHY_EDMG_BW_CONFIG]); > + } else { > + chandef->edmg_bw_config = 0; > + chandef->edmg_channels = 0; > + } > + > if (!cfg80211_chandef_valid(chandef)) { So I guess what I suggested above shouldn't actually be a WARN_ON() but just a check w/o WARN_ON()? johannes
On 2019-06-14 15:31, Johannes Berg wrote: > Hi Alexei, > > Sorry for the long delay here. > > I have a few questions. > > Looking at this: Hi Johannes, Thank you for the review, comments inline. Thanks, Alex. > >> /** >> + * struct ieee80211_sta_edmg_cap - EDMG capabilities >> + * >> + * This structure describes most essential parameters needed >> + * to describe 802.11ay EDMG capabilities >> + * >> + * @channels: bitmap that indicates the 2.16 GHz channel(s) >> + * that are allowed to be used for transmissions in the BSS. >> + * Set to 0 indicate EDMG not supported. >> + * @bw_config: Channel BW Configuration subfield encodes >> + * the allowed channel bandwidth configurations >> + */ >> +struct ieee80211_sta_edmg_cap { >> + u8 channels; >> + u8 bw_config; >> +}; > > What are the bits actually? Seems you should define some enum or so > that > shows which bits are used here? Enum is not needed in this case, Each bit in the channels represent legacy channel, bit 0 represent channel 1, bit 1 represent channel 2 and so on... till bit 5 that represent channel 6. I will update the description to make it more clear. > >> * @center_freq1: center frequency of first segment >> * @center_freq2: center frequency of second segment >> * (only with 80+80 MHz) >> + * @edmg_channels: bitmap that indicates the 2.16 GHz channel(s) >> + * that are allowed to be used for transmissions in the BSS. >> + * @edmg_bw_config: Channel BW Configuration subfield encodes >> + * the allowed channel bandwidth configurations >> */ >> struct cfg80211_chan_def { >> struct ieee80211_channel *chan; >> enum nl80211_chan_width width; >> u32 center_freq1; >> u32 center_freq2; >> + u8 edmg_channels; >> + u8 edmg_bw_config; >> }; > > This isn't clear to me. How can the capability and the configuration be > exactly the same? In the capability, you should be able to capture > multiple possible things, and in the setting only choose one? edmg_channels can specify multiple channels and edmg_bw_config can specify multiple bonding options. For example edmg_bw_config = 15 means that association is allowed/requested with bonding of 1, 2, 3 or 4 channels. When driver reports capability - it obviously can report multiple options. For the setting (connect command or start AP), kernel can request multiple options (subset of reported capabilities) and the driver will choose one of them, based on BSS configuration and resource availability. > > And if they really are the same, why not use the struct > ieee80211_sta_edmg_cap here? Seems weird to me, but I don't know 11ay. Good comment, will use the ieee80211_sta_edmg_cap struct. > > > Also, I think you should describe a bit more how this plays together > with the existing settings. Will ->chan still be set, to something like > the control channel? Updated cfg80211.h wil->chan in case of 11ay is the primary channel and other setting being ignored. > >> /** >> @@ -1144,15 +1169,17 @@ int cfg80211_check_station_change(struct wiphy >> *wiphy, >> * @RATE_INFO_FLAGS_MCS: mcs field filled with HT MCS >> * @RATE_INFO_FLAGS_VHT_MCS: mcs field filled with VHT MCS >> * @RATE_INFO_FLAGS_SHORT_GI: 400ns guard interval >> - * @RATE_INFO_FLAGS_60G: 60GHz MCS >> + * @RATE_INFO_FLAGS_DMG: 60GHz MCS >> * @RATE_INFO_FLAGS_HE_MCS: HE MCS information >> + * @RATE_INFO_FLAGS_EDMG: 60GHz MCS in EDMG mode >> */ >> enum rate_info_flags { >> RATE_INFO_FLAGS_MCS = BIT(0), >> RATE_INFO_FLAGS_VHT_MCS = BIT(1), >> RATE_INFO_FLAGS_SHORT_GI = BIT(2), >> - RATE_INFO_FLAGS_60G = BIT(3), >> + RATE_INFO_FLAGS_DMG = BIT(3), >> RATE_INFO_FLAGS_HE_MCS = BIT(4), >> + RATE_INFO_FLAGS_EDMG = BIT(5), >> }; >> >> /** >> @@ -1192,6 +1219,7 @@ enum rate_info_bw { >> * @he_dcm: HE DCM value >> * @he_ru_alloc: HE RU allocation (from &enum nl80211_he_ru_alloc, >> * only valid if bw is %RATE_INFO_BW_HE_RU) >> + * @n_bonded_ch: In case of EDMG the number of bonded channels (1-4) >> */ >> struct rate_info { >> u8 flags; >> @@ -1202,6 +1230,7 @@ struct rate_info { >> u8 he_gi; >> u8 he_dcm; >> u8 he_ru_alloc; >> + u8 n_bonded_ch; >> }; > > > It seems like this is missing corresponding nl80211.h changes? n_bonded_ch not exposed to the userspace, like flags. > >> @@ -2436,6 +2469,8 @@ struct cfg80211_connect_params { >> const u8 *fils_erp_rrk; >> size_t fils_erp_rrk_len; >> bool want_1x; >> + u8 edmg_channels; >> + u8 edmg_bw_config; >> }; > > Same question as above, why not embed the struct if it's the same? Done. > > Again it seems like it shouldn't be the same though. > >> + * @NL80211_ATTR_WIPHY_EDMG_CHANNELS: bitmap that indicates the 2.16 >> GHz >> + * channel(s) that are allowed to be used for EDMG transmissions in >> the >> + * BSS as defined by IEEE 802.11 section 9.4.2.251. >> + * @NL80211_ATTR_WIPHY_EDMG_BW_CONFIG: Channel BW Configuration >> subfield encodes >> + * the allowed channel bandwidth configurations as defined by IEEE >> 802.11 >> + * section 9.4.2.251, Table 13. > > This is unclear - "in the BSS" means nothing in this context, since > you're using this to advertise capabilities? > > This isn't a BSS attribute, after all. > > Ah - but looking further, you use this to *set* the channel, not for > capabilities... I guess that makes sense. You are correct, this is for setting the channel, I've updated the description. > > >> * @NL80211_BAND_ATTR_VHT_CAPA: VHT capabilities, as in the HT >> information IE >> * @NL80211_BAND_ATTR_IFTYPE_DATA: nested array attribute, with each >> entry using >> * attributes from &enum nl80211_band_iftype_attr >> + * @NL80211_BAND_ATTR_EDMG_CHANNELS: bitmap that indicates the 2.16 >> GHz >> + * channel(s) that are allowed to be used for EDMG transmissions in >> the >> + * BSS as defined by IEEE 802.11 section 9.4.2.251. >> + * @NL80211_BAND_ATTR_EDMG_BW_CONFIG: Channel BW Configuration >> subfield >> + * encodes the allowed channel bandwidth configurations as defined by >> + * IEEE 802.11 section 9.4.2.251, Table 13. >> * @NL80211_BAND_ATTR_MAX: highest band attribute currently defined >> * @__NL80211_BAND_ATTR_AFTER_LAST: internal use > > And ... that makes more sense than the global attribute I guess? We feel it belongs to the BAND attributes because for example also VHT capability is there. There are however 2 other options: 1. Move the attribute to the NL80211_FREQUENCY_ATTR 2. Move them to the global attributes Any preference? > >> +static bool cfg80211_edmg_chandef_valid(const struct >> cfg80211_chan_def *chandef) >> +{ >> + int max_continuous = 0; >> + int num_of_enabled = 0; >> + int continuous = 0; > > do you mean "contiguous"? "continuous" doesn't make much sense? Updated , contiguous. > >> + int i; >> + >> + if (!chandef->edmg_channels && !chandef->edmg_bw_config) >> + return true; >> + >> + if ((!chandef->edmg_channels && chandef->edmg_bw_config) || >> + (chandef->edmg_channels && !chandef->edmg_bw_config)) >> + return false; > > There probably should be some kind of WARN_ON() check that validates > you > get here only if the ->chan is actually 60GHz? Added 60GHz check. > >> +++ b/net/wireless/nl80211.c >> @@ -288,6 +288,9 @@ static int validate_ie_attr(const struct nlattr >> *attr, >> >> [NL80211_ATTR_WIPHY_FREQ] = { .type = NLA_U32 }, >> [NL80211_ATTR_WIPHY_CHANNEL_TYPE] = { .type = NLA_U32 }, >> + [NL80211_ATTR_WIPHY_EDMG_CHANNELS] = { .type = NLA_U8 }, >> + [NL80211_ATTR_WIPHY_EDMG_BW_CONFIG] = { .type = NLA_U8 }, > > You probably want something like NLA_POLICY_RANGE() here? This was only > 1-4 IIRC? Updated to NLA_POLICY_RANGE, the range value is 4-15, align with the Spec. > >> + if (info->attrs[NL80211_ATTR_WIPHY_EDMG_CHANNELS]) { >> + chandef->edmg_channels = >> + nla_get_u8(info->attrs[NL80211_ATTR_WIPHY_EDMG_CHANNELS]); >> + >> + if (info->attrs[NL80211_ATTR_WIPHY_EDMG_BW_CONFIG]) >> + chandef->edmg_bw_config = >> + nla_get_u8(info->attrs[NL80211_ATTR_WIPHY_EDMG_BW_CONFIG]); >> + } else { >> + chandef->edmg_bw_config = 0; >> + chandef->edmg_channels = 0; >> + } >> + >> if (!cfg80211_chandef_valid(chandef)) { > > So I guess what I suggested above shouldn't actually be a WARN_ON() but > just a check w/o WARN_ON()? Added 60GHz check. > > johannes
On Tue, 2019-06-25 at 13:21 +0300, Alexei Lazar wrote: > > > > * @NL80211_BAND_ATTR_VHT_CAPA: VHT capabilities, as in the HT > > > information IE > > > * @NL80211_BAND_ATTR_IFTYPE_DATA: nested array attribute, with each > > > entry using > > > * attributes from &enum nl80211_band_iftype_attr > > > + * @NL80211_BAND_ATTR_EDMG_CHANNELS: bitmap that indicates the 2.16 > > > GHz > > > + * channel(s) that are allowed to be used for EDMG transmissions in > > > the > > > + * BSS as defined by IEEE 802.11 section 9.4.2.251. > > > + * @NL80211_BAND_ATTR_EDMG_BW_CONFIG: Channel BW Configuration > > > subfield > > > + * encodes the allowed channel bandwidth configurations as defined by > > > + * IEEE 802.11 section 9.4.2.251, Table 13. > > > * @NL80211_BAND_ATTR_MAX: highest band attribute currently defined > > > * @__NL80211_BAND_ATTR_AFTER_LAST: internal use > > > > And ... that makes more sense than the global attribute I guess? > > We feel it belongs to the BAND attributes because for example also VHT > capability is there. There are however 2 other options: > 1. Move the attribute to the NL80211_FREQUENCY_ATTR > 2. Move them to the global attributes > Any preference? I think I just got confused. Is this used for capability reporting then? I guess that'd make sense here, yeah. johannes
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c index a1e226652..ce68fbc 100644 --- a/drivers/net/wireless/ath/wil6210/cfg80211.c +++ b/drivers/net/wireless/ath/wil6210/cfg80211.c @@ -346,7 +346,7 @@ int wil_cid_fill_sinfo(struct wil6210_vif *vif, int cid, BIT_ULL(NL80211_STA_INFO_RX_DROP_MISC) | BIT_ULL(NL80211_STA_INFO_TX_FAILED); - sinfo->txrate.flags = RATE_INFO_FLAGS_60G; + sinfo->txrate.flags = RATE_INFO_FLAGS_DMG; sinfo->txrate.mcs = le16_to_cpu(reply.evt.bf_mcs); sinfo->rxrate.mcs = stats->last_mcs_rx; sinfo->rx_bytes = stats->rx_bytes; diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 117691f..f2d2239 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -321,6 +321,23 @@ struct ieee80211_sband_iftype_data { }; /** + * struct ieee80211_sta_edmg_cap - EDMG capabilities + * + * This structure describes most essential parameters needed + * to describe 802.11ay EDMG capabilities + * + * @channels: bitmap that indicates the 2.16 GHz channel(s) + * that are allowed to be used for transmissions in the BSS. + * Set to 0 indicate EDMG not supported. + * @bw_config: Channel BW Configuration subfield encodes + * the allowed channel bandwidth configurations + */ +struct ieee80211_sta_edmg_cap { + u8 channels; + u8 bw_config; +}; + +/** * struct ieee80211_supported_band - frequency band definition * * This structure describes a frequency band a wiphy @@ -336,6 +353,7 @@ struct ieee80211_sband_iftype_data { * @n_bitrates: Number of bitrates in @bitrates * @ht_cap: HT capabilities in this band * @vht_cap: VHT capabilities in this band + * @edmg_cap: EDMG capabilities in this band * @n_iftype_data: number of iftype data entries * @iftype_data: interface type data entries. Note that the bits in * @types_mask inside this structure cannot overlap (i.e. only @@ -350,6 +368,7 @@ struct ieee80211_supported_band { int n_bitrates; struct ieee80211_sta_ht_cap ht_cap; struct ieee80211_sta_vht_cap vht_cap; + struct ieee80211_sta_edmg_cap edmg_cap; u16 n_iftype_data; const struct ieee80211_sband_iftype_data *iftype_data; }; @@ -503,12 +522,18 @@ struct key_params { * @center_freq1: center frequency of first segment * @center_freq2: center frequency of second segment * (only with 80+80 MHz) + * @edmg_channels: bitmap that indicates the 2.16 GHz channel(s) + * that are allowed to be used for transmissions in the BSS. + * @edmg_bw_config: Channel BW Configuration subfield encodes + * the allowed channel bandwidth configurations */ struct cfg80211_chan_def { struct ieee80211_channel *chan; enum nl80211_chan_width width; u32 center_freq1; u32 center_freq2; + u8 edmg_channels; + u8 edmg_bw_config; }; /** @@ -1144,15 +1169,17 @@ int cfg80211_check_station_change(struct wiphy *wiphy, * @RATE_INFO_FLAGS_MCS: mcs field filled with HT MCS * @RATE_INFO_FLAGS_VHT_MCS: mcs field filled with VHT MCS * @RATE_INFO_FLAGS_SHORT_GI: 400ns guard interval - * @RATE_INFO_FLAGS_60G: 60GHz MCS + * @RATE_INFO_FLAGS_DMG: 60GHz MCS * @RATE_INFO_FLAGS_HE_MCS: HE MCS information + * @RATE_INFO_FLAGS_EDMG: 60GHz MCS in EDMG mode */ enum rate_info_flags { RATE_INFO_FLAGS_MCS = BIT(0), RATE_INFO_FLAGS_VHT_MCS = BIT(1), RATE_INFO_FLAGS_SHORT_GI = BIT(2), - RATE_INFO_FLAGS_60G = BIT(3), + RATE_INFO_FLAGS_DMG = BIT(3), RATE_INFO_FLAGS_HE_MCS = BIT(4), + RATE_INFO_FLAGS_EDMG = BIT(5), }; /** @@ -1192,6 +1219,7 @@ enum rate_info_bw { * @he_dcm: HE DCM value * @he_ru_alloc: HE RU allocation (from &enum nl80211_he_ru_alloc, * only valid if bw is %RATE_INFO_BW_HE_RU) + * @n_bonded_ch: In case of EDMG the number of bonded channels (1-4) */ struct rate_info { u8 flags; @@ -1202,6 +1230,7 @@ struct rate_info { u8 he_gi; u8 he_dcm; u8 he_ru_alloc; + u8 n_bonded_ch; }; /** @@ -2403,6 +2432,10 @@ struct cfg80211_bss_selection { * @fils_erp_rrk_len: Length of @fils_erp_rrk in octets. * @want_1x: indicates user-space supports and wants to use 802.1X driver * offload of 4-way handshake. + * @edmg_channels: bitmap that indicates the 2.16 GHz channel(s) + * that are allowed to be used for transmissions in the BSS. + * @edmg_bw_config: Channel BW Configuration subfield encodes + * the allowed channel bandwidth configurations */ struct cfg80211_connect_params { struct ieee80211_channel *channel; @@ -2436,6 +2469,8 @@ struct cfg80211_connect_params { const u8 *fils_erp_rrk; size_t fils_erp_rrk_len; bool want_1x; + u8 edmg_channels; + u8 edmg_bw_config; }; /** diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 25f70dd..f74cce1 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -2324,6 +2324,13 @@ enum nl80211_commands { * should be picking up the lowest tx power, either tx power per-interface * or per-station. * + * @NL80211_ATTR_WIPHY_EDMG_CHANNELS: bitmap that indicates the 2.16 GHz + * channel(s) that are allowed to be used for EDMG transmissions in the + * BSS as defined by IEEE 802.11 section 9.4.2.251. + * @NL80211_ATTR_WIPHY_EDMG_BW_CONFIG: Channel BW Configuration subfield encodes + * the allowed channel bandwidth configurations as defined by IEEE 802.11 + * section 9.4.2.251, Table 13. + * * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use @@ -2777,6 +2784,9 @@ enum nl80211_attrs { NL80211_ATTR_STA_TX_POWER_SETTING, NL80211_ATTR_STA_TX_POWER, + NL80211_ATTR_WIPHY_EDMG_CHANNELS, + NL80211_ATTR_WIPHY_EDMG_BW_CONFIG, + /* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST, @@ -3385,6 +3395,12 @@ enum nl80211_band_iftype_attr { * @NL80211_BAND_ATTR_VHT_CAPA: VHT capabilities, as in the HT information IE * @NL80211_BAND_ATTR_IFTYPE_DATA: nested array attribute, with each entry using * attributes from &enum nl80211_band_iftype_attr + * @NL80211_BAND_ATTR_EDMG_CHANNELS: bitmap that indicates the 2.16 GHz + * channel(s) that are allowed to be used for EDMG transmissions in the + * BSS as defined by IEEE 802.11 section 9.4.2.251. + * @NL80211_BAND_ATTR_EDMG_BW_CONFIG: Channel BW Configuration subfield + * encodes the allowed channel bandwidth configurations as defined by + * IEEE 802.11 section 9.4.2.251, Table 13. * @NL80211_BAND_ATTR_MAX: highest band attribute currently defined * @__NL80211_BAND_ATTR_AFTER_LAST: internal use */ @@ -3402,6 +3418,9 @@ enum nl80211_band_attr { NL80211_BAND_ATTR_VHT_CAPA, NL80211_BAND_ATTR_IFTYPE_DATA, + NL80211_BAND_ATTR_EDMG_CHANNELS, + NL80211_BAND_ATTR_EDMG_BW_CONFIG, + /* keep last */ __NL80211_BAND_ATTR_AFTER_LAST, NL80211_BAND_ATTR_MAX = __NL80211_BAND_ATTR_AFTER_LAST - 1 diff --git a/net/wireless/chan.c b/net/wireless/chan.c index 7dc1bbd..d23135c 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c @@ -23,6 +23,8 @@ void cfg80211_chandef_create(struct cfg80211_chan_def *chandef, chandef->chan = chan; chandef->center_freq2 = 0; + chandef->edmg_bw_config = 0; + chandef->edmg_channels = 0; switch (chan_type) { case NL80211_CHAN_NO_HT: @@ -47,6 +49,92 @@ void cfg80211_chandef_create(struct cfg80211_chan_def *chandef, } EXPORT_SYMBOL(cfg80211_chandef_create); +static bool cfg80211_edmg_chandef_valid(const struct cfg80211_chan_def *chandef) +{ + int max_continuous = 0; + int num_of_enabled = 0; + int continuous = 0; + int i; + + if (!chandef->edmg_channels && !chandef->edmg_bw_config) + return true; + + if ((!chandef->edmg_channels && chandef->edmg_bw_config) || + (chandef->edmg_channels && !chandef->edmg_bw_config)) + return false; + + for (i = 0; i < 6; i++) { + if (chandef->edmg_channels & BIT(i)) { + continuous++; + num_of_enabled++; + } else { + continuous = 0; + } + + max_continuous = max(continuous, max_continuous); + } + /* basic verification of edmg configuration according to + * IEEE802.11 section 9.4.2.251 + */ + /* check bw_config against continuous edmg channels */ + switch (chandef->edmg_bw_config) { + case 4: + case 8: + case 12: + if (max_continuous < 1) + return false; + break; + case 5: + case 9: + case 13: + if (max_continuous < 2) + return false; + break; + case 6: + case 10: + case 14: + if (max_continuous < 3) + return false; + break; + case 7: + case 11: + case 15: + if (max_continuous < 4) + return false; + break; + + default: + return false; + } + + /* check bw_config against aggregated (non continuous) edmg channels */ + switch (chandef->edmg_bw_config) { + case 4: + case 5: + case 6: + case 7: + break; + case 8: + case 9: + case 10: + case 11: + if (num_of_enabled < 2) + return false; + break; + case 12: + case 13: + case 14: + case 15: + if (num_of_enabled < 4 || max_continuous < 2) + return false; + break; + default: + return false; + } + + return true; +} + bool cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef) { u32 control_freq; @@ -112,7 +200,7 @@ bool cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef) return false; } - return true; + return cfg80211_edmg_chandef_valid(chandef); } EXPORT_SYMBOL(cfg80211_chandef_valid); @@ -721,12 +809,65 @@ static bool cfg80211_secondary_chans_ok(struct wiphy *wiphy, return true; } +/* check if the operating channels are valid and supported */ +static bool cfg80211_edmg_usable(struct wiphy *wiphy, u8 edmg_channels, + u8 edmg_bw_config, int primary_channel, + struct ieee80211_sta_edmg_cap *edmg_cap) +{ + struct ieee80211_channel *chan; + int i, freq; + int channels_counter = 0; + + if (!edmg_channels && !edmg_bw_config) + return true; + + if ((!edmg_channels && edmg_bw_config) || + (edmg_channels && !edmg_bw_config)) + return false; + + if (!(edmg_channels & BIT(primary_channel - 1))) + return false; + + /* 60GHz channels 1..6 */ + for (i = 0; i < 6; i++) { + if (!(edmg_channels & BIT(i))) + continue; + + if (!(edmg_cap->channels & BIT(i))) + return false; + + channels_counter++; + + freq = ieee80211_channel_to_frequency(i + 1, + NL80211_BAND_60GHZ); + chan = ieee80211_get_channel(wiphy, freq); + if (!chan || chan->flags & IEEE80211_CHAN_DISABLED) + return false; + } + + /* IEEE802.11 allows max 4 channels */ + if (channels_counter > 4) + return false; + + /* check bw_config is a subset of what driver supports + * (see IEEE 802.11 section 9.4.2.251, Table 13) + */ + if ((edmg_bw_config % 4) > (edmg_cap->bw_config % 4)) + return false; + + if (edmg_bw_config > edmg_cap->bw_config) + return false; + + return true; +} + bool cfg80211_chandef_usable(struct wiphy *wiphy, const struct cfg80211_chan_def *chandef, u32 prohibited_flags) { struct ieee80211_sta_ht_cap *ht_cap; struct ieee80211_sta_vht_cap *vht_cap; + struct ieee80211_sta_edmg_cap *edmg_cap; u32 width, control_freq, cap; if (WARN_ON(!cfg80211_chandef_valid(chandef))) @@ -734,6 +875,15 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy, ht_cap = &wiphy->bands[chandef->chan->band]->ht_cap; vht_cap = &wiphy->bands[chandef->chan->band]->vht_cap; + edmg_cap = &wiphy->bands[chandef->chan->band]->edmg_cap; + + if (edmg_cap->channels && + !cfg80211_edmg_usable(wiphy, + chandef->edmg_channels, + chandef->edmg_bw_config, + chandef->chan->hw_value, + edmg_cap)) + return false; control_freq = chandef->chan->center_freq; diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index da3843a..c6d4b44 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -288,6 +288,9 @@ static int validate_ie_attr(const struct nlattr *attr, [NL80211_ATTR_WIPHY_FREQ] = { .type = NLA_U32 }, [NL80211_ATTR_WIPHY_CHANNEL_TYPE] = { .type = NLA_U32 }, + [NL80211_ATTR_WIPHY_EDMG_CHANNELS] = { .type = NLA_U8 }, + [NL80211_ATTR_WIPHY_EDMG_BW_CONFIG] = { .type = NLA_U8 }, + [NL80211_ATTR_CHANNEL_WIDTH] = { .type = NLA_U32 }, [NL80211_ATTR_CENTER_FREQ1] = { .type = NLA_U32 }, [NL80211_ATTR_CENTER_FREQ2] = { .type = NLA_U32 }, @@ -1501,6 +1504,15 @@ static int nl80211_send_band_rateinfo(struct sk_buff *msg, nla_nest_end(msg, nl_iftype_data); } + /* add EDMG info */ + if (sband->edmg_cap.channels && + (nla_put_u8(msg, NL80211_BAND_ATTR_EDMG_CHANNELS, + sband->edmg_cap.channels) || + nla_put_u8(msg, NL80211_BAND_ATTR_EDMG_BW_CONFIG, + sband->edmg_cap.bw_config))) + + return -ENOBUFS; + /* add bitrates */ nl_rates = nla_nest_start(msg, NL80211_BAND_ATTR_RATES); if (!nl_rates) @@ -2560,6 +2572,18 @@ int nl80211_parse_chandef(struct cfg80211_registered_device *rdev, nla_get_u32(attrs[NL80211_ATTR_CENTER_FREQ2]); } + if (info->attrs[NL80211_ATTR_WIPHY_EDMG_CHANNELS]) { + chandef->edmg_channels = + nla_get_u8(info->attrs[NL80211_ATTR_WIPHY_EDMG_CHANNELS]); + + if (info->attrs[NL80211_ATTR_WIPHY_EDMG_BW_CONFIG]) + chandef->edmg_bw_config = + nla_get_u8(info->attrs[NL80211_ATTR_WIPHY_EDMG_BW_CONFIG]); + } else { + chandef->edmg_bw_config = 0; + chandef->edmg_channels = 0; + } + if (!cfg80211_chandef_valid(chandef)) { NL_SET_ERR_MSG(extack, "invalid channel definition"); return -EINVAL; @@ -9699,6 +9723,15 @@ static int nl80211_connect(struct sk_buff *skb, struct genl_info *info) return -EINVAL; } + if (info->attrs[NL80211_ATTR_WIPHY_EDMG_CHANNELS]) { + connect.edmg_channels = + nla_get_u8(info->attrs[NL80211_ATTR_WIPHY_EDMG_CHANNELS]); + + if (info->attrs[NL80211_ATTR_WIPHY_EDMG_BW_CONFIG]) + connect.edmg_bw_config = + nla_get_u8(info->attrs[NL80211_ATTR_WIPHY_EDMG_BW_CONFIG]); + } + if (connect.privacy && info->attrs[NL80211_ATTR_KEYS]) { connkeys = nl80211_parse_connkeys(rdev, info, NULL); if (IS_ERR(connkeys)) diff --git a/net/wireless/util.c b/net/wireless/util.c index cf63b63..7d06dd6 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -1034,7 +1034,7 @@ static u32 cfg80211_calculate_bitrate_ht(struct rate_info *rate) return (bitrate + 50000) / 100000; } -static u32 cfg80211_calculate_bitrate_60g(struct rate_info *rate) +static u32 cfg80211_calculate_bitrate_dmg(struct rate_info *rate) { static const u32 __mcs2bitrate[] = { /* control PHY */ @@ -1081,6 +1081,40 @@ static u32 cfg80211_calculate_bitrate_60g(struct rate_info *rate) return __mcs2bitrate[rate->mcs]; } +static u32 cfg80211_calculate_bitrate_edmg(struct rate_info *rate) +{ + static const u32 __mcs2bitrate[] = { + /* control PHY */ + [0] = 275, + /* SC PHY */ + [1] = 3850, + [2] = 7700, + [3] = 9625, + [4] = 11550, + [5] = 12512, /* 1251.25 mbps */ + [6] = 13475, + [7] = 15400, + [8] = 19250, + [9] = 23100, + [10] = 25025, + [11] = 26950, + [12] = 30800, + [13] = 38500, + [14] = 46200, + [15] = 50050, + [16] = 53900, + [17] = 57750, + [18] = 69300, + [19] = 75075, + [20] = 80850, + }; + + if (WARN_ON_ONCE(rate->mcs >= ARRAY_SIZE(__mcs2bitrate))) + return 0; + + return __mcs2bitrate[rate->mcs] * rate->n_bonded_ch; +} + static u32 cfg80211_calculate_bitrate_vht(struct rate_info *rate) { static const u32 base[4][10] = { @@ -1253,8 +1287,10 @@ u32 cfg80211_calculate_bitrate(struct rate_info *rate) { if (rate->flags & RATE_INFO_FLAGS_MCS) return cfg80211_calculate_bitrate_ht(rate); - if (rate->flags & RATE_INFO_FLAGS_60G) - return cfg80211_calculate_bitrate_60g(rate); + if (rate->flags & RATE_INFO_FLAGS_DMG) + return cfg80211_calculate_bitrate_dmg(rate); + if (rate->flags & RATE_INFO_FLAGS_EDMG) + return cfg80211_calculate_bitrate_edmg(rate); if (rate->flags & RATE_INFO_FLAGS_VHT_MCS) return cfg80211_calculate_bitrate_vht(rate); if (rate->flags & RATE_INFO_FLAGS_HE_MCS)
802.11ay specification defines Enhanced Directional Multi-Gigabit (EDMG) STA and AP which allow channel bonding of 2 channels and more. Introduce NL80211_ATTR_WIPHY_EDMG_CHANNELS, NL80211_ATTR_WIPHY_EDMG_BW_CONFIG, NL80211_BAND_ATTR_EDMG_CHANNELS, NL80211_BAND_ATTR_EDMG_BW_CONFIG and RATE_INFO_FLAGS_EDMG that needed for enabling and configuring EDMG support. Driver is expected to report its EDMG capabilities: whether EDMG is supported and the supported EDMG channels. Bitrate calculation is enhanced to take into account EDMG support according to the 802.11ay specification. The kernel uses NL80211_BAND_ATTR_EDMG_CHANNELS and NL80211_BAND_ATTR_EDMG_BW_CONFIG attributes in order to publish the EDMG capabilities to the userspace. NL80211_BAND_ATTR_EDMG_CHANNELS is a bitmap field that indicates the 2.16 GHz channel(s) that are allowed to be used for transmissions in the BSS. If NL80211_BAND_ATTR_EDMG_CHANNELS is not set then EDMG not supported. NL80211_BAND_ATTR_EDMG_BW_CONFIG represent the allowed channel bandwidth configurations. NL80211_ATTR_WIPHY_EDMG_CHANNELS and NL80211_ATTR_WIPHY_EDMG_BW_CONFIG will be used by the userspace for AP configuration and connect command. Signed-off-by: Alexei Avshalom Lazar <ailizaro@codeaurora.org> --- drivers/net/wireless/ath/wil6210/cfg80211.c | 2 +- include/net/cfg80211.h | 39 ++++++- include/uapi/linux/nl80211.h | 19 ++++ net/wireless/chan.c | 152 +++++++++++++++++++++++++++- net/wireless/nl80211.c | 33 ++++++ net/wireless/util.c | 42 +++++++- 6 files changed, 280 insertions(+), 7 deletions(-)