Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b546fb9 authored by Alexei Avshalom Lazar's avatar Alexei Avshalom Lazar Committed by Connor O'Brien
Browse files

BACKPORT: nl80211: Add support for EDMG channels 



802.11ay specification defines Enhanced Directional Multi-Gigabit
(EDMG) STA and AP which allow channel bonding of 2 channels and more.

Introduce new NL attributes that are needed for enabling and
configuring EDMG support.

Two new attributes are used by kernel to publish driver's EDMG
capabilities to the userspace:
NL80211_BAND_ATTR_EDMG_CHANNELS - bitmap field that indicates the 2.16
GHz channel(s) that are supported by the driver.
When this attribute is not set it means driver does not support EDMG.
NL80211_BAND_ATTR_EDMG_BW_CONFIG - represent the channel bandwidth
configurations supported by the driver.

Additional two new attributes are used by the userspace for connect
command and for AP configuration:
NL80211_ATTR_WIPHY_EDMG_CHANNELS
NL80211_ATTR_WIPHY_EDMG_BW_CONFIG

New rate info flag - RATE_INFO_FLAGS_EDMG, can be reported from driver
and used for bitrate calculation that will take into account EDMG
according to the 802.11ay specification.

Change-Id: I06d3f04d16b68d35c1dd9cd3624916302e8725a1
Signed-off-by: default avatarAlexei Avshalom Lazar <ailizaro@codeaurora.org>
Link: https://lore.kernel.org/r/1566138918-3823-2-git-send-email-ailizaro@codeaurora.org


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Git-commit: 2a38075cd0beefa4da326380cf54c7b365ddc035
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git


[ailizaro@codeaurora.org: fix conflict due to missing NLA policy]
Signed-off-by: default avatarAlexei Avshalom Lazar <ailizaro@codeaurora.org>
(cherry picked from commit afd697d0)
Bug: 150628559
Signed-off-by: default avatarConnor O'Brien <connoro@google.com>
parent b38208f0

drivers/net/wireless/ath/wil6210/cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,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;

include/net/cfg80211.h

+84 −2
Original line number Diff line number Diff line
@@ -320,6 +320,60 @@ struct ieee80211_sband_iftype_data { 
	struct ieee80211_sta_he_cap he_cap;

};



/**

 * enum ieee80211_edmg_bw_config - allowed channel bandwidth configurations

 *

 * @IEEE80211_EDMG_BW_CONFIG_4: 2.16GHz

 * @IEEE80211_EDMG_BW_CONFIG_5: 2.16GHz and 4.32GHz

 * @IEEE80211_EDMG_BW_CONFIG_6: 2.16GHz, 4.32GHz and 6.48GHz

 * @IEEE80211_EDMG_BW_CONFIG_7: 2.16GHz, 4.32GHz, 6.48GHz and 8.64GHz

 * @IEEE80211_EDMG_BW_CONFIG_8: 2.16GHz and 2.16GHz + 2.16GHz

 * @IEEE80211_EDMG_BW_CONFIG_9: 2.16GHz, 4.32GHz and 2.16GHz + 2.16GHz

 * @IEEE80211_EDMG_BW_CONFIG_10: 2.16GHz, 4.32GHz, 6.48GHz and 2.16GHz+2.16GHz

 * @IEEE80211_EDMG_BW_CONFIG_11: 2.16GHz, 4.32GHz, 6.48GHz, 8.64GHz and

 *	2.16GHz+2.16GHz

 * @IEEE80211_EDMG_BW_CONFIG_12: 2.16GHz, 2.16GHz + 2.16GHz and

 *	4.32GHz + 4.32GHz

 * @IEEE80211_EDMG_BW_CONFIG_13: 2.16GHz, 4.32GHz, 2.16GHz + 2.16GHz and

 *	4.32GHz + 4.32GHz

 * @IEEE80211_EDMG_BW_CONFIG_14: 2.16GHz, 4.32GHz, 6.48GHz, 2.16GHz + 2.16GHz

 *	and 4.32GHz + 4.32GHz

 * @IEEE80211_EDMG_BW_CONFIG_15: 2.16GHz, 4.32GHz, 6.48GHz, 8.64GHz,

 *	2.16GHz + 2.16GHz and 4.32GHz + 4.32GHz

 */

enum ieee80211_edmg_bw_config {

	IEEE80211_EDMG_BW_CONFIG_4	= 4,

	IEEE80211_EDMG_BW_CONFIG_5	= 5,

	IEEE80211_EDMG_BW_CONFIG_6	= 6,

	IEEE80211_EDMG_BW_CONFIG_7	= 7,

	IEEE80211_EDMG_BW_CONFIG_8	= 8,

	IEEE80211_EDMG_BW_CONFIG_9	= 9,

	IEEE80211_EDMG_BW_CONFIG_10	= 10,

	IEEE80211_EDMG_BW_CONFIG_11	= 11,

	IEEE80211_EDMG_BW_CONFIG_12	= 12,

	IEEE80211_EDMG_BW_CONFIG_13	= 13,

	IEEE80211_EDMG_BW_CONFIG_14	= 14,

