| Message ID | 1589399105-25472-3-git-send-email-rmanohar@codeaurora.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | [v3,01/11] cfg80211: use only HE capability to set prohibited flags in 6 GHz | expand |
On Wed, 2020-05-13 at 12:44 -0700, Rajkumar Manoharan wrote: > > /** > + * enum ieee80211_he_6ghz_chanwidth - HE 6 GHz channel width > + * @IEEE80211_HE_6GHZ_CHANWIDTH_20MHZ: 20 MHz bandwidth > + * @IEEE80211_HE_6GHZ_CHANWIDTH_40MHZ: 40 MHz bandwidth > + * @IEEE80211_HE_6GHZ_CHANWIDTH_80MHZ: 80 MHz bandwidth > + * @IEEE80211_HE_6GHZ_CHANWIDTH_80P80MHZ: 160 or 80+80 MHz bandwidth > + */ > +enum ieee80211_he_6ghz_chanwidth { > + IEEE80211_HE_6GHZ_CHANWIDTH_20MHZ = 0, > + IEEE80211_HE_6GHZ_CHANWIDTH_40MHZ = 1, > + IEEE80211_HE_6GHZ_CHANWIDTH_80MHZ = 2, > + IEEE80211_HE_6GHZ_CHANWIDTH_160MHZ_80P80MHZ = 3, > +}; > + > +/** > + * struct ieee80211_he_oper_6ghz_op_info - 6 GHz Operation Information > + * > + * This structure is defined as described in IEEE P802.11ax/D6.0, > + * Figure 9-787k—6 GHz Operation Information field. > + * > + * @primary_chan: The channel number of the primary channel in the 6 GHz band. > + * @control: First two bits defines channel width field indicates the BSS > + * channel width and is set to 0 for 20 MHz, 1 for 40 MHz, 2 for 80 MHz, > + * and 3 for 80+80 or 160 MHz. > + * @center_freq_seg0_idx: Channel center frequency index for the 20 MHz, > + * 40 MHz, or 80 MHz, or 80+80 MHz. > + * @center_freq_seg1_idx: Channel center frequency index of the 160 MHz. > + * @min_rate: Minimum rate, in units of 1 Mb/s, that the non-AP STA is allowed > + * to use for sending PPDUs. > + */ > +struct ieee80211_he_oper_6ghz_op_info { > + u8 primary_chan; > + u8 control; > + u8 center_freq_seg0_idx; > + u8 center_freq_seg1_idx; > + u8 min_rate; > +} __packed; > Looks like I had +/** + * ieee80211_he_6ghz_oper - HE 6 GHz operation Information field + * @primary: primary channel + * @control: control flags + * @ccfs0: channel center frequency segment 0 + * @ccfs1: channel center frequency segment 1 + * @minrate: minimum rate (in 1 Mbps units) + */ +struct ieee80211_he_6ghz_oper { + u8 primary; +#define IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH 0x3 +#define IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_20MHZ 0 +#define IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_40MHZ 1 +#define IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_80MHZ 2 +#define IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_160MHZ 3 +#define IEEE80211_HE_6GHZ_OPER_CTRL_DUP_BEACON 0x4 + u8 control; + u8 ccfs0; + u8 ccfs1; + u8 minrate; +} __packed; Any objection to that? The names are getting _really_ long the way you had them ... FWIW, I also had a fix in ieee80211_he_oper_size() where the size of the oper is now sizeof(struct ieee80211_he_6ghz_oper). And this, to find it: +/** + * ieee80211_he_6ghz_oper - obtain 6 GHz operation field + * @he_oper: HE operation element (must be pre-validated for size) + * but may be %NULL + * + * Return: a pointer to the 6 GHz operation field, or %NULL + */ +static inline const struct ieee80211_he_6ghz_oper * +ieee80211_he_6ghz_oper(const struct ieee80211_he_operation *he_oper) +{ + const u8 *ret = (void *)&he_oper->optional; + u32 he_oper_params; + + if (!he_oper) + return NULL; + + he_oper_params = le32_to_cpu(he_oper->he_oper_params); + + if (!(he_oper_params & IEEE80211_HE_OPERATION_6GHZ_OP_INFO)) + return NULL; + if (he_oper_params & IEEE80211_HE_OPERATION_VHT_OPER_INFO) + ret += 3; + if (he_oper_params & IEEE80211_HE_OPERATION_CO_HOSTED_BSS) + ret++; + + return (void *)ret; +} + > #define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895 0x00000000 > #define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 0x00000001 > @@ -1982,6 +2029,15 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap, > #define IEEE80211_TX_RX_MCS_NSS_SUPP_TX_BITMAP_MASK 0x07c0 > #define IEEE80211_TX_RX_MCS_NSS_SUPP_RX_BITMAP_MASK 0xf800 > > +/* 802.11ax HE 6 GHz Band Capability */ > +#define IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START_SPACE_MASK GENMASK(2, 0) > +#define IEEE80211_HE_6GHZ_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK GENMASK(5, 3) > +#define IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LENGTH_MASK GENMASK(7, 6) > +#define IEEE80211_HE_6GHZ_CAP_SMPS_MASK GENMASK(10, 9) > +#define IEEE80211_HE_6GHZ_CAP_RD_RESP BIT(11) > +#define IEEE80211_HE_6GHZ_CAP_RX_ANTENNA_PATTERN BIT(12) > +#define IEEE80211_HE_6GHZ_CAP_TX_ANTENNA_PATTERN BIT(13) I don't like GENMASK() much ... but ok. FWIW, I had +struct ieee80211_he_6ghz_capa { + /* uses IEEE80211_HE_6GHZ_CAP_* below */ + __le16 capa; +} __packed; + +/* HE 6 GHz band capabilities */ +/* uses enum ieee80211_min_mpdu_spacing values */ +#define IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START 0x0007 +/* uses enum ieee80211_vht_max_ampdu_length_exp values */ +#define IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP 0x0038 +/* uses IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_* values */ +#define IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LEN 0x00c0 +/* WLAN_HT_CAP_SM_PS_* values */ +#define IEEE80211_HE_6GHZ_CAP_SM_PS_SHIFT 9 +#define IEEE80211_HE_6GHZ_CAP_SM_PS 0x0600 +#define IEEE80211_HE_6GHZ_CAP_RD_RESPONDER 0x0800 +#define IEEE80211_HE_6GHZ_CAP_RX_ANTPAT_CONS 0x1000 +#define IEEE80211_HE_6GHZ_CAP_TX_ANTPAT_CONS 0x2000 again, just shorter names ... johannes
On 2020-05-27 07:27, Johannes Berg wrote: > On Wed, 2020-05-13 at 12:44 -0700, Rajkumar Manoharan wrote: >> >> /** >> + * enum ieee80211_he_6ghz_chanwidth - HE 6 GHz channel width >> + * @IEEE80211_HE_6GHZ_CHANWIDTH_20MHZ: 20 MHz bandwidth >> + * @IEEE80211_HE_6GHZ_CHANWIDTH_40MHZ: 40 MHz bandwidth >> + * @IEEE80211_HE_6GHZ_CHANWIDTH_80MHZ: 80 MHz bandwidth >> + * @IEEE80211_HE_6GHZ_CHANWIDTH_80P80MHZ: 160 or 80+80 MHz bandwidth >> + */ >> +enum ieee80211_he_6ghz_chanwidth { >> + IEEE80211_HE_6GHZ_CHANWIDTH_20MHZ = 0, >> + IEEE80211_HE_6GHZ_CHANWIDTH_40MHZ = 1, >> + IEEE80211_HE_6GHZ_CHANWIDTH_80MHZ = 2, >> + IEEE80211_HE_6GHZ_CHANWIDTH_160MHZ_80P80MHZ = 3, >> +}; >> + >> +/** >> + * struct ieee80211_he_oper_6ghz_op_info - 6 GHz Operation >> Information >> + * >> + * This structure is defined as described in IEEE P802.11ax/D6.0, >> + * Figure 9-787k—6 GHz Operation Information field. >> + * >> + * @primary_chan: The channel number of the primary channel in the 6 >> GHz band. >> + * @control: First two bits defines channel width field indicates the >> BSS >> + * channel width and is set to 0 for 20 MHz, 1 for 40 MHz, 2 for 80 >> MHz, >> + * and 3 for 80+80 or 160 MHz. >> + * @center_freq_seg0_idx: Channel center frequency index for the 20 >> MHz, >> + * 40 MHz, or 80 MHz, or 80+80 MHz. >> + * @center_freq_seg1_idx: Channel center frequency index of the 160 >> MHz. >> + * @min_rate: Minimum rate, in units of 1 Mb/s, that the non-AP STA >> is allowed >> + * to use for sending PPDUs. >> + */ >> +struct ieee80211_he_oper_6ghz_op_info { >> + u8 primary_chan; >> + u8 control; >> + u8 center_freq_seg0_idx; >> + u8 center_freq_seg1_idx; >> + u8 min_rate; >> +} __packed; >> > > Looks like I had > > +/** > + * ieee80211_he_6ghz_oper - HE 6 GHz operation Information field > + * @primary: primary channel > + * @control: control flags > + * @ccfs0: channel center frequency segment 0 > + * @ccfs1: channel center frequency segment 1 > + * @minrate: minimum rate (in 1 Mbps units) > + */ > +struct ieee80211_he_6ghz_oper { > + u8 primary; > +#define IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH 0x3 > +#define IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_20MHZ > 0 > +#define IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_40MHZ > 1 > +#define IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_80MHZ > 2 > +#define IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_160MHZ > 3 > +#define IEEE80211_HE_6GHZ_OPER_CTRL_DUP_BEACON 0x4 > + u8 control; > + u8 ccfs0; > + u8 ccfs1; > + u8 minrate; > +} __packed; > > > Any objection to that? The names are getting _really_ long the way you > had them ... > Neat.. LGTM.. :) > FWIW, I also had a fix in ieee80211_he_oper_size() where the size of > the > oper is now sizeof(struct ieee80211_he_6ghz_oper). > > And this, to find it: > > +/** > + * ieee80211_he_6ghz_oper - obtain 6 GHz operation field > + * @he_oper: HE operation element (must be pre-validated for size) > + * but may be %NULL > + * > + * Return: a pointer to the 6 GHz operation field, or %NULL > + */ > +static inline const struct ieee80211_he_6ghz_oper * > +ieee80211_he_6ghz_oper(const struct ieee80211_he_operation *he_oper) > +{ > + const u8 *ret = (void *)&he_oper->optional; > + u32 he_oper_params; > + > + if (!he_oper) > + return NULL; > + > + he_oper_params = le32_to_cpu(he_oper->he_oper_params); > + > + if (!(he_oper_params & IEEE80211_HE_OPERATION_6GHZ_OP_INFO)) > + return NULL; > + if (he_oper_params & IEEE80211_HE_OPERATION_VHT_OPER_INFO) > + ret += 3; > + if (he_oper_params & IEEE80211_HE_OPERATION_CO_HOSTED_BSS) > + ret++; > + > + return (void *)ret; > +} > + > Great. > >> #define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895 0x00000000 >> #define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 0x00000001 >> @@ -1982,6 +2029,15 @@ int ieee80211_get_vht_max_nss(struct >> ieee80211_vht_cap *cap, >> #define IEEE80211_TX_RX_MCS_NSS_SUPP_TX_BITMAP_MASK 0x07c0 >> #define IEEE80211_TX_RX_MCS_NSS_SUPP_RX_BITMAP_MASK 0xf800 >> >> +/* 802.11ax HE 6 GHz Band Capability */ >> +#define IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START_SPACE_MASK GENMASK(2, >> 0) >> +#define >> IEEE80211_HE_6GHZ_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK GENMASK(5, 3) >> +#define IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LENGTH_MASK GENMASK(7, 6) >> +#define IEEE80211_HE_6GHZ_CAP_SMPS_MASK GENMASK(10, 9) >> +#define IEEE80211_HE_6GHZ_CAP_RD_RESP BIT(11) >> +#define IEEE80211_HE_6GHZ_CAP_RX_ANTENNA_PATTERN BIT(12) >> +#define IEEE80211_HE_6GHZ_CAP_TX_ANTENNA_PATTERN BIT(13) > > I don't like GENMASK() much ... but ok. FWIW, I had > Hope GENMASK defined in backports for older kernel. I started using this since ath11k. I feel GENMASK is more user readable and avoid masking errors. > +struct ieee80211_he_6ghz_capa { > + /* uses IEEE80211_HE_6GHZ_CAP_* below */ > + __le16 capa; > +} __packed; > + > +/* HE 6 GHz band capabilities */ > +/* uses enum ieee80211_min_mpdu_spacing values */ > +#define IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START 0x0007 > +/* uses enum ieee80211_vht_max_ampdu_length_exp values */ > +#define IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP 0x0038 > +/* uses IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_* values */ > +#define IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LEN 0x00c0 > +/* WLAN_HT_CAP_SM_PS_* values */ > +#define IEEE80211_HE_6GHZ_CAP_SM_PS_SHIFT 9 > +#define IEEE80211_HE_6GHZ_CAP_SM_PS 0x0600 > +#define IEEE80211_HE_6GHZ_CAP_RD_RESPONDER 0x0800 > +#define IEEE80211_HE_6GHZ_CAP_RX_ANTPAT_CONS 0x1000 > +#define IEEE80211_HE_6GHZ_CAP_TX_ANTPAT_CONS 0x2000 > > > again, just shorter names ... > I am fine with this.. Leave it to you. Cheers. -Rajkumar
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 16268ef1cbcc..77462dff6db3 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -1632,6 +1632,44 @@ struct ieee80211_he_mcs_nss_supp { } __packed; /** + * enum ieee80211_he_6ghz_chanwidth - HE 6 GHz channel width + * @IEEE80211_HE_6GHZ_CHANWIDTH_20MHZ: 20 MHz bandwidth + * @IEEE80211_HE_6GHZ_CHANWIDTH_40MHZ: 40 MHz bandwidth + * @IEEE80211_HE_6GHZ_CHANWIDTH_80MHZ: 80 MHz bandwidth + * @IEEE80211_HE_6GHZ_CHANWIDTH_80P80MHZ: 160 or 80+80 MHz bandwidth + */ +enum ieee80211_he_6ghz_chanwidth { + IEEE80211_HE_6GHZ_CHANWIDTH_20MHZ = 0, + IEEE80211_HE_6GHZ_CHANWIDTH_40MHZ = 1, + IEEE80211_HE_6GHZ_CHANWIDTH_80MHZ = 2, + IEEE80211_HE_6GHZ_CHANWIDTH_160MHZ_80P80MHZ = 3, +}; + +/** + * struct ieee80211_he_oper_6ghz_op_info - 6 GHz Operation Information + * + * This structure is defined as described in IEEE P802.11ax/D6.0, + * Figure 9-787k—6 GHz Operation Information field. + * + * @primary_chan: The channel number of the primary channel in the 6 GHz band. + * @control: First two bits defines channel width field indicates the BSS + * channel width and is set to 0 for 20 MHz, 1 for 40 MHz, 2 for 80 MHz, + * and 3 for 80+80 or 160 MHz. + * @center_freq_seg0_idx: Channel center frequency index for the 20 MHz, + * 40 MHz, or 80 MHz, or 80+80 MHz. + * @center_freq_seg1_idx: Channel center frequency index of the 160 MHz. + * @min_rate: Minimum rate, in units of 1 Mb/s, that the non-AP STA is allowed + * to use for sending PPDUs. + */ +struct ieee80211_he_oper_6ghz_op_info { + u8 primary_chan; + u8 control; + u8 center_freq_seg0_idx; + u8 center_freq_seg1_idx; + u8 min_rate; +} __packed; + +/** * struct ieee80211_he_operation - HE capabilities element * * This structure is the "HE operation element" fields as @@ -1682,6 +1720,15 @@ struct ieee80211_mu_edca_param_set { struct ieee80211_he_mu_edca_param_ac_rec ac_vo; } __packed; +/** + * struct ieee80211_he_6ghz_band_cap - HE 6 GHz Band Capabilities element + * + * This structure is defined as described in IEEE P802.11ax/D6.0, 9.4.2.261. + */ +struct ieee80211_he_6ghz_band_cap { + __le16 capab; +} __packed; + /* 802.11ac VHT Capabilities */ #define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895 0x00000000 #define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 0x00000001 @@ -1982,6 +2029,15 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap, #define IEEE80211_TX_RX_MCS_NSS_SUPP_TX_BITMAP_MASK 0x07c0 #define IEEE80211_TX_RX_MCS_NSS_SUPP_RX_BITMAP_MASK 0xf800 +/* 802.11ax HE 6 GHz Band Capability */ +#define IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START_SPACE_MASK GENMASK(2, 0) +#define IEEE80211_HE_6GHZ_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK GENMASK(5, 3) +#define IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LENGTH_MASK GENMASK(7, 6) +#define IEEE80211_HE_6GHZ_CAP_SMPS_MASK GENMASK(10, 9) +#define IEEE80211_HE_6GHZ_CAP_RD_RESP BIT(11) +#define IEEE80211_HE_6GHZ_CAP_RX_ANTENNA_PATTERN BIT(12) +#define IEEE80211_HE_6GHZ_CAP_TX_ANTENNA_PATTERN BIT(13) + /* TX/RX HE MCS Support field Highest MCS subfield encoding */ enum ieee80211_he_highest_mcs_supported_subfield_enc { HIGHEST_MCS_SUPPORTED_MCS7 = 0, @@ -2059,6 +2115,7 @@ ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info) #define IEEE80211_HE_OPERATION_BSS_COLOR_OFFSET 24 #define IEEE80211_HE_OPERATION_PARTIAL_BSS_COLOR 0x40000000 #define IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED 0x80000000 +#define IEEE80211_HE_OPERATION_6GHZ_OP_INFO_CTRL_CHAN_WIDTH 0x3 /* * ieee80211_he_oper_size - calculate 802.11ax HE Operations IE size
Define new structures for HE 6 GHz band capabilities as per IEEE P802.11ax/D6.0, 9.4.2.261 HE 6 GHz Band Capabilities element and 6 GHz Operation Information field of HE operation element (IEEE P802.11ax/D6.0, Figure 9-787k). Signed-off-by: Rajkumar Manoharan <rmanohar@codeaurora.org> --- include/linux/ieee80211.h | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+)