* [PATCH v3 1/9] mac80211: add power type definition for 6 GHz
2021-09-03 11:48 [PATCH v3 0/9] cfg80211/mac80211: Add support for 6GHZ STA for various modes : LPI, SP and VLP Wen Gong
@ 2021-09-03 11:48 ` Wen Gong
2021-09-03 11:48 ` [PATCH v3 2/9] ieee80211: add definition of regulatory info in 6 GHz operation information Wen Gong
` (7 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Wen Gong @ 2021-09-03 11:48 UTC (permalink / raw)
To: johannes, ath11k; +Cc: linux-wireless, wgong
6 GHz regulatory domains introduces different modes for 6 GHz AP
operations Low Power Indoor(LPI), Standard Power(SP) and Very Low
Power(VLP). 6 GHz STAs could be operated as either Regular or
Subordinate clients. This patch is define the flags for power type
of AP and STATION mode.
Signed-off-by: Wen Gong <wgong@codeaurora.org>
---
include/linux/ieee80211.h | 34 ++++++++++++++++++++++++++++++++++
include/net/mac80211.h | 2 ++
2 files changed, 36 insertions(+)
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 68d8b9cdd3b8..2bab84297407 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -1942,6 +1942,40 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,
int mcs, bool ext_nss_bw_capable,
unsigned int max_vht_nss);
+/**
+ * enum ieee80211_ap_reg_power - regulatory power for a Access Point
+ *
+ * @IEEE80211_REG_UNSET_AP: Access Point has no regulatory power mode
+ * @IEEE80211_REG_LPI: Indoor Access Point
+ * @IEEE80211_REG_SP: Standard power Access Point
+ * @IEEE80211_REG_VLP: Very low power Access Point
+ */
+enum ieee80211_ap_reg_power {
+ IEEE80211_REG_UNSET_AP,
+ IEEE80211_REG_LPI_AP,
+ IEEE80211_REG_SP_AP,
+ IEEE80211_REG_VLP_AP,
+ IEEE80211_REG_AP_POWER_AFTER_LAST,
+ IEEE80211_REG_AP_POWER_MAX =
+ IEEE80211_REG_AP_POWER_AFTER_LAST - 1,
+};
+
+/**
+ * enum ieee80211_client_reg_power - regulatory power for a client
+ *
+ * @IEEE80211_REG_UNSET_CLIENT: Client has no regulatory power mode
+ * @IEEE80211_REG_DEFAULT_CLIENT: Default Client
+ * @IEEE80211_REG_SUBORDINATE_CLIENT: Subordinate Client
+ */
+enum ieee80211_client_reg_power {
+ IEEE80211_REG_UNSET_CLIENT,
+ IEEE80211_REG_DEFAULT_CLIENT,
+ IEEE80211_REG_SUBORDINATE_CLIENT,
+ IEEE80211_REG_CLIENT_POWER_AFTER_LAST,
+ IEEE80211_REG_CLIENT_POWER_MAX =
+ IEEE80211_REG_CLIENT_POWER_AFTER_LAST - 1,
+};
+
/* 802.11ax HE MAC capabilities */
#define IEEE80211_HE_MAC_CAP0_HTC_HE 0x01
#define IEEE80211_HE_MAC_CAP0_TWT_REQ 0x02
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index e89530d0d9c6..d0522d7f3351 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -631,6 +631,7 @@ struct ieee80211_fils_discovery {
* @s1g: BSS is S1G BSS (affects Association Request format).
* @beacon_tx_rate: The configured beacon transmit rate that needs to be passed
* to driver when rate control is offloaded to firmware.
+ * @power_type: power type of BSS for 6 GHz
*/
struct ieee80211_bss_conf {
const u8 *bssid;
@@ -700,6 +701,7 @@ struct ieee80211_bss_conf {
u32 unsol_bcast_probe_resp_interval;
bool s1g;
struct cfg80211_bitrate_mask beacon_tx_rate;
+ enum ieee80211_ap_reg_power power_type;
};
/**
--
2.31.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 2/9] ieee80211: add definition of regulatory info in 6 GHz operation information
2021-09-03 11:48 [PATCH v3 0/9] cfg80211/mac80211: Add support for 6GHZ STA for various modes : LPI, SP and VLP Wen Gong
2021-09-03 11:48 ` [PATCH v3 1/9] mac80211: add power type definition for 6 GHz Wen Gong
@ 2021-09-03 11:48 ` Wen Gong
2021-09-03 11:48 ` [PATCH v3 3/9] mac80211: add parse " Wen Gong
` (6 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Wen Gong @ 2021-09-03 11:48 UTC (permalink / raw)
To: johannes, ath11k; +Cc: linux-wireless, wgong
IEEE Std 802.11ax™-2021 added regulatory info subfield in HE operation
element, this patch is to add it in mac80211 definition.
Signed-off-by: Wen Gong <wgong@codeaurora.org>
---
include/linux/ieee80211.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 2bab84297407..bed510b7bb6b 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -2298,6 +2298,9 @@ 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
+#define IEEE80211_6GHZ_CTRL_REG_LPI_AP 0
+#define IEEE80211_6GHZ_CTRL_REG_SP_AP 1
+
/**
* ieee80211_he_6ghz_oper - HE 6 GHz operation Information field
* @primary: primary channel
@@ -2314,6 +2317,7 @@ struct ieee80211_he_6ghz_oper {
#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
+#define IEEE80211_HE_6GHZ_OPER_CTRL_REG_INFO 0x38
u8 control;
u8 ccfs0;
u8 ccfs1;
--
2.31.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 3/9] mac80211: add parse regulatory info in 6 GHz operation information
2021-09-03 11:48 [PATCH v3 0/9] cfg80211/mac80211: Add support for 6GHZ STA for various modes : LPI, SP and VLP Wen Gong
2021-09-03 11:48 ` [PATCH v3 1/9] mac80211: add power type definition for 6 GHz Wen Gong
2021-09-03 11:48 ` [PATCH v3 2/9] ieee80211: add definition of regulatory info in 6 GHz operation information Wen Gong
@ 2021-09-03 11:48 ` Wen Gong
2021-09-03 11:48 ` [PATCH v3 4/9] cfg80211: add definition for 6 GHz power spectral density(psd) Wen Gong
` (5 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Wen Gong @ 2021-09-03 11:48 UTC (permalink / raw)
To: johannes, ath11k; +Cc: linux-wireless, wgong
This patch is to convert the regulatory info subfield in HE operation
element to power type and save in struct cfg80211_chan_def.
Signed-off-by: Wen Gong <wgong@codeaurora.org>
---
net/mac80211/util.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 93d96a4f9c3e..04f2ba530d4f 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -3352,6 +3352,7 @@ bool ieee80211_chandef_he_6ghz_oper(struct ieee80211_sub_if_data *sdata,
const struct ieee80211_sta_he_cap *he_cap;
struct cfg80211_chan_def he_chandef = *chandef;
const struct ieee80211_he_6ghz_oper *he_6ghz_oper;
+ struct ieee80211_bss_conf *bss_conf;
bool support_80_80, support_160;
u8 he_phy_cap;
u32 freq;
@@ -3395,6 +3396,18 @@ bool ieee80211_chandef_he_6ghz_oper(struct ieee80211_sub_if_data *sdata,
NL80211_BAND_6GHZ);
he_chandef.chan = ieee80211_get_channel(sdata->local->hw.wiphy, freq);
+ bss_conf = &sdata->vif.bss_conf;
+
+ switch (u8_get_bits(he_6ghz_oper->control,
+ IEEE80211_HE_6GHZ_OPER_CTRL_REG_INFO)) {
+ case IEEE80211_6GHZ_CTRL_REG_LPI_AP:
+ bss_conf->power_type = IEEE80211_REG_LPI_AP;
+ break;
+ case IEEE80211_6GHZ_CTRL_REG_SP_AP:
+ bss_conf->power_type = IEEE80211_REG_SP_AP;
+ break;
+ }
+
switch (u8_get_bits(he_6ghz_oper->control,
IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH)) {
case IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_20MHZ:
--
2.31.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 4/9] cfg80211: add definition for 6 GHz power spectral density(psd)
2021-09-03 11:48 [PATCH v3 0/9] cfg80211/mac80211: Add support for 6GHZ STA for various modes : LPI, SP and VLP Wen Gong
` (2 preceding siblings ...)
2021-09-03 11:48 ` [PATCH v3 3/9] mac80211: add parse " Wen Gong
@ 2021-09-03 11:48 ` Wen Gong
2021-09-03 11:48 ` [PATCH v3 5/9] cfg80211: save power spectral density(psd) of regulatory rule Wen Gong
` (4 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Wen Gong @ 2021-09-03 11:48 UTC (permalink / raw)
To: johannes, ath11k; +Cc: linux-wireless, wgong
6 GHz regulatory domains introduces power spectral density(psd). This
patch is define the flags for psd.
Signed-off-by: Wen Gong <wgong@codeaurora.org>
---
include/net/cfg80211.h | 5 +++++
include/net/regulatory.h | 1 +
include/uapi/linux/nl80211.h | 2 ++
3 files changed, 8 insertions(+)
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 58c2cd417e89..a03a0b84b44e 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -108,6 +108,8 @@ struct wiphy;
* on this channel.
* @IEEE80211_CHAN_16MHZ: 16 MHz bandwidth is permitted
* on this channel.
+ * @IEEE80211_CHAN_PSD: power spectral density (in dBm)
+ * on this channel.
*
*/
enum ieee80211_channel_flags {
@@ -130,6 +132,7 @@ enum ieee80211_channel_flags {
IEEE80211_CHAN_4MHZ = 1<<16,
IEEE80211_CHAN_8MHZ = 1<<17,
IEEE80211_CHAN_16MHZ = 1<<18,
+ IEEE80211_CHAN_PSD = 1<<19,
};
#define IEEE80211_CHAN_NO_HT40 \
@@ -163,6 +166,7 @@ enum ieee80211_channel_flags {
* on this channel.
* @dfs_state_entered: timestamp (jiffies) when the dfs state was entered.
* @dfs_cac_ms: DFS CAC time in milliseconds, this is valid for DFS channels.
+ * @psd: power spectral density (in dBm)
*/
struct ieee80211_channel {
enum nl80211_band band;
@@ -179,6 +183,7 @@ struct ieee80211_channel {
enum nl80211_dfs_state dfs_state;
unsigned long dfs_state_entered;
unsigned int dfs_cac_ms;
+ s8 psd;
};
/**
diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index 47f06f6f5a67..ed20004fb6a9 100644
--- a/include/net/regulatory.h
+++ b/include/net/regulatory.h
@@ -221,6 +221,7 @@ struct ieee80211_reg_rule {
u32 flags;
u32 dfs_cac_ms;
bool has_wmm;
+ s8 psd;
};
struct ieee80211_regdomain {
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index f962c06e9818..78b0f3a6cc13 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -4043,6 +4043,7 @@ enum nl80211_sched_scan_match_attr {
* @NL80211_RRF_NO_80MHZ: 80MHz operation not allowed
* @NL80211_RRF_NO_160MHZ: 160MHz operation not allowed
* @NL80211_RRF_NO_HE: HE operation not allowed
+ * @NL80211_RRF_PSD: channels has power spectral density value
*/
enum nl80211_reg_rule_flags {
NL80211_RRF_NO_OFDM = 1<<0,
@@ -4061,6 +4062,7 @@ enum nl80211_reg_rule_flags {
NL80211_RRF_NO_80MHZ = 1<<15,
NL80211_RRF_NO_160MHZ = 1<<16,
NL80211_RRF_NO_HE = 1<<17,
+ NL80211_RRF_PSD = 1<<18,
};
#define NL80211_RRF_PASSIVE_SCAN NL80211_RRF_NO_IR
--
2.31.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 5/9] cfg80211: save power spectral density(psd) of regulatory rule
2021-09-03 11:48 [PATCH v3 0/9] cfg80211/mac80211: Add support for 6GHZ STA for various modes : LPI, SP and VLP Wen Gong
` (3 preceding siblings ...)
2021-09-03 11:48 ` [PATCH v3 4/9] cfg80211: add definition for 6 GHz power spectral density(psd) Wen Gong
@ 2021-09-03 11:48 ` Wen Gong
2021-09-03 11:48 ` [PATCH v3 6/9] ieee80211: add definition for transmit power envelope element Wen Gong
` (3 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Wen Gong @ 2021-09-03 11:48 UTC (permalink / raw)
To: johannes, ath11k; +Cc: linux-wireless, wgong
The power spectral density(psd) of regulatory rule should be take
effect to the channels. This patch is to save the values to the
channel which has psd value.
Signed-off-by: Wen Gong <wgong@codeaurora.org>
---
net/wireless/reg.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 0406ce7334fa..a971d97aaf12 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1583,6 +1583,8 @@ static u32 map_regdom_flags(u32 rd_flags)
channel_flags |= IEEE80211_CHAN_NO_160MHZ;
if (rd_flags & NL80211_RRF_NO_HE)
channel_flags |= IEEE80211_CHAN_NO_HE;
+ if (rd_flags & NL80211_RRF_PSD)
+ channel_flags |= IEEE80211_CHAN_PSD;
return channel_flags;
}
@@ -1787,6 +1789,9 @@ static void handle_channel_single_rule(struct wiphy *wiphy,
chan->dfs_cac_ms = reg_rule->dfs_cac_ms;
}
+ if (chan->flags & IEEE80211_CHAN_PSD)
+ chan->psd = reg_rule->psd;
+
return;
}
@@ -1807,6 +1812,9 @@ static void handle_channel_single_rule(struct wiphy *wiphy,
chan->dfs_cac_ms = IEEE80211_DFS_MIN_CAC_TIME_MS;
}
+ if (chan->flags & IEEE80211_CHAN_PSD)
+ chan->psd = reg_rule->psd;
+
if (chan->orig_mpwr) {
/*
* Devices that use REGULATORY_COUNTRY_IE_FOLLOW_POWER
@@ -1876,6 +1884,12 @@ static void handle_channel_adjacent_rules(struct wiphy *wiphy,
rrule2->dfs_cac_ms);
}
+ if ((rrule1->flags & NL80211_RRF_PSD) &&
+ (rrule2->flags & NL80211_RRF_PSD))
+ chan->psd = min_t(s8, rrule1->psd, rrule2->psd);
+ else
+ chan->flags &= ~NL80211_RRF_PSD;
+
return;
}
@@ -2533,6 +2547,9 @@ static void handle_channel_custom(struct wiphy *wiphy,
chan->dfs_cac_ms = IEEE80211_DFS_MIN_CAC_TIME_MS;
}
+ if (chan->flags & IEEE80211_CHAN_PSD)
+ chan->psd = reg_rule->psd;
+
chan->max_power = chan->max_reg_power;
}
--
2.31.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 6/9] ieee80211: add definition for transmit power envelope element
2021-09-03 11:48 [PATCH v3 0/9] cfg80211/mac80211: Add support for 6GHZ STA for various modes : LPI, SP and VLP Wen Gong
` (4 preceding siblings ...)
2021-09-03 11:48 ` [PATCH v3 5/9] cfg80211: save power spectral density(psd) of regulatory rule Wen Gong
@ 2021-09-03 11:48 ` Wen Gong
2021-09-03 11:48 ` [PATCH v3 7/9] mac80211: add parse " Wen Gong
` (2 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Wen Gong @ 2021-09-03 11:48 UTC (permalink / raw)
To: johannes, ath11k; +Cc: linux-wireless, wgong
IEEE Std 802.11ax™-2021 have some change for transmit power envelope
element. Add the definition of it.
Signed-off-by: Wen Gong <wgong@codeaurora.org>
---
include/linux/ieee80211.h | 42 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 41 insertions(+), 1 deletion(-)
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index bed510b7bb6b..b35cdfae0625 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -2324,6 +2324,46 @@ struct ieee80211_he_6ghz_oper {
u8 minrate;
} __packed;
+/*
+ * In "9.4.2.161 Transmit Power Envelope element" of
+ * "IEEE Std 802.11ax-2021", it show 4 types in "Table
+ * 9-275a-Maximum Transmit Power Interpretation subfield encoding".
+ * And it has 2 category for each type in "Table E-12-Regulatory
+ * Info subfield encoding in the United States".
+ * So it it totally max 8 Transmit Power Envelope element.
+ */
+#define IEEE80211_TPE_MAX_IE_COUNT 8
+
+/*
+ * In "Table 9-277 Meaning of Maximum Transmit Power Count subfield"
+ * of "IEEE Std 802.11ax-2021", the max power level is 8.
+ */
+#define IEEE80211_MAX_NUM_PWR_LEVEL 8
+
+#define IEEE80211_TPE_MAX_POWER_COUNT 8
+
+/* transmit power interpretation type of transmit power envelope element*/
+enum ieee80211_tx_power_intrpt_type {
+ IEEE80211_TPE_LOCAL_EIRP,
+ IEEE80211_TPE_LOCAL_EIRP_PSD,
+ IEEE80211_TPE_REG_CLIENT_EIRP,
+ IEEE80211_TPE_REG_CLIENT_EIRP_PSD,
+};
+
+/*
+ * struct ieee80211_tx_pwr_env
+ *
+ * This structure represents the "Transmit Power Envelope element"
+ */
+struct ieee80211_tx_pwr_env {
+ u8 tx_power_info;
+ s8 tx_power[IEEE80211_TPE_MAX_POWER_COUNT];
+} __packed;
+
+#define IEEE80211_TX_PWR_ENV_INFO_COUNT 0x7
+#define IEEE80211_TX_PWR_ENV_INFO_INTERPRET 0x38
+#define IEEE80211_TX_PWR_ENV_INFO_CATEGORY 0xC0
+
/*
* ieee80211_he_oper_size - calculate 802.11ax HE Operations IE size
* @he_oper_ie: byte data of the He Operations IE, stating from the byte
@@ -2905,7 +2945,7 @@ enum ieee80211_eid {
WLAN_EID_VHT_OPERATION = 192,
WLAN_EID_EXTENDED_BSS_LOAD = 193,
WLAN_EID_WIDE_BW_CHANNEL_SWITCH = 194,
- WLAN_EID_VHT_TX_POWER_ENVELOPE = 195,
+ WLAN_EID_TX_POWER_ENVELOPE = 195,
WLAN_EID_CHANNEL_SWITCH_WRAPPER = 196,
WLAN_EID_AID = 197,
WLAN_EID_QUIET_CHANNEL = 198,
--
2.31.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 7/9] mac80211: add parse transmit power envelope element
2021-09-03 11:48 [PATCH v3 0/9] cfg80211/mac80211: Add support for 6GHZ STA for various modes : LPI, SP and VLP Wen Gong
` (5 preceding siblings ...)
2021-09-03 11:48 ` [PATCH v3 6/9] ieee80211: add definition for transmit power envelope element Wen Gong
@ 2021-09-03 11:48 ` Wen Gong
2021-09-03 11:48 ` [PATCH v3 8/9] mac80211: use ieee802_11_parse_elems() to find ies instead of ieee80211_bss_get_ie() Wen Gong
2021-09-03 11:48 ` [PATCH v3 9/9] mac80211: save transmit power envelope element and power constraint Wen Gong
8 siblings, 0 replies; 11+ messages in thread
From: Wen Gong @ 2021-09-03 11:48 UTC (permalink / raw)
To: johannes, ath11k; +Cc: linux-wireless, wgong
The transmit power envelope elements in beacon is used to calculate
the power limit by lower driver, and sometimes it has more than
one elements in a beacon frame.
This is to add parse the transmit power envelope elements, then it
will be saved and transfer to lower driver to calculate the power
limit.
Signed-off-by: Wen Gong <wgong@codeaurora.org>
---
net/mac80211/ieee80211_i.h | 3 +++
net/mac80211/util.c | 10 ++++++++++
2 files changed, 13 insertions(+)
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 648696b49f89..bb62de5e3758 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1494,6 +1494,7 @@ struct ieee802_11_elems {
const struct ieee80211_he_spr *he_spr;
const struct ieee80211_mu_edca_param_set *mu_edca_param_set;
const struct ieee80211_he_6ghz_capa *he_6ghz_capa;
+ const struct ieee80211_tx_pwr_env *tx_pwr_env[IEEE80211_TPE_MAX_IE_COUNT];
const u8 *uora_element;
const u8 *mesh_id;
const u8 *peering;
@@ -1544,6 +1545,8 @@ struct ieee802_11_elems {
u8 perr_len;
u8 country_elem_len;
u8 bssid_index_len;
+ u8 tx_pwr_env_len[IEEE80211_TPE_MAX_IE_COUNT];
+ u8 tx_pwr_env_num;
/* whether a parse error occurred while retrieving these elements */
bool parse_error;
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 04f2ba530d4f..c94ba3221086 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1336,6 +1336,16 @@ _ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action,
elems->rsnx = pos;
elems->rsnx_len = elen;
break;
+ case WLAN_EID_TX_POWER_ENVELOPE:
+ if (elems->tx_pwr_env_num >= ARRAY_SIZE(elems->tx_pwr_env) ||
+ elen < 1 ||
+ elen > sizeof(elems->tx_pwr_env[0]))
+ break;
+
+ elems->tx_pwr_env[elems->tx_pwr_env_num] = (void *)pos;
+ elems->tx_pwr_env_len[elems->tx_pwr_env_num] = elen;
+ elems->tx_pwr_env_num++;
+ break;
case WLAN_EID_EXTENSION:
ieee80211_parse_extension_element(calc_crc ?
&crc : NULL,
--
2.31.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 8/9] mac80211: use ieee802_11_parse_elems() to find ies instead of ieee80211_bss_get_ie()
2021-09-03 11:48 [PATCH v3 0/9] cfg80211/mac80211: Add support for 6GHZ STA for various modes : LPI, SP and VLP Wen Gong
` (6 preceding siblings ...)
2021-09-03 11:48 ` [PATCH v3 7/9] mac80211: add parse " Wen Gong
@ 2021-09-03 11:48 ` Wen Gong
2021-09-23 8:25 ` Wen Gong
2021-09-03 11:48 ` [PATCH v3 9/9] mac80211: save transmit power envelope element and power constraint Wen Gong
8 siblings, 1 reply; 11+ messages in thread
From: Wen Gong @ 2021-09-03 11:48 UTC (permalink / raw)
To: johannes, ath11k; +Cc: linux-wireless, wgong
In function ieee80211_prep_channel(), it has some ieee80211_bss_get_ie()
and cfg80211_find_ext_ie() to get the IE, this is to use another
function ieee802_11_parse_elems() to get all the IEs in one time.
Signed-off-by: Wen Gong <wgong@codeaurora.org>
---
net/mac80211/mlme.c | 40 ++++++++++++++++++++++++----------------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 2480bd0577bb..6b32cdd590cd 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -5001,10 +5001,22 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
bool is_6ghz = cbss->channel->band == NL80211_BAND_6GHZ;
bool is_5ghz = cbss->channel->band == NL80211_BAND_5GHZ;
struct ieee80211_bss *bss = (void *)cbss->priv;
+ struct ieee802_11_elems *elems;
+ const struct cfg80211_bss_ies *ies;
int ret;
u32 i;
bool have_80mhz;
+ elems = kzalloc(sizeof(*elems), GFP_KERNEL);
+ if (!elems)
+ return -ENOMEM;
+
+ rcu_read_lock();
+
+ ies = rcu_dereference(cbss->ies);
+ ieee802_11_parse_elems(ies->data, ies->len, false, elems,
+ NULL, NULL);
+
sband = local->hw.wiphy->bands[cbss->channel->band];
ifmgd->flags &= ~(IEEE80211_STA_DISABLE_40MHZ |
@@ -5026,16 +5038,14 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
if (!ieee80211_get_he_sta_cap(sband))
ifmgd->flags |= IEEE80211_STA_DISABLE_HE;
- rcu_read_lock();
-
if (!(ifmgd->flags & IEEE80211_STA_DISABLE_HT) && !is_6ghz) {
const u8 *ht_oper_ie, *ht_cap_ie;
- ht_oper_ie = ieee80211_bss_get_ie(cbss, WLAN_EID_HT_OPERATION);
+ ht_oper_ie = ((const u8 *)elems->ht_operation) - 2;
if (ht_oper_ie && ht_oper_ie[1] >= sizeof(*ht_oper))
ht_oper = (void *)(ht_oper_ie + 2);
- ht_cap_ie = ieee80211_bss_get_ie(cbss, WLAN_EID_HT_CAPABILITY);
+ ht_cap_ie = ((const u8 *)elems->ht_cap_elem) - 2;
if (ht_cap_ie && ht_cap_ie[1] >= sizeof(*ht_cap))
ht_cap = (void *)(ht_cap_ie + 2);
@@ -5048,8 +5058,7 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
if (!(ifmgd->flags & IEEE80211_STA_DISABLE_VHT) && !is_6ghz) {
const u8 *vht_oper_ie, *vht_cap;
- vht_oper_ie = ieee80211_bss_get_ie(cbss,
- WLAN_EID_VHT_OPERATION);
+ vht_oper_ie = ((const u8 *)elems->vht_operation) - 2;
if (vht_oper_ie && vht_oper_ie[1] >= sizeof(*vht_oper))
vht_oper = (void *)(vht_oper_ie + 2);
if (vht_oper && !ht_oper) {
@@ -5061,7 +5070,7 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
ifmgd->flags |= IEEE80211_STA_DISABLE_HE;
}
- vht_cap = ieee80211_bss_get_ie(cbss, WLAN_EID_VHT_CAPABILITY);
+ vht_cap = ((const u8 *)elems->vht_cap_elem) - 2;
if (!vht_cap || vht_cap[1] < sizeof(struct ieee80211_vht_cap)) {
ifmgd->flags |= IEEE80211_STA_DISABLE_VHT;
vht_oper = NULL;
@@ -5069,12 +5078,9 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
}
if (!(ifmgd->flags & IEEE80211_STA_DISABLE_HE)) {
- const struct cfg80211_bss_ies *ies;
const u8 *he_oper_ie;
- ies = rcu_dereference(cbss->ies);
- he_oper_ie = cfg80211_find_ext_ie(WLAN_EID_EXT_HE_OPERATION,
- ies->data, ies->len);
+ he_oper_ie = ((const u8 *)elems->he_operation) - 3;
if (he_oper_ie &&
he_oper_ie[1] >= ieee80211_he_oper_size(&he_oper_ie[3]))
he_oper = (void *)(he_oper_ie + 3);
@@ -5102,8 +5108,7 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
if (sband->band == NL80211_BAND_S1GHZ) {
const u8 *s1g_oper_ie;
- s1g_oper_ie = ieee80211_bss_get_ie(cbss,
- WLAN_EID_S1G_OPERATION);
+ s1g_oper_ie = ((const u8 *)elems->s1g_oper) - 2;
if (s1g_oper_ie && s1g_oper_ie[1] >= sizeof(*s1g_oper))
s1g_oper = (void *)(s1g_oper_ie + 2);
else
@@ -5125,7 +5130,8 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
if (ifmgd->flags & IEEE80211_STA_DISABLE_HE && is_6ghz) {
sdata_info(sdata, "Rejecting non-HE 6/7 GHz connection");
- return -EINVAL;
+ ret = -EINVAL;
+ goto out_no_lock;
}
/* will change later if needed */
@@ -5143,15 +5149,17 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
/* don't downgrade for 5 and 10 MHz channels, though. */
if (chandef.width == NL80211_CHAN_WIDTH_5 ||
chandef.width == NL80211_CHAN_WIDTH_10)
- goto out;
+ goto out_lock;
while (ret && chandef.width != NL80211_CHAN_WIDTH_20_NOHT) {
ifmgd->flags |= ieee80211_chandef_downgrade(&chandef);
ret = ieee80211_vif_use_channel(sdata, &chandef,
IEEE80211_CHANCTX_SHARED);
}
- out:
+ out_lock:
mutex_unlock(&local->mtx);
+ out_no_lock:
+ kfree(elems);
return ret;
}
--
2.31.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v3 8/9] mac80211: use ieee802_11_parse_elems() to find ies instead of ieee80211_bss_get_ie()
2021-09-03 11:48 ` [PATCH v3 8/9] mac80211: use ieee802_11_parse_elems() to find ies instead of ieee80211_bss_get_ie() Wen Gong
@ 2021-09-23 8:25 ` Wen Gong
0 siblings, 0 replies; 11+ messages in thread
From: Wen Gong @ 2021-09-23 8:25 UTC (permalink / raw)
To: johannes, ath11k; +Cc: linux-wireless
Hi Johannes,
This patch need a new version for fix the issue of NULL pointer it
exist.
You can review others:)
The change I will add in new version is like below.
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 0ebf6ae6dd525f..bee2a3f3bbc161 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -5026,11 +5026,15 @@ static int ieee80211_prep_channel(struct
ieee80211_sub_if_data *sdata,
if (!(ifmgd->flags & IEEE80211_STA_DISABLE_HT) && !is_6ghz) {
const u8 *ht_oper_ie, *ht_cap_ie;
- ht_oper_ie = ((const u8 *)elems->ht_operation) - 2;
+ ht_oper_ie = elems->ht_operation ?
+ ((const u8 *)elems->ht_operation) - 2 :
+ NULL;
if (ht_oper_ie && ht_oper_ie[1] >= sizeof(*ht_oper))
ht_oper = (void *)(ht_oper_ie + 2);
- ht_cap_ie = ((const u8 *)elems->ht_cap_elem) - 2;
+ ht_cap_ie = elems->ht_cap_elem ?
+ ((const u8 *)elems->ht_cap_elem) - 2 :
+ NULL;
if (ht_cap_ie && ht_cap_ie[1] >= sizeof(*ht_cap))
ht_cap = (void *)(ht_cap_ie + 2);
@@ -5043,7 +5047,9 @@ static int ieee80211_prep_channel(struct
ieee80211_sub_if_data *sdata,
if (!(ifmgd->flags & IEEE80211_STA_DISABLE_VHT) && !is_6ghz) {
const u8 *vht_oper_ie, *vht_cap;
- vht_oper_ie = ((const u8 *)elems->vht_operation) - 2;
+ vht_oper_ie = elems->vht_operation ?
+ ((const u8 *)elems->vht_operation) - 2 :
+ NULL;
if (vht_oper_ie && vht_oper_ie[1] >= sizeof(*vht_oper))
vht_oper = (void *)(vht_oper_ie + 2);
if (vht_oper && !ht_oper) {
@@ -5055,7 +5061,9 @@ static int ieee80211_prep_channel(struct
ieee80211_sub_if_data *sdata,
ifmgd->flags |= IEEE80211_STA_DISABLE_HE;
}
- vht_cap = ((const u8 *)elems->vht_cap_elem) - 2;
+ vht_cap = elems->vht_cap_elem ?
+ ((const u8 *)elems->vht_cap_elem) - 2 :
+ NULL;
if (!vht_cap || vht_cap[1] < sizeof(struct
ieee80211_vht_cap)) {
ifmgd->flags |= IEEE80211_STA_DISABLE_VHT;
vht_oper = NULL;
@@ -5065,7 +5073,9 @@ static int ieee80211_prep_channel(struct
ieee80211_sub_if_data *sdata,
if (!(ifmgd->flags & IEEE80211_STA_DISABLE_HE)) {
const u8 *he_oper_ie;
- he_oper_ie = ((const u8 *)elems->he_operation) - 3;
+ he_oper_ie = elems->he_operation ?
+ ((const u8 *)elems->he_operation) - 3 :
+ NULL;
if (he_oper_ie &&
he_oper_ie[1] >=
ieee80211_he_oper_size(&he_oper_ie[3]))
he_oper = (void *)(he_oper_ie + 3);
@@ -5117,7 +5127,9 @@ static int ieee80211_prep_channel(struct
ieee80211_sub_if_data *sdata,
if (sband->band == NL80211_BAND_S1GHZ) {
const u8 *s1g_oper_ie;
- s1g_oper_ie = ((const u8 *)elems->s1g_oper) - 2;
+ s1g_oper_ie = elems->s1g_oper ?
+ ((const u8 *)elems->s1g_oper) - 2 :
+ NULL;
if (s1g_oper_ie && s1g_oper_ie[1] >= sizeof(*s1g_oper))
s1g_oper = (void *)(s1g_oper_ie + 2);
else
On 2021-09-03 19:48, Wen Gong wrote:
> In function ieee80211_prep_channel(), it has some
> ieee80211_bss_get_ie()
> and cfg80211_find_ext_ie() to get the IE, this is to use another
> function ieee802_11_parse_elems() to get all the IEs in one time.
>
> Signed-off-by: Wen Gong <wgong@codeaurora.org>
> ---
> net/mac80211/mlme.c | 40 ++++++++++++++++++++++++----------------
> 1 file changed, 24 insertions(+), 16 deletions(-)
>
> diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
> index 2480bd0577bb..6b32cdd590cd 100644
> --- a/net/mac80211/mlme.c
> +++ b/net/mac80211/mlme.c
> @@ -5001,10 +5001,22 @@ static int ieee80211_prep_channel(struct
> ieee80211_sub_if_data *sdata,
> bool is_6ghz = cbss->channel->band == NL80211_BAND_6GHZ;
> bool is_5ghz = cbss->channel->band == NL80211_BAND_5GHZ;
> struct ieee80211_bss *bss = (void *)cbss->priv;
> + struct ieee802_11_elems *elems;
> + const struct cfg80211_bss_ies *ies;
> int ret;
> u32 i;
> bool have_80mhz;
>
> + elems = kzalloc(sizeof(*elems), GFP_KERNEL);
> + if (!elems)
> + return -ENOMEM;
> +
> + rcu_read_lock();
> +
> + ies = rcu_dereference(cbss->ies);
> + ieee802_11_parse_elems(ies->data, ies->len, false, elems,
> + NULL, NULL);
> +
> sband = local->hw.wiphy->bands[cbss->channel->band];
>
> ifmgd->flags &= ~(IEEE80211_STA_DISABLE_40MHZ |
> @@ -5026,16 +5038,14 @@ static int ieee80211_prep_channel(struct
> ieee80211_sub_if_data *sdata,
> if (!ieee80211_get_he_sta_cap(sband))
> ifmgd->flags |= IEEE80211_STA_DISABLE_HE;
>
> - rcu_read_lock();
> -
> if (!(ifmgd->flags & IEEE80211_STA_DISABLE_HT) && !is_6ghz) {
> const u8 *ht_oper_ie, *ht_cap_ie;
>
> - ht_oper_ie = ieee80211_bss_get_ie(cbss, WLAN_EID_HT_OPERATION);
> + ht_oper_ie = ((const u8 *)elems->ht_operation) - 2;
> if (ht_oper_ie && ht_oper_ie[1] >= sizeof(*ht_oper))
> ht_oper = (void *)(ht_oper_ie + 2);
>
> - ht_cap_ie = ieee80211_bss_get_ie(cbss, WLAN_EID_HT_CAPABILITY);
> + ht_cap_ie = ((const u8 *)elems->ht_cap_elem) - 2;
> if (ht_cap_ie && ht_cap_ie[1] >= sizeof(*ht_cap))
> ht_cap = (void *)(ht_cap_ie + 2);
>
> @@ -5048,8 +5058,7 @@ static int ieee80211_prep_channel(struct
> ieee80211_sub_if_data *sdata,
> if (!(ifmgd->flags & IEEE80211_STA_DISABLE_VHT) && !is_6ghz) {
> const u8 *vht_oper_ie, *vht_cap;
>
> - vht_oper_ie = ieee80211_bss_get_ie(cbss,
> - WLAN_EID_VHT_OPERATION);
> + vht_oper_ie = ((const u8 *)elems->vht_operation) - 2;
> if (vht_oper_ie && vht_oper_ie[1] >= sizeof(*vht_oper))
> vht_oper = (void *)(vht_oper_ie + 2);
> if (vht_oper && !ht_oper) {
> @@ -5061,7 +5070,7 @@ static int ieee80211_prep_channel(struct
> ieee80211_sub_if_data *sdata,
> ifmgd->flags |= IEEE80211_STA_DISABLE_HE;
> }
>
> - vht_cap = ieee80211_bss_get_ie(cbss, WLAN_EID_VHT_CAPABILITY);
> + vht_cap = ((const u8 *)elems->vht_cap_elem) - 2;
> if (!vht_cap || vht_cap[1] < sizeof(struct ieee80211_vht_cap)) {
> ifmgd->flags |= IEEE80211_STA_DISABLE_VHT;
> vht_oper = NULL;
> @@ -5069,12 +5078,9 @@ static int ieee80211_prep_channel(struct
> ieee80211_sub_if_data *sdata,
> }
>
> if (!(ifmgd->flags & IEEE80211_STA_DISABLE_HE)) {
> - const struct cfg80211_bss_ies *ies;
> const u8 *he_oper_ie;
>
> - ies = rcu_dereference(cbss->ies);
> - he_oper_ie = cfg80211_find_ext_ie(WLAN_EID_EXT_HE_OPERATION,
> - ies->data, ies->len);
> + he_oper_ie = ((const u8 *)elems->he_operation) - 3;
> if (he_oper_ie &&
> he_oper_ie[1] >= ieee80211_he_oper_size(&he_oper_ie[3]))
> he_oper = (void *)(he_oper_ie + 3);
> @@ -5102,8 +5108,7 @@ static int ieee80211_prep_channel(struct
> ieee80211_sub_if_data *sdata,
> if (sband->band == NL80211_BAND_S1GHZ) {
> const u8 *s1g_oper_ie;
>
> - s1g_oper_ie = ieee80211_bss_get_ie(cbss,
> - WLAN_EID_S1G_OPERATION);
> + s1g_oper_ie = ((const u8 *)elems->s1g_oper) - 2;
> if (s1g_oper_ie && s1g_oper_ie[1] >= sizeof(*s1g_oper))
> s1g_oper = (void *)(s1g_oper_ie + 2);
> else
> @@ -5125,7 +5130,8 @@ static int ieee80211_prep_channel(struct
> ieee80211_sub_if_data *sdata,
>
> if (ifmgd->flags & IEEE80211_STA_DISABLE_HE && is_6ghz) {
> sdata_info(sdata, "Rejecting non-HE 6/7 GHz connection");
> - return -EINVAL;
> + ret = -EINVAL;
> + goto out_no_lock;
> }
>
> /* will change later if needed */
> @@ -5143,15 +5149,17 @@ static int ieee80211_prep_channel(struct
> ieee80211_sub_if_data *sdata,
> /* don't downgrade for 5 and 10 MHz channels, though. */
> if (chandef.width == NL80211_CHAN_WIDTH_5 ||
> chandef.width == NL80211_CHAN_WIDTH_10)
> - goto out;
> + goto out_lock;
>
> while (ret && chandef.width != NL80211_CHAN_WIDTH_20_NOHT) {
> ifmgd->flags |= ieee80211_chandef_downgrade(&chandef);
> ret = ieee80211_vif_use_channel(sdata, &chandef,
> IEEE80211_CHANCTX_SHARED);
> }
> - out:
> + out_lock:
> mutex_unlock(&local->mtx);
> + out_no_lock:
> + kfree(elems);
> return ret;
> }
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 9/9] mac80211: save transmit power envelope element and power constraint
2021-09-03 11:48 [PATCH v3 0/9] cfg80211/mac80211: Add support for 6GHZ STA for various modes : LPI, SP and VLP Wen Gong
` (7 preceding siblings ...)
2021-09-03 11:48 ` [PATCH v3 8/9] mac80211: use ieee802_11_parse_elems() to find ies instead of ieee80211_bss_get_ie() Wen Gong
@ 2021-09-03 11:48 ` Wen Gong
8 siblings, 0 replies; 11+ messages in thread
From: Wen Gong @ 2021-09-03 11:48 UTC (permalink / raw)
To: johannes, ath11k; +Cc: linux-wireless, wgong
This is to save the transmit power envelope element and power
constraint in struct ieee80211_bss_conf for 6 GHz. Lower driver
will use this info to calculate the power limit.
Signed-off-by: Wen Gong <wgong@codeaurora.org>
---
include/net/mac80211.h | 6 ++++++
net/mac80211/mlme.c | 30 ++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index d0522d7f3351..0ac6fe7b8f99 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -632,6 +632,9 @@ struct ieee80211_fils_discovery {
* @beacon_tx_rate: The configured beacon transmit rate that needs to be passed
* to driver when rate control is offloaded to firmware.
* @power_type: power type of BSS for 6 GHz
+ * @tx_pwr_env: transmit power envelope array of BSS.
+ * @tx_pwr_env_num: number of @tx_pwr_env.
+ * @pwr_reduction: power constraint of BSS.
*/
struct ieee80211_bss_conf {
const u8 *bssid;
@@ -702,6 +705,9 @@ struct ieee80211_bss_conf {
bool s1g;
struct cfg80211_bitrate_mask beacon_tx_rate;
enum ieee80211_ap_reg_power power_type;
+ struct ieee80211_tx_pwr_env tx_pwr_env[IEEE80211_TPE_MAX_IE_COUNT];
+ u8 tx_pwr_env_num;
+ u8 pwr_reduction;
};
/**
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 6b32cdd590cd..cda28ec58a31 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2340,6 +2340,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
{
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
struct ieee80211_local *local = sdata->local;
+ struct ieee80211_bss_conf *bss_conf;
u32 changed = 0;
sdata_assert_lock(sdata);
@@ -2483,6 +2484,11 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
cancel_delayed_work_sync(&ifmgd->tx_tspec_wk);
sdata->encrypt_headroom = IEEE80211_ENCRYPT_HEADROOM;
+
+ bss_conf = &sdata->vif.bss_conf;
+ bss_conf->pwr_reduction = 0;
+ bss_conf->tx_pwr_env_num = 0;
+ memset(bss_conf->tx_pwr_env, 0, sizeof(bss_conf->tx_pwr_env));
}
static void ieee80211_reset_ap_probe(struct ieee80211_sub_if_data *sdata)
@@ -5087,6 +5093,30 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
else
he_oper = NULL;
+ if (is_6ghz) {
+ struct ieee80211_bss_conf *bss_conf;
+ u8 i, j = 0;
+
+ bss_conf = &sdata->vif.bss_conf;
+
+ if (elems->pwr_constr_elem)
+ bss_conf->pwr_reduction = *elems->pwr_constr_elem;
+
+ BUILD_BUG_ON(ARRAY_SIZE(bss_conf->tx_pwr_env) !=
+ ARRAY_SIZE(elems->tx_pwr_env));
+
+ for (i = 0; i < elems->tx_pwr_env_num; i++) {
+ if (elems->tx_pwr_env_len[i] >
+ sizeof(bss_conf->tx_pwr_env[j]))
+ continue;
+
+ bss_conf->tx_pwr_env_num++;
+ memcpy(&bss_conf->tx_pwr_env[j], elems->tx_pwr_env[i],
+ elems->tx_pwr_env_len[i]);
+ j++;
+ }
+ }
+
if (!ieee80211_verify_sta_he_mcs_support(sband, he_oper))
ifmgd->flags |= IEEE80211_STA_DISABLE_HE;
}
--
2.31.1
^ permalink raw reply related [flat|nested] 11+ messages in thread