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

Commit e9105b30 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "BACKPORT: cfg80211: Squash of all 6GHz changes"

parents 96eb22e5 3290a981

android/abi_gki_aarch64_3f413d0ec7.xml

+1700 −2253

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_qcom

+2 −2
Original line number Diff line number Diff line
@@ -1082,8 +1082,8 @@ 
  idr_preload

  idr_remove

  idr_replace

  ieee80211_frequency_to_channel

  ieee80211_get_channel

  ieee80211_freq_khz_to_channel

  ieee80211_get_channel_khz

  ieee80211_hdrlen

  iget5_locked

  igrab

include/linux/ieee80211.h

+79 −1
Original line number Diff line number Diff line
@@ -2060,6 +2060,28 @@ ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info) 
#define IEEE80211_HE_OPERATION_PARTIAL_BSS_COLOR		0x40000000

#define IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED		0x80000000



/**

 * 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;



/*

 * ieee80211_he_oper_size - calculate 802.11ax HE Operations IE size

 * @he_oper_ie: byte data of the He Operations IE, stating from the the byte
@@ -2086,7 +2108,7 @@ ieee80211_he_oper_size(const u8 *he_oper_ie) 
	if (he_oper_params & IEEE80211_HE_OPERATION_CO_HOSTED_BSS)

		oper_len++;

	if (he_oper_params & IEEE80211_HE_OPERATION_6GHZ_OP_INFO)

		oper_len += 4;

		oper_len += sizeof(struct ieee80211_he_6ghz_oper);



	/* Add the first byte (extension ID) to the total length */

	oper_len++;
@@ -2094,6 +2116,34 @@ ieee80211_he_oper_size(const u8 *he_oper_ie) 
	return oper_len;

}



/**

 * 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;

}



/* HE Spatial Reuse defines */

#define IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT			0x4

#define IEEE80211_HE_SPR_SRG_INFORMATION_PRESENT		0x8
@@ -2553,9 +2603,19 @@ enum ieee80211_eid_ext { 
	WLAN_EID_EXT_UORA = 37,

	WLAN_EID_EXT_HE_MU_EDCA = 38,

	WLAN_EID_EXT_HE_SPR = 39,

	WLAN_EID_EXT_NDP_FEEDBACK_REPORT_PARAMSET = 41,

	WLAN_EID_EXT_BSS_COLOR_CHG_ANN = 42,

	WLAN_EID_EXT_QUIET_TIME_PERIOD_SETUP = 43,

	WLAN_EID_EXT_ESS_REPORT = 45,

	WLAN_EID_EXT_OPS = 46,

	WLAN_EID_EXT_HE_BSS_LOAD = 47,

	WLAN_EID_EXT_MAX_CHANNEL_SWITCH_TIME = 52,

	WLAN_EID_EXT_MULTIPLE_BSSID_CONFIGURATION = 55,

	WLAN_EID_EXT_NON_INHERITANCE = 56,

	WLAN_EID_EXT_KNOWN_BSSID = 57,

	WLAN_EID_EXT_SHORT_SSID_LIST = 58,

	WLAN_EID_EXT_HE_6GHZ_CAPA = 59,

	WLAN_EID_EXT_UL_MU_POWER_CAPA = 60,

};



/* Action category code */
@@ -3097,6 +3157,24 @@ struct ieee80211_tspec_ie { 
	__le16 medium_time;

} __packed;



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		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



/**

 * ieee80211_get_qos_ctl - get pointer to qos control bytes

 * @hdr: the frame

include/net/cfg80211.h

+126 −6
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ enum ieee80211_channel_flags { 
 * with cfg80211.

 *

 * @center_freq: center frequency in MHz

 * @freq_offset: offset from @center_freq, in KHz

 * @hw_value: hardware-specific value for the channel

 * @flags: channel flags from &enum ieee80211_channel_flags.

 * @orig_flags: channel flags at registration time, used by regulatory
@@ -153,6 +154,7 @@ enum ieee80211_channel_flags { 
struct ieee80211_channel {

	enum nl80211_band band;

	u32 center_freq;

	u16 freq_offset;

	u16 hw_value;

	u32 flags;

	int max_antenna_gain;
@@ -343,10 +345,13 @@ struct ieee80211_sta_he_cap { 
 *

 * @types_mask: interface types mask

 * @he_cap: holds the HE capabilities

 * @he_6ghz_capa: HE 6 GHz capabilities, must be filled in for a

 *	6 GHz band channel (and 0 may be valid value).

 */

struct ieee80211_sband_iftype_data {

	u16 types_mask;

	struct ieee80211_sta_he_cap he_cap;

	struct ieee80211_he_6ghz_capa he_6ghz_capa;

};