	IEEE80211_EDMG_BW_CONFIG_15	= 15,

};



/**

 * struct ieee80211_edmg - EDMG configuration

 *

 * This structure describes most essential parameters needed

 * to describe 802.11ay EDMG configuration

 *

 * @channels: bitmap that indicates the 2.16 GHz channel(s)

 *	that are allowed to be used for transmissions.

 *	Bit 0 indicates channel 1, bit 1 indicates channel 2, etc.

 *	Set to 0 indicate EDMG not supported.

 * @bw_config: Channel BW Configuration subfield encodes

 *	the allowed channel bandwidth configurations

 */

struct ieee80211_edmg {

	u8 channels;

	enum ieee80211_edmg_bw_config bw_config;

};



/**

 * struct ieee80211_supported_band - frequency band definition

 *
@@ -336,6 +390,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 +405,7 @@ struct ieee80211_supported_band { 
	int n_bitrates;

	struct ieee80211_sta_ht_cap ht_cap;

	struct ieee80211_sta_vht_cap vht_cap;

	struct ieee80211_edmg edmg_cap;

	u16 n_iftype_data;

	const struct ieee80211_sband_iftype_data *iftype_data;

};
@@ -501,12 +557,17 @@ struct key_params { 
 * @center_freq1: center frequency of first segment

 * @center_freq2: center frequency of second segment

 *	(only with 80+80 MHz)

 * @edmg: define the EDMG channels configuration.

 *	If edmg is requested (i.e. the .channels member is non-zero),

 *	chan will define the primary channel and all other

 *	parameters are ignored.

 */

struct cfg80211_chan_def {

	struct ieee80211_channel *chan;

	enum nl80211_chan_width width;

	u32 center_freq1;

	u32 center_freq2;

	struct ieee80211_edmg edmg;

};



/**
@@ -564,6 +625,19 @@ cfg80211_chandef_identical(const struct cfg80211_chan_def *chandef1, 
		chandef1->center_freq2 == chandef2->center_freq2);

}



/**

 * cfg80211_chandef_is_edmg - check if chandef represents an EDMG channel

 *

 * @chandef: the channel definition

 *

 * Return: %true if EDMG defined, %false otherwise.

 */

static inline bool

cfg80211_chandef_is_edmg(const struct cfg80211_chan_def *chandef)

{

	return chandef->edmg.channels || chandef->edmg.bw_config;

}



/**

 * cfg80211_chandef_compatible - check if two channel definitions are compatible

 * @chandef1: first channel definition
@@ -1090,15 +1164,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),

};



/**
@@ -1138,6 +1214,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;
@@ -1148,6 +1225,7 @@ struct rate_info { 
	u8 he_gi;

	u8 he_dcm;

	u8 he_ru_alloc;

	u8 n_bonded_ch;

};



/**
@@ -2285,6 +2363,9 @@ 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: define the EDMG channels.

 *	This may specify multiple channels and bonding options for the driver

 *	to choose from, based on BSS configuration.

 */

struct cfg80211_connect_params {