/**
@@ -498,6 +503,26 @@ ieee80211_get_he_sta_cap(const struct ieee80211_supported_band *sband) 
	return ieee80211_get_he_iftype_cap(sband, NL80211_IFTYPE_STATION);

}



/**

 * ieee80211_get_he_6ghz_capa - return HE 6 GHz capabilities

 * @sband: the sband to search for the STA on

 * @iftype: the iftype to search for

 *

 * Return: the 6GHz capabilities

 */

static inline __le16

ieee80211_get_he_6ghz_capa(const struct ieee80211_supported_band *sband,

			   enum nl80211_iftype iftype)

{

	const struct ieee80211_sband_iftype_data *data =

		ieee80211_get_sband_iftype_data(sband, iftype);



	if (WARN_ON(!data || !data->he_cap.has_he))

		return 0;



	return data->he_6ghz_capa.capa;

}



/**

 * wiphy_read_of_freq_limits - read frequency limits from device tree

 *
@@ -608,6 +633,7 @@ struct key_params { 
 *	If edmg is requested (i.e. the .channels member is non-zero),

 *	chan will define the primary channel and all other

 *	parameters are ignored.

 * @freq1_offset: offset from @center_freq1, in KHz

 */

struct cfg80211_chan_def {

	struct ieee80211_channel *chan;
@@ -615,6 +641,7 @@ struct cfg80211_chan_def { 
	u32 center_freq1;

	u32 center_freq2;

	struct ieee80211_edmg edmg;

	u16 freq1_offset;

};



/**
@@ -697,6 +724,7 @@ cfg80211_chandef_identical(const struct cfg80211_chan_def *chandef1, 
	return (chandef1->chan == chandef2->chan &&

		chandef1->width == chandef2->width &&

		chandef1->center_freq1 == chandef2->center_freq1 &&

		chandef1->freq1_offset == chandef2->freq1_offset &&

		chandef1->center_freq2 == chandef2->center_freq2);

}
@@ -1203,6 +1231,7 @@ struct sta_txpwr { 
 * @he_capa: HE capabilities of station

 * @he_capa_len: the length of the HE capabilities

 * @airtime_weight: airtime scheduler weight for this station

 * @he_6ghz_capa: HE 6 GHz Band capabilities of station

 */

struct station_parameters {

	const u8 *supported_rates;
@@ -1235,6 +1264,7 @@ struct station_parameters { 
	u8 he_capa_len;

	u16 airtime_weight;

	struct sta_txpwr txpwr;

	const struct ieee80211_he_6ghz_capa *he_6ghz_capa;

};



/**
@@ -5123,30 +5153,107 @@ static inline void *wdev_priv(struct wireless_dev *wdev) 
 * cfg80211 offers a number of utility functions that can be useful.

 */



/**

 * ieee80211_channel_equal - compare two struct ieee80211_channel

 *

 * @a: 1st struct ieee80211_channel

 * @b: 2nd struct ieee80211_channel

 * Return: true if center frequency of @a == @b

 */

static inline bool

ieee80211_channel_equal(struct ieee80211_channel *a,

			struct ieee80211_channel *b)

{

	return (a->center_freq == b->center_freq &&

		a->freq_offset == b->freq_offset);

}



/**

 * ieee80211_channel_to_khz - convert ieee80211_channel to frequency in KHz

 * @chan: struct ieee80211_channel to convert

 * Return: The corresponding frequency (in KHz)

 */

static inline u32

ieee80211_channel_to_khz(const struct ieee80211_channel *chan)

{

	return MHZ_TO_KHZ(chan->center_freq) + chan->freq_offset;

}



/**

 * ieee80211_channel_to_freq_khz - convert channel number to frequency

 * @chan: channel number

 * @band: band, necessary due to channel number overlap

 * Return: The corresponding frequency (in KHz), or 0 if the conversion failed.

 */

u32 ieee80211_channel_to_freq_khz(int chan, enum nl80211_band band);



/**

 * ieee80211_channel_to_frequency - convert channel number to frequency

 * @chan: channel number

 * @band: band, necessary due to channel number overlap

 * Return: The corresponding frequency (in MHz), or 0 if the conversion failed.

 */

int ieee80211_channel_to_frequency(int chan, enum nl80211_band band);

static inline int

ieee80211_channel_to_frequency(int chan, enum nl80211_band band)

{

	return KHZ_TO_MHZ(ieee80211_channel_to_freq_khz(chan, band));

}



/**

 * ieee80211_freq_khz_to_channel - convert frequency to channel number

 * @freq: center frequency in KHz

 * Return: The corresponding channel, or 0 if the conversion failed.

 */

int ieee80211_freq_khz_to_channel(u32 freq);



/**

 * ieee80211_frequency_to_channel - convert frequency to channel number

 * @freq: center frequency

 * @freq: center frequency in MHz

 * Return: The corresponding channel, or 0 if the conversion failed.

 */

int ieee80211_frequency_to_channel(int freq);

static inline int

ieee80211_frequency_to_channel(int freq)

{

	return ieee80211_freq_khz_to_channel(MHZ_TO_KHZ(freq));

}



/**

 * ieee80211_get_channel_khz - get channel struct from wiphy for specified

 * frequency

 * @wiphy: the struct wiphy to get the channel for

 * @freq: the center frequency (in KHz) of the channel

 * Return: The channel struct from @wiphy at @freq.

 */

struct ieee80211_channel *

ieee80211_get_channel_khz(struct wiphy *wiphy, u32 freq);



/**

 * ieee80211_get_channel - get channel struct from wiphy for specified frequency

 *

 * @wiphy: the struct wiphy to get the channel for

 * @freq: the center frequency of the channel

 *

 * @freq: the center frequency (in MHz) of the channel

 * Return: The channel struct from @wiphy at @freq.

 */

struct ieee80211_channel *ieee80211_get_channel(struct wiphy *wiphy, int freq);

static inline struct ieee80211_channel *

ieee80211_get_channel(struct wiphy *wiphy, int freq)

{

	return ieee80211_get_channel_khz(wiphy, MHZ_TO_KHZ(freq));

}



/**

 * cfg80211_channel_is_psc - Check if the channel is a 6 GHz PSC

 * @chan: control channel to check

 *

 * The Preferred Scanning Channels (PSC) are defined in

 * Draft IEEE P802.11ax/D5.0, 26.17.2.3.3

 */

static inline bool cfg80211_channel_is_psc(struct ieee80211_channel *chan)

{

	if (chan->band != NL80211_BAND_6GHZ)

		return false;



	return ieee80211_frequency_to_channel(chan->center_freq) % 16 == 5;

}



/**

 * ieee80211_get_response_rate - get basic rate for a given rate
@@ -7170,6 +7277,19 @@ bool ieee80211_operating_class_to_band(u8 operating_class, 
bool ieee80211_chandef_to_operating_class(struct cfg80211_chan_def *chandef,

					  u8 *op_class);



/**

 * ieee80211_chandef_to_khz - convert chandef to frequency in KHz

 *

 * @chandef: the chandef to convert

 *

 * Returns the center frequency of chandef (1st segment) in KHz.

 */

static inline u32

ieee80211_chandef_to_khz(const struct cfg80211_chan_def *chandef)

{

	return MHZ_TO_KHZ(chandef->center_freq1) + chandef->freq1_offset;

}



/*

 * cfg80211_tdls_oper_request - request userspace to perform TDLS operation

 * @dev: the device on which the operation is requested

include/uapi/linux/nl80211.h

+8 −0
Original line number Diff line number Diff line
@@ -2462,6 +2462,9 @@ enum nl80211_commands { 
 *	no roaming occurs between the reauth threshold and PMK expiration,

 *	disassociation is still forced.

 *

 * @NL80211_ATTR_HE_6GHZ_CAPABILITY: HE 6 GHz Band Capability element (from

 *	association request when used with NL80211_CMD_NEW_STATION).

 *

 * @NUM_NL80211_ATTR: total number of nl80211_attrs available

 * @NL80211_ATTR_MAX: highest attribute number currently defined

 * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2937,6 +2940,8 @@ enum nl80211_attrs { 
	NL80211_ATTR_PMK_LIFETIME,

	NL80211_ATTR_PMK_REAUTH_THRESHOLD,



	NL80211_ATTR_HE_6GHZ_CAPABILITY,



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



	__NL80211_ATTR_AFTER_LAST,
@@ -3515,6 +3520,8 @@ enum nl80211_mpath_info { 
 *     defined in HE capabilities IE

 * @NL80211_BAND_IFTYPE_ATTR_MAX: highest band HE capability attribute currently

 *     defined

 * @NL80211_BAND_IFTYPE_ATTR_HE_6GHZ_CAPA: HE 6GHz band capabilities (__le16),

 *	given for all 6 GHz band channels

 * @__NL80211_BAND_IFTYPE_ATTR_AFTER_LAST: internal use

 */

enum nl80211_band_iftype_attr {
@@ -3525,6 +3532,7 @@ enum nl80211_band_iftype_attr { 
	NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY,

	NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET,

	NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE,

	NL80211_BAND_IFTYPE_ATTR_HE_6GHZ_CAPA,



	/* keep last */

	__NL80211_BAND_IFTYPE_ATTR_AFTER_LAST,