	struct ieee80211_channel *channel;
@@ -2318,6 +2399,7 @@ struct cfg80211_connect_params { 
	const u8 *fils_erp_rrk;

	size_t fils_erp_rrk_len;

	bool want_1x;

	struct ieee80211_edmg edmg;

};



/**

include/uapi/linux/nl80211.h

+81 −0
Original line number Diff line number Diff line
@@ -52,6 +52,11 @@ 
#define NL80211_MULTICAST_GROUP_NAN		"nan"

#define NL80211_MULTICAST_GROUP_TESTMODE	"testmode"



#define NL80211_EDMG_BW_CONFIG_MIN	4

#define NL80211_EDMG_BW_CONFIG_MAX	15

#define NL80211_EDMG_CHANNELS_MIN	1

#define NL80211_EDMG_CHANNELS_MAX	0x3c /* 0b00111100 */



/**

 * DOC: Station handling

 *
@@ -2241,6 +2246,52 @@ enum nl80211_commands { 
 *	association request when used with NL80211_CMD_NEW_STATION). Can be set

 *	only if %NL80211_STA_FLAG_WME is set.

 *

 * @NL80211_ATTR_FTM_RESPONDER: nested attribute which user-space can include

 *      in %NL80211_CMD_START_AP or %NL80211_CMD_SET_BEACON for fine timing

 *      measurement (FTM) responder functionality and containing parameters as

 *      possible, see &enum nl80211_ftm_responder_attr

 *

 * @NL80211_ATTR_FTM_RESPONDER_STATS: Nested attribute with FTM responder

 *      statistics, see &enum nl80211_ftm_responder_stats.

 *

 * @NL80211_ATTR_TIMEOUT: Timeout for the given operation in milliseconds (u32),

 *      if the attribute is not given no timeout is requested. Note that 0 is an

 *      invalid value.

 *

 * @NL80211_ATTR_PEER_MEASUREMENTS: peer measurements request (and result)

 *      data, uses nested attributes specified in

 *      &enum nl80211_peer_measurement_attrs.

 *      This is also used for capability advertisement in the wiphy information,

 *      with the appropriate sub-attributes.

 *

 * @NL80211_ATTR_AIRTIME_WEIGHT: Station's weight when scheduled by the airtime

 *      scheduler.

 *

 * @NL80211_ATTR_STA_TX_POWER_SETTING: Transmit power setting type (u8) for

 *      station associated with the AP. See &enum nl80211_tx_power_setting for

 *      possible values.

 * @NL80211_ATTR_STA_TX_POWER: Transmit power level (s16) in dBm units. This

 *      allows to set Tx power for a station. If this attribute is not included,

 *      the default per-interface tx power setting will be overriding. Driver

 *      should be picking up the lowest tx power, either tx power per-interface

 *      or per-station.

 *

 * @NL80211_ATTR_SAE_PASSWORD: attribute for passing SAE password material. It

 *      is used with %NL80211_CMD_CONNECT to provide password for offloading

 *      SAE authentication for WPA3-Personal networks.

 *

 * @NL80211_ATTR_TWT_RESPONDER: Enable target wait time responder support.

 *

 * @NL80211_ATTR_HE_OBSS_PD: nested attribute for OBSS Packet Detection

 *      functionality.

 *

 * @NL80211_ATTR_WIPHY_EDMG_CHANNELS: bitmap that indicates the 2.16 GHz

 *      channel(s) that are allowed to be used for EDMG transmissions.

 *      Defined by IEEE P802.11ay/D4.0 section 9.4.2.251. (u8 attribute)

 * @NL80211_ATTR_WIPHY_EDMG_BW_CONFIG: Channel BW Configuration subfield encodes

 *      the allowed channel bandwidth configurations. (u8 attribute)

 *      Defined by IEEE P802.11ay/D4.0 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
@@ -2682,6 +2733,27 @@ enum nl80211_attrs { 


	NL80211_ATTR_HE_CAPABILITY,



	NL80211_ATTR_FTM_RESPONDER,



	NL80211_ATTR_FTM_RESPONDER_STATS,



	NL80211_ATTR_TIMEOUT,



	NL80211_ATTR_PEER_MEASUREMENTS,



	NL80211_ATTR_AIRTIME_WEIGHT,

	NL80211_ATTR_STA_TX_POWER_SETTING,

	NL80211_ATTR_STA_TX_POWER,



	NL80211_ATTR_SAE_PASSWORD,



	NL80211_ATTR_TWT_RESPONDER,



	NL80211_ATTR_HE_OBSS_PD,



	NL80211_ATTR_WIPHY_EDMG_CHANNELS,

	NL80211_ATTR_WIPHY_EDMG_BW_CONFIG,



	/* add attributes here, update the policy in nl80211.c */



	__NL80211_ATTR_AFTER_LAST,
@@ -3265,6 +3337,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.

 *      Defined by IEEE P802.11ay/D4.0 section 9.4.2.251.

 * @NL80211_BAND_ATTR_EDMG_BW_CONFIG: Channel BW Configuration subfield encodes

 *      the allowed channel bandwidth configurations.

 *      Defined by IEEE P802.11ay/D4.0 section 9.4.2.251, Table 13.

 * @NL80211_BAND_ATTR_MAX: highest band attribute currently defined

 * @__NL80211_BAND_ATTR_AFTER_LAST: internal use

 */
@@ -3282,6 +3360,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

net/mac80211/mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -160,10 +160,10 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, 
	memcpy(&sta_ht_cap, &sband->ht_cap, sizeof(sta_ht_cap));

	ieee80211_apply_htcap_overrides(sdata, &sta_ht_cap);



	memset(chandef, 0, sizeof(struct cfg80211_chan_def));

	chandef->chan = channel;

	chandef->width = NL80211_CHAN_WIDTH_20_NOHT;

	chandef->center_freq1 = channel->center_freq;

	chandef->center_freq2 = 0;



	if (!ht_oper || !sta_ht_cap.ht_supported) {

		ret = IEEE80211_STA_DISABLE_HT | IEEE80211_STA_DISABLE_VHT;

net/mac80211/status.c

+4 −0
Original line number Diff line number Diff line
@@ -264,6 +264,8 @@ static int ieee80211_tx_radiotap_len(struct ieee80211_tx_info *info) 
	/* IEEE80211_RADIOTAP_RATE rate */

	if (info->status.rates[0].idx >= 0 &&

	    !(info->status.rates[0].flags & (IEEE80211_TX_RC_MCS |

					     RATE_INFO_FLAGS_DMG |

					     RATE_INFO_FLAGS_EDMG |

					     IEEE80211_TX_RC_VHT_MCS)))

		len += 2;
@@ -315,6 +317,8 @@ ieee80211_add_tx_radiotap_header(struct ieee80211_local *local, 
	/* IEEE80211_RADIOTAP_RATE */

	if (info->status.rates[0].idx >= 0 &&

	    !(info->status.rates[0].flags & (IEEE80211_TX_RC_MCS |

					     RATE_INFO_FLAGS_DMG |

					     RATE_INFO_FLAGS_EDMG |

					     IEEE80211_TX_RC_VHT_MCS))) {

		u16 rate;