* [PATCH v6 01/13] wifi: ath11k: add support to select 6 GHz regulatory type
2023-09-20 8:23 [PATCH v6 00/13] wifi: ath11k: add support for 6 GHz station for various modes : LPI, SP and VLP Wen Gong
@ 2023-09-20 8:23 ` Wen Gong
2023-09-20 8:23 ` [PATCH v6 02/13] wifi: ath11k: store cur_regulatory_info for each radio Wen Gong
` (11 subsequent siblings)
12 siblings, 0 replies; 48+ messages in thread
From: Wen Gong @ 2023-09-20 8:23 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson, quic_wgong
There are 3 types of regulatory rules for AP mode and 6 type for
station mode. Add wmi_vdev_type and ieee80211_ap_reg_power to
select the exact reg rules.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
---
drivers/net/wireless/ath/ath11k/reg.c | 66 +++++++++++++++++++++------
drivers/net/wireless/ath/ath11k/reg.h | 6 ++-
drivers/net/wireless/ath/ath11k/wmi.c | 3 +-
3 files changed, 58 insertions(+), 17 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/reg.c b/drivers/net/wireless/ath/ath11k/reg.c
index 7f9fb968dac6..2a3edb60c08f 100644
--- a/drivers/net/wireless/ath/ath11k/reg.c
+++ b/drivers/net/wireless/ath/ath11k/reg.c
@@ -607,25 +607,64 @@ ath11k_reg_update_weather_radar_band(struct ath11k_base *ab,
*rule_idx = i;
}
+enum wmi_reg_6ghz_ap_type
+ath11k_reg_ap_pwr_convert(enum ieee80211_ap_reg_power power_type)
+{
+ switch (power_type) {
+ case IEEE80211_REG_LPI_AP:
+ return WMI_REG_INDOOR_AP;
+ case IEEE80211_REG_SP_AP:
+ return WMI_REG_STANDARD_POWER_AP;
+ case IEEE80211_REG_VLP_AP:
+ return WMI_REG_VERY_LOW_POWER_AP;
+ default:
+ return WMI_REG_MAX_AP_TYPE;
+ }
+}
+
struct ieee80211_regdomain *
ath11k_reg_build_regd(struct ath11k_base *ab,
- struct cur_regulatory_info *reg_info, bool intersect)
+ struct cur_regulatory_info *reg_info, bool intersect,
+ enum wmi_vdev_type vdev_type,
+ enum ieee80211_ap_reg_power power_type)
{
struct ieee80211_regdomain *tmp_regd, *default_regd, *new_regd = NULL;
- struct cur_reg_rule *reg_rule;
+ struct cur_reg_rule *reg_rule, *reg_rule_6ghz;
u8 i = 0, j = 0, k = 0;
u8 num_rules;
u16 max_bw;
- u32 flags;
+ u32 flags, reg_6ghz_number, max_bw_6ghz;
char alpha2[3];
num_rules = reg_info->num_5ghz_reg_rules + reg_info->num_2ghz_reg_rules;
- /* FIXME: Currently taking reg rules for 6 GHz only from Indoor AP mode list.
- * This can be updated after complete 6 GHz regulatory support is added.
- */
- if (reg_info->is_ext_reg_event)
- num_rules += reg_info->num_6ghz_rules_ap[WMI_REG_INDOOR_AP];
+ if (reg_info->is_ext_reg_event) {
+ if (vdev_type == WMI_VDEV_TYPE_STA) {
+ enum wmi_reg_6ghz_ap_type ap_type;
+
+ ap_type = ath11k_reg_ap_pwr_convert(power_type);
+
+ if (ap_type == WMI_REG_MAX_AP_TYPE)
+ ap_type = WMI_REG_INDOOR_AP;
+ reg_6ghz_number = reg_info->num_6ghz_rules_client
+ [ap_type][WMI_REG_DEFAULT_CLIENT];
+ if (reg_6ghz_number == 0) {
+ ap_type = WMI_REG_INDOOR_AP;
+ reg_6ghz_number = reg_info->num_6ghz_rules_client
+ [ap_type][WMI_REG_DEFAULT_CLIENT];
+ }
+ reg_rule_6ghz = reg_info->reg_rules_6ghz_client_ptr
+ [ap_type][WMI_REG_DEFAULT_CLIENT];
+ max_bw_6ghz = reg_info->max_bw_6ghz_client
+ [ap_type][WMI_REG_DEFAULT_CLIENT];
+ } else {
+ reg_6ghz_number = reg_info->num_6ghz_rules_ap[WMI_REG_INDOOR_AP];
+ reg_rule_6ghz =
+ reg_info->reg_rules_6ghz_ap_ptr[WMI_REG_INDOOR_AP];
+ max_bw_6ghz = reg_info->max_bw_6ghz_ap[WMI_REG_INDOOR_AP];
+ }
+ num_rules += reg_6ghz_number;
+ }
if (!num_rules)
goto ret;
@@ -672,13 +711,10 @@ ath11k_reg_build_regd(struct ath11k_base *ab,
* per other BW rule flags we pass from here
*/
flags = NL80211_RRF_AUTO_BW;
- } else if (reg_info->is_ext_reg_event &&
- reg_info->num_6ghz_rules_ap[WMI_REG_INDOOR_AP] &&
- (k < reg_info->num_6ghz_rules_ap[WMI_REG_INDOOR_AP])) {
- reg_rule = reg_info->reg_rules_6ghz_ap_ptr[WMI_REG_INDOOR_AP] +
- k++;
- max_bw = min_t(u16, reg_rule->max_bw,
- reg_info->max_bw_6ghz_ap[WMI_REG_INDOOR_AP]);
+ } else if (reg_info->is_ext_reg_event && reg_6ghz_number &&
+ (k < reg_6ghz_number)) {
+ reg_rule = reg_rule_6ghz + k++;
+ max_bw = min_t(u16, reg_rule->max_bw, max_bw_6ghz);
flags = NL80211_RRF_AUTO_BW;
} else {
break;
diff --git a/drivers/net/wireless/ath/ath11k/reg.h b/drivers/net/wireless/ath/ath11k/reg.h
index 2f284f26378d..acc69ec15b6e 100644
--- a/drivers/net/wireless/ath/ath11k/reg.h
+++ b/drivers/net/wireless/ath/ath11k/reg.h
@@ -30,7 +30,11 @@ void ath11k_reg_free(struct ath11k_base *ab);
void ath11k_regd_update_work(struct work_struct *work);
struct ieee80211_regdomain *
ath11k_reg_build_regd(struct ath11k_base *ab,
- struct cur_regulatory_info *reg_info, bool intersect);
+ struct cur_regulatory_info *reg_info, bool intersect,
+ enum wmi_vdev_type vdev_type,
+ enum ieee80211_ap_reg_power power_type);
int ath11k_regd_update(struct ath11k *ar);
int ath11k_reg_update_chan_list(struct ath11k *ar, bool wait);
+enum wmi_reg_6ghz_ap_type
+ath11k_reg_ap_pwr_convert(enum ieee80211_ap_reg_power power_type);
#endif
diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 23ad6825e5be..5a6578865b25 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -7150,7 +7150,8 @@ static int ath11k_reg_chan_list_event(struct ath11k_base *ab,
!ath11k_reg_is_world_alpha((char *)reg_info->alpha2))
intersect = true;
- regd = ath11k_reg_build_regd(ab, reg_info, intersect);
+ regd = ath11k_reg_build_regd(ab, reg_info, intersect,
+ WMI_VDEV_TYPE_AP, IEEE80211_REG_LPI_AP);
if (!regd) {
ath11k_warn(ab, "failed to build regd from reg_info\n");
goto fallback;
--
2.40.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH v6 02/13] wifi: ath11k: store cur_regulatory_info for each radio
2023-09-20 8:23 [PATCH v6 00/13] wifi: ath11k: add support for 6 GHz station for various modes : LPI, SP and VLP Wen Gong
2023-09-20 8:23 ` [PATCH v6 01/13] wifi: ath11k: add support to select 6 GHz regulatory type Wen Gong
@ 2023-09-20 8:23 ` Wen Gong
2023-09-21 19:51 ` Jeff Johnson
2023-09-29 13:16 ` Kalle Valo
2023-09-20 8:23 ` [PATCH v6 03/13] wifi: ath11k: fix a possible dead lock caused by ab->base_lock Wen Gong
` (10 subsequent siblings)
12 siblings, 2 replies; 48+ messages in thread
From: Wen Gong @ 2023-09-20 8:23 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson, quic_wgong
The regulatory info of WMI_REG_CHAN_LIST_CC_EXT_EVENTID is not saved
in ath11k now, the info should be saved in ath11k. Save the info for
each radio and support switch regulatory rules dynamically.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
---
drivers/net/wireless/ath/ath11k/core.h | 1 +
drivers/net/wireless/ath/ath11k/mac.h | 1 -
drivers/net/wireless/ath/ath11k/reg.c | 6 ++
drivers/net/wireless/ath/ath11k/wmi.c | 141 ++++++++++++++++++-------
drivers/net/wireless/ath/ath11k/wmi.h | 5 +
5 files changed, 113 insertions(+), 41 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h
index b04447762483..9fbe4f67218c 100644
--- a/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@ -923,6 +923,7 @@ struct ath11k_base {
* This may or may not be used during the runtime
*/
struct ieee80211_regdomain *new_regd[MAX_RADIOS];
+ struct cur_regulatory_info *reg_info_store;
/* Current DFS Regulatory */
enum ath11k_dfs_region dfs_region;
diff --git a/drivers/net/wireless/ath/ath11k/mac.h b/drivers/net/wireless/ath/ath11k/mac.h
index 0231783ad754..e4835e0b7998 100644
--- a/drivers/net/wireless/ath/ath11k/mac.h
+++ b/drivers/net/wireless/ath/ath11k/mac.h
@@ -158,7 +158,6 @@ struct ath11k_vif *ath11k_mac_get_vif_up(struct ath11k_base *ab);
struct ath11k *ath11k_mac_get_ar_by_vdev_id(struct ath11k_base *ab, u32 vdev_id);
struct ath11k *ath11k_mac_get_ar_by_pdev_id(struct ath11k_base *ab, u32 pdev_id);
-
void ath11k_mac_drain_tx(struct ath11k *ar);
void ath11k_mac_peer_cleanup_all(struct ath11k *ar);
int ath11k_mac_tx_mgmt_pending_free(int buf_id, void *skb, void *ctx);
diff --git a/drivers/net/wireless/ath/ath11k/reg.c b/drivers/net/wireless/ath/ath11k/reg.c
index 2a3edb60c08f..0535ab8a28fa 100644
--- a/drivers/net/wireless/ath/ath11k/reg.c
+++ b/drivers/net/wireless/ath/ath11k/reg.c
@@ -809,6 +809,12 @@ void ath11k_reg_free(struct ath11k_base *ab)
{
int i;
+ for (i = 0; i < ab->num_radios; i++)
+ ath11k_reg_reset_info(&ab->reg_info_store[i]);
+
+ kfree(ab->reg_info_store);
+ ab->reg_info_store = NULL;
+
for (i = 0; i < ab->hw_params.max_radios; i++) {
kfree(ab->default_regd[i]);
kfree(ab->new_regd[i]);
diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 5a6578865b25..1fb445106872 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -4749,6 +4749,11 @@ static int ath11k_wmi_tlv_ext_soc_hal_reg_caps_parse(struct ath11k_base *soc,
soc->pdevs[0].pdev_id = 0;
}
+ if (!soc->reg_info_store)
+ soc->reg_info_store = kcalloc(soc->num_radios,
+ sizeof(*soc->reg_info_store),
+ GFP_ATOMIC);
+
return 0;
}
@@ -7070,33 +7075,54 @@ static bool ath11k_reg_is_world_alpha(char *alpha)
return false;
}
-static int ath11k_reg_chan_list_event(struct ath11k_base *ab,
- struct sk_buff *skb,
- enum wmi_reg_chan_list_cmd_type id)
+void ath11k_reg_reset_info(struct cur_regulatory_info *reg_info)
{
- struct cur_regulatory_info *reg_info = NULL;
- struct ieee80211_regdomain *regd = NULL;
- bool intersect = false;
- int ret = 0, pdev_idx, i, j;
- struct ath11k *ar;
+ int i, j;
- reg_info = kzalloc(sizeof(*reg_info), GFP_ATOMIC);
- if (!reg_info) {
- ret = -ENOMEM;
- goto fallback;
- }
+ if (reg_info) {
+ kfree(reg_info->reg_rules_2ghz_ptr);
- if (id == WMI_REG_CHAN_LIST_CC_ID)
- ret = ath11k_pull_reg_chan_list_update_ev(ab, skb, reg_info);
- else
- ret = ath11k_pull_reg_chan_list_ext_update_ev(ab, skb, reg_info);
+ kfree(reg_info->reg_rules_5ghz_ptr);
- if (ret) {
- ath11k_warn(ab, "failed to extract regulatory info from received event\n");
- goto fallback;
+ for (i = 0; i < WMI_REG_CURRENT_MAX_AP_TYPE; i++) {
+ kfree(reg_info->reg_rules_6ghz_ap_ptr[i]);
+ for (j = 0; j < WMI_REG_MAX_CLIENT_TYPE; j++)
+ kfree(reg_info->reg_rules_6ghz_client_ptr[i][j]);
+ }
+
+ memset(reg_info, 0, sizeof(*reg_info));
}
+}
+
+static
+enum wmi_vdev_type ath11k_reg_get_ar_vdev_type(struct ath11k *ar)
+{
+ struct ath11k_vif *arvif;
+
+ /* Currently each struct ath11k maps to one struct ieee80211_hw/wiphy
+ * and one struct ieee80211_regdomain, so it could only store one group
+ * reg rules. It means muti-interface concurrency in the same ath11k is
+ * not support for the regdomain. So get the vdev type of the first entry
+ * now. After concurrency support for the regdomain, this should change.
+ */
+ arvif = list_first_entry_or_null(&ar->arvifs, struct ath11k_vif, list);
+ if (arvif)
+ return arvif->vdev_type;
+
+ return WMI_VDEV_TYPE_UNSPEC;
+}
- ath11k_dbg(ab, ATH11K_DBG_WMI, "event reg chan list id %d", id);
+int ath11k_reg_handle_chan_list(struct ath11k_base *ab,
+ struct cur_regulatory_info *reg_info,
+ enum ieee80211_ap_reg_power power_type)
+{
+ struct ieee80211_regdomain *regd;
+ bool intersect = false;
+ int pdev_idx;
+ struct ath11k *ar;
+ enum wmi_vdev_type vdev_type;
+
+ ath11k_dbg(ab, ATH11K_DBG_WMI, "event reg handle chan list");
if (reg_info->status_code != REG_SET_CC_STATUS_PASS) {
/* In case of failure to set the requested ctry,
@@ -7104,7 +7130,7 @@ static int ath11k_reg_chan_list_event(struct ath11k_base *ab,
* and return from here.
*/
ath11k_warn(ab, "Failed to set the requested Country regulatory setting\n");
- goto mem_free;
+ return -EINVAL;
}
pdev_idx = reg_info->phy_id;
@@ -7116,7 +7142,7 @@ static int ath11k_reg_chan_list_event(struct ath11k_base *ab,
if (test_bit(ATH11K_FLAG_RECOVERY, &ab->dev_flags) &&
ab->default_regd[pdev_idx]) {
spin_unlock(&ab->base_lock);
- goto mem_free;
+ goto retfail;
}
spin_unlock(&ab->base_lock);
@@ -7127,7 +7153,7 @@ static int ath11k_reg_chan_list_event(struct ath11k_base *ab,
*/
if (ab->hw_params.single_pdev_only &&
pdev_idx < ab->hw_params.num_rxmda_per_pdev)
- goto mem_free;
+ return 0;
else
goto fallback;
}
@@ -7138,7 +7164,7 @@ static int ath11k_reg_chan_list_event(struct ath11k_base *ab,
if (ab->default_regd[pdev_idx] && !ab->new_regd[pdev_idx] &&
!memcmp((char *)ab->default_regd[pdev_idx]->alpha2,
(char *)reg_info->alpha2, 2))
- goto mem_free;
+ goto retfail;
/* Intersect new rules with default regd if a new country setting was
* requested, i.e a default regd was already set during initialization
@@ -7150,13 +7176,24 @@ static int ath11k_reg_chan_list_event(struct ath11k_base *ab,
!ath11k_reg_is_world_alpha((char *)reg_info->alpha2))
intersect = true;
- regd = ath11k_reg_build_regd(ab, reg_info, intersect,
- WMI_VDEV_TYPE_AP, IEEE80211_REG_LPI_AP);
+ ar = ab->pdevs[pdev_idx].ar;
+ vdev_type = ath11k_reg_get_ar_vdev_type(ar);
+
+ ath11k_dbg(ab, ATH11K_DBG_WMI,
+ "wmi handle chan list power type %d vdev type %d intersect %d\n",
+ power_type, vdev_type, intersect);
+
+ regd = ath11k_reg_build_regd(ab, reg_info, intersect, vdev_type, power_type);
if (!regd) {
ath11k_warn(ab, "failed to build regd from reg_info\n");
goto fallback;
}
+ if (power_type == IEEE80211_REG_UNSET_AP) {
+ ath11k_reg_reset_info(&ab->reg_info_store[pdev_idx]);
+ ab->reg_info_store[pdev_idx] = *reg_info;
+ }
+
spin_lock(&ab->base_lock);
if (ab->default_regd[pdev_idx]) {
/* The initial rules from FW after WMI Init is to build
@@ -7179,7 +7216,7 @@ static int ath11k_reg_chan_list_event(struct ath11k_base *ab,
ab->dfs_region = reg_info->dfs_region;
spin_unlock(&ab->base_lock);
- goto mem_free;
+ return 0;
fallback:
/* Fallback to older reg (by sending previous country setting
@@ -7191,20 +7228,44 @@ static int ath11k_reg_chan_list_event(struct ath11k_base *ab,
*/
/* TODO: This is rare, but still should also be handled */
WARN_ON(1);
-mem_free:
- if (reg_info) {
- kfree(reg_info->reg_rules_2ghz_ptr);
- kfree(reg_info->reg_rules_5ghz_ptr);
- if (reg_info->is_ext_reg_event) {
- for (i = 0; i < WMI_REG_CURRENT_MAX_AP_TYPE; i++)
- kfree(reg_info->reg_rules_6ghz_ap_ptr[i]);
- for (j = 0; j < WMI_REG_CURRENT_MAX_AP_TYPE; j++)
- for (i = 0; i < WMI_REG_MAX_CLIENT_TYPE; i++)
- kfree(reg_info->reg_rules_6ghz_client_ptr[j][i]);
- }
- kfree(reg_info);
+retfail:
+
+ return -EINVAL;
+}
+
+static int ath11k_reg_chan_list_event(struct ath11k_base *ab, struct sk_buff *skb,
+ enum wmi_reg_chan_list_cmd_type id)
+{
+ struct cur_regulatory_info *reg_info;
+ int ret;
+
+ reg_info = kzalloc(sizeof(*reg_info), GFP_ATOMIC);
+ if (!reg_info)
+ return -ENOMEM;
+
+ if (id == WMI_REG_CHAN_LIST_CC_ID)
+ ret = ath11k_pull_reg_chan_list_update_ev(ab, skb, reg_info);
+ else
+ ret = ath11k_pull_reg_chan_list_ext_update_ev(ab, skb, reg_info);
+
+ if (ret) {
+ ath11k_warn(ab, "failed to extract regulatory info\n");
+ goto mem_free;
}
+
+ ret = ath11k_reg_handle_chan_list(ab, reg_info, IEEE80211_REG_UNSET_AP);
+ if (ret) {
+ ath11k_warn(ab, "failed to process regulatory info %d\n", ret);
+ goto mem_free;
+ }
+
+ kfree(reg_info);
+ return 0;
+
+mem_free:
+ ath11k_reg_reset_info(reg_info);
+ kfree(reg_info);
return ret;
}
diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index 100bb816b592..a34a04bd4612 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -4975,6 +4975,7 @@ struct ath11k_targ_cap {
};
enum wmi_vdev_type {
+ WMI_VDEV_TYPE_UNSPEC = 0,
WMI_VDEV_TYPE_AP = 1,
WMI_VDEV_TYPE_STA = 2,
WMI_VDEV_TYPE_IBSS = 3,
@@ -6505,4 +6506,8 @@ int ath11k_wmi_pdev_set_bios_geo_table_param(struct ath11k *ar);
int ath11k_wmi_sta_keepalive(struct ath11k *ar,
const struct wmi_sta_keepalive_arg *arg);
+void ath11k_reg_reset_info(struct cur_regulatory_info *reg_info);
+int ath11k_reg_handle_chan_list(struct ath11k_base *ab,
+ struct cur_regulatory_info *reg_info,
+ enum ieee80211_ap_reg_power power_type);
#endif
--
2.40.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v6 02/13] wifi: ath11k: store cur_regulatory_info for each radio
2023-09-20 8:23 ` [PATCH v6 02/13] wifi: ath11k: store cur_regulatory_info for each radio Wen Gong
@ 2023-09-21 19:51 ` Jeff Johnson
2023-09-29 13:16 ` Kalle Valo
1 sibling, 0 replies; 48+ messages in thread
From: Jeff Johnson @ 2023-09-21 19:51 UTC (permalink / raw)
To: Wen Gong, ath11k; +Cc: linux-wireless, kvalo
On 9/20/2023 1:23 AM, Wen Gong wrote:
> The regulatory info of WMI_REG_CHAN_LIST_CC_EXT_EVENTID is not saved
> in ath11k now, the info should be saved in ath11k. Save the info for
> each radio and support switch regulatory rules dynamically
Kalle, can you add hard stop when you apply to pending?
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v6 02/13] wifi: ath11k: store cur_regulatory_info for each radio
2023-09-20 8:23 ` [PATCH v6 02/13] wifi: ath11k: store cur_regulatory_info for each radio Wen Gong
2023-09-21 19:51 ` Jeff Johnson
@ 2023-09-29 13:16 ` Kalle Valo
1 sibling, 0 replies; 48+ messages in thread
From: Kalle Valo @ 2023-09-29 13:16 UTC (permalink / raw)
To: Wen Gong; +Cc: ath11k, linux-wireless, quic_jjohnson, quic_wgong
Wen Gong <quic_wgong@quicinc.com> wrote:
> The regulatory info of WMI_REG_CHAN_LIST_CC_EXT_EVENTID is not saved
> in ath11k now, the info should be saved in ath11k. Save the info for
> each radio and support switch regulatory rules dynamically.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
This added a new warning:
drivers/net/wireless/ath/ath11k/wmi.c:7157: else is not generally useful after a break or return
You should guess by now what I'm going to say: please ALWAYS test your patches
with ath11k-check!
--
https://patchwork.kernel.org/project/linux-wireless/patch/20230920082349.29111-3-quic_wgong@quicinc.com/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v6 03/13] wifi: ath11k: fix a possible dead lock caused by ab->base_lock
2023-09-20 8:23 [PATCH v6 00/13] wifi: ath11k: add support for 6 GHz station for various modes : LPI, SP and VLP Wen Gong
2023-09-20 8:23 ` [PATCH v6 01/13] wifi: ath11k: add support to select 6 GHz regulatory type Wen Gong
2023-09-20 8:23 ` [PATCH v6 02/13] wifi: ath11k: store cur_regulatory_info for each radio Wen Gong
@ 2023-09-20 8:23 ` Wen Gong
2023-09-21 19:54 ` Jeff Johnson
2023-10-02 15:51 ` Kalle Valo
2023-09-20 8:23 ` [PATCH v6 04/13] wifi: ath11k: update regulatory rules when interface added Wen Gong
` (9 subsequent siblings)
12 siblings, 2 replies; 48+ messages in thread
From: Wen Gong @ 2023-09-20 8:23 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson, quic_wgong, Baochen Qiang
From: Baochen Qiang <quic_bqiang@quicinc.com>
spin_lock/spin_unlock are used in ath11k_reg_chan_list_event to
acquire/release ab->base_lock, for now this is safe because that
function is only called in soft IRQ context.
But ath11k_reg_chan_list_event() will be called from process
context in an upcoming patch, and this can result in a deadlock if
ab->base_lock is acquired in process context and then soft IRQ occurs
on the same CPU and tries to acquire that lock.
Fix it by using spin_lock_bh and spin_unlock_bh instead.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
Fixes: 69a0fcf8a9f2 ("ath11k: Avoid reg rules update during firmware recovery")
Signed-off-by: Baochen Qiang <quic_bqiang@quicinc.com>
Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
---
drivers/net/wireless/ath/ath11k/wmi.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 1fb445106872..c427299b7202 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -7138,13 +7138,13 @@ int ath11k_reg_handle_chan_list(struct ath11k_base *ab,
/* Avoid default reg rule updates sent during FW recovery if
* it is already available
*/
- spin_lock(&ab->base_lock);
+ spin_lock_bh(&ab->base_lock);
if (test_bit(ATH11K_FLAG_RECOVERY, &ab->dev_flags) &&
ab->default_regd[pdev_idx]) {
- spin_unlock(&ab->base_lock);
+ spin_unlock_bh(&ab->base_lock);
goto retfail;
}
- spin_unlock(&ab->base_lock);
+ spin_unlock_bh(&ab->base_lock);
if (pdev_idx >= ab->num_radios) {
/* Process the event for phy0 only if single_pdev_only
@@ -7194,7 +7194,7 @@ int ath11k_reg_handle_chan_list(struct ath11k_base *ab,
ab->reg_info_store[pdev_idx] = *reg_info;
}
- spin_lock(&ab->base_lock);
+ spin_lock_bh(&ab->base_lock);
if (ab->default_regd[pdev_idx]) {
/* The initial rules from FW after WMI Init is to build
* the default regd. From then on, any rules updated for
@@ -7214,7 +7214,7 @@ int ath11k_reg_handle_chan_list(struct ath11k_base *ab,
ab->default_regd[pdev_idx] = regd;
}
ab->dfs_region = reg_info->dfs_region;
- spin_unlock(&ab->base_lock);
+ spin_unlock_bh(&ab->base_lock);
return 0;
--
2.40.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v6 03/13] wifi: ath11k: fix a possible dead lock caused by ab->base_lock
2023-09-20 8:23 ` [PATCH v6 03/13] wifi: ath11k: fix a possible dead lock caused by ab->base_lock Wen Gong
@ 2023-09-21 19:54 ` Jeff Johnson
2023-09-25 10:35 ` Kalle Valo
2023-10-02 15:51 ` Kalle Valo
1 sibling, 1 reply; 48+ messages in thread
From: Jeff Johnson @ 2023-09-21 19:54 UTC (permalink / raw)
To: Wen Gong, ath11k; +Cc: linux-wireless, kvalo, Baochen Qiang
On 9/20/2023 1:23 AM, Wen Gong wrote:
> From: Baochen Qiang <quic_bqiang@quicinc.com>
>
> spin_lock/spin_unlock are used in ath11k_reg_chan_list_event to
> acquire/release ab->base_lock, for now this is safe because that
Kalle, can you s/, for/. For/ when you pull into pending?
> function is only called in soft IRQ context.
>
> But ath11k_reg_chan_list_event() will be called from process
> context in an upcoming patch, and this can result in a deadlock if
> ab->base_lock is acquired in process context and then soft IRQ occurs
> on the same CPU and tries to acquire that lock.
>
> Fix it by using spin_lock_bh and spin_unlock_bh instead.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>
> Fixes: 69a0fcf8a9f2 ("ath11k: Avoid reg rules update during firmware recovery")
> Signed-off-by: Baochen Qiang <quic_bqiang@quicinc.com>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v6 03/13] wifi: ath11k: fix a possible dead lock caused by ab->base_lock
2023-09-21 19:54 ` Jeff Johnson
@ 2023-09-25 10:35 ` Kalle Valo
0 siblings, 0 replies; 48+ messages in thread
From: Kalle Valo @ 2023-09-25 10:35 UTC (permalink / raw)
To: Jeff Johnson; +Cc: Wen Gong, ath11k, linux-wireless, Baochen Qiang
Jeff Johnson <quic_jjohnson@quicinc.com> writes:
> On 9/20/2023 1:23 AM, Wen Gong wrote:
>> From: Baochen Qiang <quic_bqiang@quicinc.com>
>> spin_lock/spin_unlock are used in ath11k_reg_chan_list_event to
>> acquire/release ab->base_lock, for now this is safe because that
>
> Kalle, can you s/, for/. For/ when you pull into pending?
Yes, will do. BTW to save time for simple edits like this I don't always
reply to you, I just do the edit the silently. In case you wonder if why
I don't reply.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v6 03/13] wifi: ath11k: fix a possible dead lock caused by ab->base_lock
2023-09-20 8:23 ` [PATCH v6 03/13] wifi: ath11k: fix a possible dead lock caused by ab->base_lock Wen Gong
2023-09-21 19:54 ` Jeff Johnson
@ 2023-10-02 15:51 ` Kalle Valo
1 sibling, 0 replies; 48+ messages in thread
From: Kalle Valo @ 2023-10-02 15:51 UTC (permalink / raw)
To: Wen Gong; +Cc: ath11k, linux-wireless, quic_jjohnson, quic_wgong, Baochen Qiang
Wen Gong <quic_wgong@quicinc.com> wrote:
> spin_lock/spin_unlock are used in ath11k_reg_chan_list_event to
> acquire/release ab->base_lock, for now this is safe because that
> function is only called in soft IRQ context.
>
> But ath11k_reg_chan_list_event() will be called from process
> context in an upcoming patch, and this can result in a deadlock if
> ab->base_lock is acquired in process context and then soft IRQ occurs
> on the same CPU and tries to acquire that lock.
>
> Fix it by using spin_lock_bh and spin_unlock_bh instead.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>
> Fixes: 69a0fcf8a9f2 ("ath11k: Avoid reg rules update during firmware recovery")
> Signed-off-by: Baochen Qiang <quic_bqiang@quicinc.com>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
This patch seems to leak memory:
unreferenced object 0xffff8881110f5840 (size 64):
comm "softirq", pid 0, jiffies 4295335213 (age 79.445s)
hex dump (first 32 bytes):
32 14 82 14 50 00 17 00 00 02 00 00 82 14 d2 14 2...P...........
50 00 17 00 08 02 00 00 72 15 62 16 a0 00 1e 00 P.......r.b.....
backtrace:
[<ffffffffa1f891ca>] __kmem_cache_alloc_node+0x1ca/0x2d0
[<ffffffffa1e57950>] __kmalloc+0x50/0x1a0
[<ffffffffc076640e>] create_ext_reg_rules_from_wmi+0x2e/0x430 [ath11k]
[<ffffffffc07705c4>] ath11k_pull_reg_chan_list_ext_update_ev+0x1d24/0x4f30 [ath11k]
[<ffffffffc07a4a44>] ath11k_reg_chan_list_event.isra.0+0x64/0xd0 [ath11k]
[<ffffffffc07a562f>] ath11k_wmi_tlv_op_rx+0xb7f/0x27e0 [ath11k]
[<ffffffffc07f3a54>] ath11k_htc_rx_completion_handler+0x3b4/0x6f0 [ath11k]
[<ffffffffc0838b3a>] ath11k_ce_recv_process_cb+0x5da/0x920 [ath11k]
[<ffffffffc0839b68>] ath11k_ce_per_engine_service+0xe8/0x130 [ath11k]
[<ffffffffc084ba75>] ath11k_pcic_ce_tasklet+0x65/0x120 [ath11k]
[<ffffffffa196df5c>] tasklet_action_common.isra.0+0x24c/0x3d0
[<ffffffffa196e12f>] tasklet_action+0x4f/0x70
[<ffffffffa448b355>] __do_softirq+0x1c5/0x867
unreferenced object 0xffff8881110f5f40 (size 64):
comm "softirq", pid 0, jiffies 4295335238 (age 79.439s)
hex dump (first 32 bytes):
32 14 82 14 50 00 17 00 00 02 00 00 82 14 d2 14 2...P...........
50 00 17 00 08 02 00 00 72 15 62 16 a0 00 1e 00 P.......r.b.....
backtrace:
[<ffffffffa1f891ca>] __kmem_cache_alloc_node+0x1ca/0x2d0
[<ffffffffa1e57950>] __kmalloc+0x50/0x1a0
[<ffffffffc076640e>] create_ext_reg_rules_from_wmi+0x2e/0x430 [ath11k]
[<ffffffffc07705c4>] ath11k_pull_reg_chan_list_ext_update_ev+0x1d24/0x4f30 [ath11k]
[<ffffffffc07a4a44>] ath11k_reg_chan_list_event.isra.0+0x64/0xd0 [ath11k]
[<ffffffffc07a562f>] ath11k_wmi_tlv_op_rx+0xb7f/0x27e0 [ath11k]
[<ffffffffc07f3a54>] ath11k_htc_rx_completion_handler+0x3b4/0x6f0 [ath11k]
[<ffffffffc0838b3a>] ath11k_ce_recv_process_cb+0x5da/0x920 [ath11k]
[<ffffffffc0839b68>] ath11k_ce_per_engine_service+0xe8/0x130 [ath11k]
[<ffffffffc084ba75>] ath11k_pcic_ce_tasklet+0x65/0x120 [ath11k]
[<ffffffffa196df5c>] tasklet_action_common.isra.0+0x24c/0x3d0
[<ffffffffa196e12f>] tasklet_action+0x4f/0x70
[<ffffffffa448b355>] __do_softirq+0x1c5/0x867
--
https://patchwork.kernel.org/project/linux-wireless/patch/20230920082349.29111-4-quic_wgong@quicinc.com/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v6 04/13] wifi: ath11k: update regulatory rules when interface added
2023-09-20 8:23 [PATCH v6 00/13] wifi: ath11k: add support for 6 GHz station for various modes : LPI, SP and VLP Wen Gong
` (2 preceding siblings ...)
2023-09-20 8:23 ` [PATCH v6 03/13] wifi: ath11k: fix a possible dead lock caused by ab->base_lock Wen Gong
@ 2023-09-20 8:23 ` Wen Gong
2023-09-21 19:58 ` Jeff Johnson
2023-09-22 9:32 ` Aditya Kumar Singh
2023-09-20 8:23 ` [PATCH v6 05/13] wifi: ath11k: update regulatory rules when connect to AP on 6 GHz band for station Wen Gong
` (8 subsequent siblings)
12 siblings, 2 replies; 48+ messages in thread
From: Wen Gong @ 2023-09-20 8:23 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson, quic_wgong
There are two power types for 6 GHz regulatory, one is AP, another
is client.
When wlan boot up, WMI_REG_CHAN_LIST_CC_EXT_EVENTID is sent from
firmware at an early stage, the interface mode is not decided at
this point, then ath11k select reg rules of AP type as default.
After interface is created, it is exactly decided the interface
type such as AP/mesh point/station. Then ath11k need to update
reg rules to the exact power type matched to the interface type.
The client power type is used for station interface, and AP power
type is used for AP/mesh point interface.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
---
drivers/net/wireless/ath/ath11k/mac.c | 14 ++++++++++++++
drivers/net/wireless/ath/ath11k/mac.h | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index c071bf5841af..0512c8b0661c 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -6714,6 +6714,12 @@ static int ath11k_mac_vdev_delete(struct ath11k *ar, struct ath11k_vif *arvif)
return ret;
}
+bool ath11k_mac_supports_6ghz_cc_ext(struct ath11k *ar)
+{
+ return (test_bit(WMI_TLV_SERVICE_REG_CC_EXT_EVENT_SUPPORT,
+ ar->ab->wmi_ab.svc_map)) && ar->supports_6ghz;
+}
+
static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,
struct ieee80211_vif *vif)
{
@@ -6939,6 +6945,14 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,
ret);
}
+ if (ath11k_mac_supports_6ghz_cc_ext(ar)) {
+ struct cur_regulatory_info *reg_info;
+
+ reg_info = &ab->reg_info_store[ar->pdev_idx];
+ ath11k_dbg(ab, ATH11K_DBG_MAC, "mac interface added to change reg rules\n");
+ ath11k_reg_handle_chan_list(ab, reg_info, IEEE80211_REG_LPI_AP);
+ }
+
mutex_unlock(&ar->conf_mutex);
return 0;
diff --git a/drivers/net/wireless/ath/ath11k/mac.h b/drivers/net/wireless/ath/ath11k/mac.h
index e4835e0b7998..94c5c61ae2bb 100644
--- a/drivers/net/wireless/ath/ath11k/mac.h
+++ b/drivers/net/wireless/ath/ath11k/mac.h
@@ -155,7 +155,7 @@ struct ath11k_vif *ath11k_mac_get_arvif_by_vdev_id(struct ath11k_base *ab,
u8 ath11k_mac_get_target_pdev_id(struct ath11k *ar);
u8 ath11k_mac_get_target_pdev_id_from_vif(struct ath11k_vif *arvif);
struct ath11k_vif *ath11k_mac_get_vif_up(struct ath11k_base *ab);
-
+bool ath11k_mac_supports_6ghz_cc_ext(struct ath11k *ar);
struct ath11k *ath11k_mac_get_ar_by_vdev_id(struct ath11k_base *ab, u32 vdev_id);
struct ath11k *ath11k_mac_get_ar_by_pdev_id(struct ath11k_base *ab, u32 pdev_id);
void ath11k_mac_drain_tx(struct ath11k *ar);
--
2.40.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v6 04/13] wifi: ath11k: update regulatory rules when interface added
2023-09-20 8:23 ` [PATCH v6 04/13] wifi: ath11k: update regulatory rules when interface added Wen Gong
@ 2023-09-21 19:58 ` Jeff Johnson
2023-09-22 9:32 ` Aditya Kumar Singh
1 sibling, 0 replies; 48+ messages in thread
From: Jeff Johnson @ 2023-09-21 19:58 UTC (permalink / raw)
To: Wen Gong, ath11k; +Cc: linux-wireless, kvalo
On 9/20/2023 1:23 AM, Wen Gong wrote:
> There are two power types for 6 GHz regulatory, one is AP, another
> is client.
>
> When wlan boot up, WMI_REG_CHAN_LIST_CC_EXT_EVENTID is sent from
> firmware at an early stage, the interface mode is not decided at
> this point, then ath11k select reg rules of AP type as default.
>
> After interface is created, it is exactly decided the interface
> type such as AP/mesh point/station. Then ath11k need to update
> reg rules to the exact power type matched to the interface type.
>
> The client power type is used for station interface, and AP power
> type is used for AP/mesh point interface.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v6 04/13] wifi: ath11k: update regulatory rules when interface added
2023-09-20 8:23 ` [PATCH v6 04/13] wifi: ath11k: update regulatory rules when interface added Wen Gong
2023-09-21 19:58 ` Jeff Johnson
@ 2023-09-22 9:32 ` Aditya Kumar Singh
1 sibling, 0 replies; 48+ messages in thread
From: Aditya Kumar Singh @ 2023-09-22 9:32 UTC (permalink / raw)
To: Wen Gong, ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson
On 9/20/23 13:53, Wen Gong wrote:
> There are two power types for 6 GHz regulatory, one is AP, another
> is client.
>
> When wlan boot up, WMI_REG_CHAN_LIST_CC_EXT_EVENTID is sent from
> firmware at an early stage, the interface mode is not decided at
> this point, then ath11k select reg rules of AP type as default.
>
> After interface is created, it is exactly decided the interface
> type such as AP/mesh point/station. Then ath11k need to update
> reg rules to the exact power type matched to the interface type.
>
> The client power type is used for station interface, and AP power
> type is used for AP/mesh point interface.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
> ---
> drivers/net/wireless/ath/ath11k/mac.c | 14 ++++++++++++++
> drivers/net/wireless/ath/ath11k/mac.h | 2 +-
> 2 files changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
> index c071bf5841af..0512c8b0661c 100644
> --- a/drivers/net/wireless/ath/ath11k/mac.c
> +++ b/drivers/net/wireless/ath/ath11k/mac.c
> @@ -6714,6 +6714,12 @@ static int ath11k_mac_vdev_delete(struct ath11k *ar, struct ath11k_vif *arvif)
> return ret;
> }
>
> +bool ath11k_mac_supports_6ghz_cc_ext(struct ath11k *ar)
> +{
> + return (test_bit(WMI_TLV_SERVICE_REG_CC_EXT_EVENT_SUPPORT,
> + ar->ab->wmi_ab.svc_map)) && ar->supports_6ghz;
> +}
> +
Primarily we are checking whether WMI service is advertised or not, so
better place to keep this function would be in wmi.c?
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v6 05/13] wifi: ath11k: update regulatory rules when connect to AP on 6 GHz band for station
2023-09-20 8:23 [PATCH v6 00/13] wifi: ath11k: add support for 6 GHz station for various modes : LPI, SP and VLP Wen Gong
` (3 preceding siblings ...)
2023-09-20 8:23 ` [PATCH v6 04/13] wifi: ath11k: update regulatory rules when interface added Wen Gong
@ 2023-09-20 8:23 ` Wen Gong
2023-09-21 19:59 ` Jeff Johnson
2023-09-22 9:39 ` Aditya Kumar Singh
2023-09-20 8:23 ` [PATCH v6 06/13] wifi: ath11k: save power spectral density(psd) of regulatory rule Wen Gong
` (7 subsequent siblings)
12 siblings, 2 replies; 48+ messages in thread
From: Wen Gong @ 2023-09-20 8:23 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson, quic_wgong
When station connect to AP on 6 GHz band, it needs switch the regulatory
rules according to the regulatory info sub field in HE operation element.
Switch to the power type which AP used for station interface.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
---
drivers/net/wireless/ath/ath11k/mac.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 0512c8b0661c..bc4ae3002322 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -7613,6 +7613,8 @@ ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
int ret;
struct peer_create_params param;
+ struct cur_regulatory_info *reg_info;
+ enum ieee80211_ap_reg_power power_type;
mutex_lock(&ar->conf_mutex);
@@ -7620,6 +7622,18 @@ ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
"chanctx assign ptr %p vdev_id %i\n",
ctx, arvif->vdev_id);
+ if (ath11k_mac_supports_6ghz_cc_ext(ar) &&
+ ctx->def.chan->band == NL80211_BAND_6GHZ &&
+ arvif->vdev_type == WMI_VDEV_TYPE_STA) {
+ reg_info = &ab->reg_info_store[ar->pdev_idx];
+ power_type = vif->bss_conf.power_type;
+ ath11k_dbg(ab, ATH11K_DBG_MAC, "mac chanctx power type %d\n",
+ power_type);
+ if (power_type == IEEE80211_REG_UNSET_AP)
+ power_type = IEEE80211_REG_LPI_AP;
+ ath11k_reg_handle_chan_list(ab, reg_info, power_type);
+ }
+
/* for QCA6390 bss peer must be created before vdev_start */
if (ab->hw_params.vdev_start_delay &&
arvif->vdev_type != WMI_VDEV_TYPE_AP &&
--
2.40.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v6 05/13] wifi: ath11k: update regulatory rules when connect to AP on 6 GHz band for station
2023-09-20 8:23 ` [PATCH v6 05/13] wifi: ath11k: update regulatory rules when connect to AP on 6 GHz band for station Wen Gong
@ 2023-09-21 19:59 ` Jeff Johnson
2023-09-22 9:39 ` Aditya Kumar Singh
1 sibling, 0 replies; 48+ messages in thread
From: Jeff Johnson @ 2023-09-21 19:59 UTC (permalink / raw)
To: Wen Gong, ath11k; +Cc: linux-wireless, kvalo
On 9/20/2023 1:23 AM, Wen Gong wrote:
> When station connect to AP on 6 GHz band, it needs switch the regulatory
> rules according to the regulatory info sub field in HE operation element.
> Switch to the power type which AP used for station interface.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v6 05/13] wifi: ath11k: update regulatory rules when connect to AP on 6 GHz band for station
2023-09-20 8:23 ` [PATCH v6 05/13] wifi: ath11k: update regulatory rules when connect to AP on 6 GHz band for station Wen Gong
2023-09-21 19:59 ` Jeff Johnson
@ 2023-09-22 9:39 ` Aditya Kumar Singh
2023-09-22 10:02 ` Wen Gong
1 sibling, 1 reply; 48+ messages in thread
From: Aditya Kumar Singh @ 2023-09-22 9:39 UTC (permalink / raw)
To: Wen Gong, ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson
On 9/20/23 13:53, Wen Gong wrote:
> + if (ath11k_mac_supports_6ghz_cc_ext(ar) &&
> + ctx->def.chan->band == NL80211_BAND_6GHZ &&
> + arvif->vdev_type == WMI_VDEV_TYPE_STA) {
> + reg_info = &ab->reg_info_store[ar->pdev_idx];
> + power_type = vif->bss_conf.power_type;
> + ath11k_dbg(ab, ATH11K_DBG_MAC, "mac chanctx power type %d\n",
> + power_type);
> + if (power_type == IEEE80211_REG_UNSET_AP)
> + power_type = IEEE80211_REG_LPI_AP;
Why having _UNSET_ power type in vif->bss_conf.power_type is fine?
Typically, during association, we would be setting this from the
beacon/association response frame's HE 6 GHz Operation Info Field. So is
it fine if the field is carrying some info which we don't know (or may
be don't support it yet)? Why are we masking it with _LPI_ mode?
Also, I see that currently mac80211 only sets LPI or SP. So let's say
STA is trying to connect to VLP AP, mac80211 will set it as _UNSET_. And
then here, we will be treating it as LPI AP. Is that fine?
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v6 05/13] wifi: ath11k: update regulatory rules when connect to AP on 6 GHz band for station
2023-09-22 9:39 ` Aditya Kumar Singh
@ 2023-09-22 10:02 ` Wen Gong
2023-09-22 13:18 ` Aditya Kumar Singh
0 siblings, 1 reply; 48+ messages in thread
From: Wen Gong @ 2023-09-22 10:02 UTC (permalink / raw)
To: Aditya Kumar Singh, ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson
On 9/22/2023 5:39 PM, Aditya Kumar Singh wrote:
> On 9/20/23 13:53, Wen Gong wrote:
>
>> + if (ath11k_mac_supports_6ghz_cc_ext(ar) &&
>> + ctx->def.chan->band == NL80211_BAND_6GHZ &&
>> + arvif->vdev_type == WMI_VDEV_TYPE_STA) {
>> + reg_info = &ab->reg_info_store[ar->pdev_idx];
>> + power_type = vif->bss_conf.power_type;
>> + ath11k_dbg(ab, ATH11K_DBG_MAC, "mac chanctx power type %d\n",
>> + power_type);
>> + if (power_type == IEEE80211_REG_UNSET_AP)
>> + power_type = IEEE80211_REG_LPI_AP;
> Why having _UNSET_ power type in vif->bss_conf.power_type is fine?
> Typically, during association, we would be setting this from the
> beacon/association response frame's HE 6 GHz Operation Info Field. So
> is it fine if the field is carrying some info which we don't know (or
> may be don't support it yet)? Why are we masking it with _LPI_ mode?
>
> Also, I see that currently mac80211 only sets LPI or SP. So let's say
> STA is trying to connect to VLP AP, mac80211 will set it as _UNSET_.
> And then here, we will be treating it as LPI AP. Is that fine?
Currently only SP/LPI are defined in "Table E-12—Regulatory Info
subfield encoding in the United States" of IEEE Std 802.11ax™‐2021.
So maybe I need to set power_type to VLP when it is UNSET here.
>
>
>
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v6 05/13] wifi: ath11k: update regulatory rules when connect to AP on 6 GHz band for station
2023-09-22 10:02 ` Wen Gong
@ 2023-09-22 13:18 ` Aditya Kumar Singh
2023-09-25 10:43 ` Wen Gong
0 siblings, 1 reply; 48+ messages in thread
From: Aditya Kumar Singh @ 2023-09-22 13:18 UTC (permalink / raw)
To: Wen Gong, ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson
On 9/22/23 15:32, Wen Gong wrote:
> On 9/22/2023 5:39 PM, Aditya Kumar Singh wrote:
>> On 9/20/23 13:53, Wen Gong wrote:
>>
>>> + if (ath11k_mac_supports_6ghz_cc_ext(ar) &&
>>> + ctx->def.chan->band == NL80211_BAND_6GHZ &&
>>> + arvif->vdev_type == WMI_VDEV_TYPE_STA) {
>>> + reg_info = &ab->reg_info_store[ar->pdev_idx];
>>> + power_type = vif->bss_conf.power_type;
>>> + ath11k_dbg(ab, ATH11K_DBG_MAC, "mac chanctx power type %d\n",
>>> + power_type);
>>> + if (power_type == IEEE80211_REG_UNSET_AP)
>>> + power_type = IEEE80211_REG_LPI_AP;
>> Why having _UNSET_ power type in vif->bss_conf.power_type is fine?
>> Typically, during association, we would be setting this from the
>> beacon/association response frame's HE 6 GHz Operation Info Field. So
>> is it fine if the field is carrying some info which we don't know (or
>> may be don't support it yet)? Why are we masking it with _LPI_ mode?
>>
>> Also, I see that currently mac80211 only sets LPI or SP. So let's say
>> STA is trying to connect to VLP AP, mac80211 will set it as _UNSET_.
>> And then here, we will be treating it as LPI AP. Is that fine?
>
> Currently only SP/LPI are defined in "Table E-12—Regulatory Info
> subfield encoding in the United States" of IEEE Std 802.11ax™‐2021.
>
> So maybe I need to set power_type to VLP when it is UNSET here.
Yeah, or may be deny association if we don't support that mode? I would
let others comment on this.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v6 05/13] wifi: ath11k: update regulatory rules when connect to AP on 6 GHz band for station
2023-09-22 13:18 ` Aditya Kumar Singh
@ 2023-09-25 10:43 ` Wen Gong
2023-09-25 10:52 ` Aditya Kumar Singh
0 siblings, 1 reply; 48+ messages in thread
From: Wen Gong @ 2023-09-25 10:43 UTC (permalink / raw)
To: Aditya Kumar Singh, ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson
On 9/22/2023 9:18 PM, Aditya Kumar Singh wrote:
> On 9/22/23 15:32, Wen Gong wrote:
>> On 9/22/2023 5:39 PM, Aditya Kumar Singh wrote:
>>> On 9/20/23 13:53, Wen Gong wrote:
>>>
>>>> + if (ath11k_mac_supports_6ghz_cc_ext(ar) &&
>>>> + ctx->def.chan->band == NL80211_BAND_6GHZ &&
>>>> + arvif->vdev_type == WMI_VDEV_TYPE_STA) {
>>>> + reg_info = &ab->reg_info_store[ar->pdev_idx];
>>>> + power_type = vif->bss_conf.power_type;
>>>> + ath11k_dbg(ab, ATH11K_DBG_MAC, "mac chanctx power type %d\n",
>>>> + power_type);
>>>> + if (power_type == IEEE80211_REG_UNSET_AP)
>>>> + power_type = IEEE80211_REG_LPI_AP;
>>> Why having _UNSET_ power type in vif->bss_conf.power_type is fine?
>>> Typically, during association, we would be setting this from the
>>> beacon/association response frame's HE 6 GHz Operation Info Field.
>>> So is it fine if the field is carrying some info which we don't know
>>> (or may be don't support it yet)? Why are we masking it with _LPI_
>>> mode?
>>>
>>> Also, I see that currently mac80211 only sets LPI or SP. So let's
>>> say STA is trying to connect to VLP AP, mac80211 will set it as
>>> _UNSET_. And then here, we will be treating it as LPI AP. Is that fine?
>>
>> Currently only SP/LPI are defined in "Table E-12—Regulatory Info
>> subfield encoding in the United States" of IEEE Std 802.11ax™‐2021.
>>
>> So maybe I need to set power_type to VLP when it is UNSET here.
> Yeah, or may be deny association if we don't support that mode? I
> would let others comment on this.
Do you know how to check which mode support by ath11k?
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v6 05/13] wifi: ath11k: update regulatory rules when connect to AP on 6 GHz band for station
2023-09-25 10:43 ` Wen Gong
@ 2023-09-25 10:52 ` Aditya Kumar Singh
2023-09-25 10:57 ` Wen Gong
0 siblings, 1 reply; 48+ messages in thread
From: Aditya Kumar Singh @ 2023-09-25 10:52 UTC (permalink / raw)
To: Wen Gong, ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson
On 9/25/23 16:13, Wen Gong wrote:
> On 9/22/2023 9:18 PM, Aditya Kumar Singh wrote:
>> On 9/22/23 15:32, Wen Gong wrote:
>>> On 9/22/2023 5:39 PM, Aditya Kumar Singh wrote:
>>>> On 9/20/23 13:53, Wen Gong wrote:
>>>>
>>>>> + if (ath11k_mac_supports_6ghz_cc_ext(ar) &&
>>>>> + ctx->def.chan->band == NL80211_BAND_6GHZ &&
>>>>> + arvif->vdev_type == WMI_VDEV_TYPE_STA) {
>>>>> + reg_info = &ab->reg_info_store[ar->pdev_idx];
>>>>> + power_type = vif->bss_conf.power_type;
>>>>> + ath11k_dbg(ab, ATH11K_DBG_MAC, "mac chanctx power type %d\n",
>>>>> + power_type);
>>>>> + if (power_type == IEEE80211_REG_UNSET_AP)
>>>>> + power_type = IEEE80211_REG_LPI_AP;
>>>> Why having _UNSET_ power type in vif->bss_conf.power_type is fine?
>>>> Typically, during association, we would be setting this from the
>>>> beacon/association response frame's HE 6 GHz Operation Info Field.
>>>> So is it fine if the field is carrying some info which we don't know
>>>> (or may be don't support it yet)? Why are we masking it with _LPI_
>>>> mode?
>>>>
>>>> Also, I see that currently mac80211 only sets LPI or SP. So let's
>>>> say STA is trying to connect to VLP AP, mac80211 will set it as
>>>> _UNSET_. And then here, we will be treating it as LPI AP. Is that fine?
>>>
>>> Currently only SP/LPI are defined in "Table E-12—Regulatory Info
>>> subfield encoding in the United States" of IEEE Std 802.11ax™‐2021.
>>>
>>> So maybe I need to set power_type to VLP when it is UNSET here.
>> Yeah, or may be deny association if we don't support that mode? I
>> would let others comment on this.
> Do you know how to check which mode support by ath11k?
IMHO we should not maintain two different supported modes, one in driver
and another in mac80211. I mean w.r.t mac80211 we should try to match it
as far as possible. In this case, we can return error from mac80211
itself when a non-supported mode (as in VLP) is trying to associate?
Since as you have quoted, VLP is not yet defined in spec IEEE Std
802.11ax‐2021 so why to mask the mode and continue in mac80211 itself?
If we do like this, then mac80211 will not simply set _UNSET_ for 6 GHz
client interface and in driver if we see its still _UNSET_ then we can
be sure that something has gone wrong and we can take steps accordingly.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v6 05/13] wifi: ath11k: update regulatory rules when connect to AP on 6 GHz band for station
2023-09-25 10:52 ` Aditya Kumar Singh
@ 2023-09-25 10:57 ` Wen Gong
0 siblings, 0 replies; 48+ messages in thread
From: Wen Gong @ 2023-09-25 10:57 UTC (permalink / raw)
To: Aditya Kumar Singh, ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson
On 9/25/2023 6:52 PM, Aditya Kumar Singh wrote:
> On 9/25/23 16:13, Wen Gong wrote:
>> On 9/22/2023 9:18 PM, Aditya Kumar Singh wrote:
>>> On 9/22/23 15:32, Wen Gong wrote:
>>>> On 9/22/2023 5:39 PM, Aditya Kumar Singh wrote:
>>>>> On 9/20/23 13:53, Wen Gong wrote:
>>>>>
>>>>>> + if (ath11k_mac_supports_6ghz_cc_ext(ar) &&
>>>>>> + ctx->def.chan->band == NL80211_BAND_6GHZ &&
>>>>>> + arvif->vdev_type == WMI_VDEV_TYPE_STA) {
>>>>>> + reg_info = &ab->reg_info_store[ar->pdev_idx];
>>>>>> + power_type = vif->bss_conf.power_type;
>>>>>> + ath11k_dbg(ab, ATH11K_DBG_MAC, "mac chanctx power type
>>>>>> %d\n",
>>>>>> + power_type);
>>>>>> + if (power_type == IEEE80211_REG_UNSET_AP)
>>>>>> + power_type = IEEE80211_REG_LPI_AP;
>>>>> Why having _UNSET_ power type in vif->bss_conf.power_type is fine?
>>>>> Typically, during association, we would be setting this from the
>>>>> beacon/association response frame's HE 6 GHz Operation Info Field.
>>>>> So is it fine if the field is carrying some info which we don't
>>>>> know (or may be don't support it yet)? Why are we masking it with
>>>>> _LPI_ mode?
>>>>>
>>>>> Also, I see that currently mac80211 only sets LPI or SP. So let's
>>>>> say STA is trying to connect to VLP AP, mac80211 will set it as
>>>>> _UNSET_. And then here, we will be treating it as LPI AP. Is that
>>>>> fine?
>>>>
>>>> Currently only SP/LPI are defined in "Table E-12—Regulatory Info
>>>> subfield encoding in the United States" of IEEE Std 802.11ax™‐2021.
>>>>
>>>> So maybe I need to set power_type to VLP when it is UNSET here.
>>> Yeah, or may be deny association if we don't support that mode? I
>>> would let others comment on this.
>> Do you know how to check which mode support by ath11k?
> IMHO we should not maintain two different supported modes, one in
> driver and another in mac80211. I mean w.r.t mac80211 we should try to
> match it as far as possible. In this case, we can return error from
> mac80211 itself when a non-supported mode (as in VLP) is trying to
> associate? Since as you have quoted, VLP is not yet defined in spec
> IEEE Std 802.11ax‐2021 so why to mask the mode and continue in
> mac80211 itself?
>
> If we do like this, then mac80211 will not simply set _UNSET_ for 6
> GHz client interface and in driver if we see its still _UNSET_ then we
> can be sure that something has gone wrong and we can take steps
> accordingly.
Yes, I will change to return fail for _UNSET_.
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v6 06/13] wifi: ath11k: save power spectral density(psd) of regulatory rule
2023-09-20 8:23 [PATCH v6 00/13] wifi: ath11k: add support for 6 GHz station for various modes : LPI, SP and VLP Wen Gong
` (4 preceding siblings ...)
2023-09-20 8:23 ` [PATCH v6 05/13] wifi: ath11k: update regulatory rules when connect to AP on 6 GHz band for station Wen Gong
@ 2023-09-20 8:23 ` Wen Gong
2023-09-21 20:00 ` Jeff Johnson
2023-09-22 9:49 ` Aditya Kumar Singh
2023-09-20 8:23 ` [PATCH v6 07/13] wifi: ath11k: add parse of transmit power envelope element Wen Gong
` (6 subsequent siblings)
12 siblings, 2 replies; 48+ messages in thread
From: Wen Gong @ 2023-09-20 8:23 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson, quic_wgong
Save the power spectral density(psd) report from firmware to struct
ieee80211_reg_rule.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
---
drivers/net/wireless/ath/ath11k/reg.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/reg.c b/drivers/net/wireless/ath/ath11k/reg.c
index 0535ab8a28fa..622fb07eade0 100644
--- a/drivers/net/wireless/ath/ath11k/reg.c
+++ b/drivers/net/wireless/ath/ath11k/reg.c
@@ -413,6 +413,10 @@ static void ath11k_reg_intersect_rules(struct ieee80211_reg_rule *rule1,
/* Use the flags of both the rules */
new_rule->flags = rule1->flags | rule2->flags;
+ if ((rule1->flags & NL80211_RRF_PSD) && (rule2->flags & NL80211_RRF_PSD))
+ new_rule->psd = min_t(s8, rule1->psd, rule2->psd);
+ else
+ new_rule->flags &= ~NL80211_RRF_PSD;
/* To be safe, lts use the max cac timeout of both rules */
new_rule->dfs_cac_ms = max_t(u32, rule1->dfs_cac_ms,
@@ -516,13 +520,14 @@ ath11k_reg_adjust_bw(u16 start_freq, u16 end_freq, u16 max_bw)
static void
ath11k_reg_update_rule(struct ieee80211_reg_rule *reg_rule, u32 start_freq,
u32 end_freq, u32 bw, u32 ant_gain, u32 reg_pwr,
- u32 reg_flags)
+ s8 psd, u32 reg_flags)
{
reg_rule->freq_range.start_freq_khz = MHZ_TO_KHZ(start_freq);
reg_rule->freq_range.end_freq_khz = MHZ_TO_KHZ(end_freq);
reg_rule->freq_range.max_bandwidth_khz = MHZ_TO_KHZ(bw);
reg_rule->power_rule.max_antenna_gain = DBI_TO_MBI(ant_gain);
reg_rule->power_rule.max_eirp = DBM_TO_MBM(reg_pwr);
+ reg_rule->psd = psd;
reg_rule->flags = reg_flags;
}
@@ -552,7 +557,7 @@ ath11k_reg_update_weather_radar_band(struct ath11k_base *ab,
reg_rule->start_freq,
ETSI_WEATHER_RADAR_BAND_LOW, bw,
reg_rule->ant_gain, reg_rule->reg_power,
- flags);
+ reg_rule->psd_eirp, flags);
ath11k_dbg(ab, ATH11K_DBG_REG,
"\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",
@@ -573,7 +578,7 @@ ath11k_reg_update_weather_radar_band(struct ath11k_base *ab,
ath11k_reg_update_rule(regd->reg_rules + i, start_freq,
end_freq, bw, reg_rule->ant_gain,
- reg_rule->reg_power, flags);
+ reg_rule->reg_power, reg_rule->psd_eirp, flags);
regd->reg_rules[i].dfs_cac_ms = ETSI_WEATHER_RADAR_BAND_CAC_TIMEOUT;
@@ -594,7 +599,7 @@ ath11k_reg_update_weather_radar_band(struct ath11k_base *ab,
ETSI_WEATHER_RADAR_BAND_HIGH,
reg_rule->end_freq, bw,
reg_rule->ant_gain, reg_rule->reg_power,
- flags);
+ reg_rule->psd_eirp, flags);
ath11k_dbg(ab, ATH11K_DBG_REG,
"\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n",
@@ -716,6 +721,8 @@ ath11k_reg_build_regd(struct ath11k_base *ab,
reg_rule = reg_rule_6ghz + k++;
max_bw = min_t(u16, reg_rule->max_bw, max_bw_6ghz);
flags = NL80211_RRF_AUTO_BW;
+ if (reg_rule->psd_flag)
+ flags |= NL80211_RRF_PSD;
} else {
break;
}
@@ -726,7 +733,7 @@ ath11k_reg_build_regd(struct ath11k_base *ab,
reg_rule->start_freq,
reg_rule->end_freq, max_bw,
reg_rule->ant_gain, reg_rule->reg_power,
- flags);
+ reg_rule->psd_eirp, flags);
/* Update dfs cac timeout if the dfs domain is ETSI and the
* new rule covers weather radar band.
--
2.40.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH v6 07/13] wifi: ath11k: add parse of transmit power envelope element
2023-09-20 8:23 [PATCH v6 00/13] wifi: ath11k: add support for 6 GHz station for various modes : LPI, SP and VLP Wen Gong
` (5 preceding siblings ...)
2023-09-20 8:23 ` [PATCH v6 06/13] wifi: ath11k: save power spectral density(psd) of regulatory rule Wen Gong
@ 2023-09-20 8:23 ` Wen Gong
2023-09-21 20:04 ` Jeff Johnson
2023-09-20 8:23 ` [PATCH v6 08/13] wifi: ath11k: save max tx power in vdev start response event from firmware Wen Gong
` (5 subsequent siblings)
12 siblings, 1 reply; 48+ messages in thread
From: Wen Gong @ 2023-09-20 8:23 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson, quic_wgong
The transmit power envelope element has some fields for power, ath11k
should parse it according to IEEE Std 802.11ax™‐2021.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
---
drivers/net/wireless/ath/ath11k/core.h | 38 +++++
drivers/net/wireless/ath/ath11k/mac.c | 185 +++++++++++++++++++++++++
2 files changed, 223 insertions(+)
diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h
index 9fbe4f67218c..42e02df0526c 100644
--- a/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@ -311,6 +311,43 @@ struct ath11k_rekey_data {
bool enable_offload;
};
+/**
+ * struct chan_power_info - TPE containing power info per channel chunk
+ * @chan_cfreq: channel center freq (MHz)
+ * e.g.
+ * channel 37/20 MHz, it is 6135
+ * channel 37/40 MHz, it is 6125
+ * channel 37/80 MHz, it is 6145
+ * channel 37/160 MHz, it is 6185
+ * @tx_power: transmit power (dBm)
+ */
+struct chan_power_info {
+ u16 chan_cfreq;
+ s8 tx_power;
+};
+
+/**
+ * struct reg_tpc_power_info - regulatory TPC power info
+ * @is_psd_power: is PSD power or not
+ * @eirp_power: Maximum EIRP power (dBm), valid only if power is PSD
+ * @ap_power_type: type of power (SP/LPI/VLP)
+ * @num_pwr_levels: number of power levels
+ * @reg_max: Array of maximum TX power (dBm) per PSD value
+ * @ap_constraint_power: AP constraint power (dBm)
+ * @tpe: TPE values processed from TPE IE
+ * @chan_power_info: power info to send to firmware
+ */
+struct ath11k_reg_tpc_power_info {
+ bool is_psd_power;
+ u8 eirp_power;
+ enum wmi_reg_6ghz_ap_type ap_power_type;
+ u8 num_pwr_levels;
+ u8 reg_max[IEEE80211_MAX_NUM_PWR_LEVEL];
+ u8 ap_constraint_power;
+ s8 tpe[IEEE80211_MAX_NUM_PWR_LEVEL];
+ struct chan_power_info chan_power_info[IEEE80211_MAX_NUM_PWR_LEVEL];
+};
+
struct ath11k_vif {
u32 vdev_id;
enum wmi_vdev_type vdev_type;
@@ -369,6 +406,7 @@ struct ath11k_vif {
#ifdef CONFIG_ATH11K_DEBUGFS
struct dentry *debugfs_twt;
#endif /* CONFIG_ATH11K_DEBUGFS */
+ struct ath11k_reg_tpc_power_info reg_tpc_info;
};
struct ath11k_vif_iter {
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index bc4ae3002322..bfb900d98347 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -7602,6 +7602,189 @@ static int ath11k_start_vdev_delay(struct ieee80211_hw *hw,
return 0;
}
+static u8 ath11k_mac_get_tpe_count(u8 txpwr_intrprt, u8 txpwr_cnt)
+{
+ switch (txpwr_intrprt) {
+ /* Refer "Table 9-276-Meaning of Maximum Transmit Power Count subfield
+ * if the Maximum Transmit Power Interpretation subfield is 0 or 2" of
+ * "IEEE Std 802.11ax 2021".
+ */
+ case IEEE80211_TPE_LOCAL_EIRP:
+ case IEEE80211_TPE_REG_CLIENT_EIRP:
+ txpwr_cnt = txpwr_cnt <= 3 ? txpwr_cnt : 3;
+ txpwr_cnt = txpwr_cnt + 1;
+ break;
+ /* Refer "Table 9-277-Meaning of Maximum Transmit Power Count subfield
+ * if Maximum Transmit Power Interpretation subfield is 1 or 3" of
+ * "IEEE Std 802.11ax 2021".
+ */
+ case IEEE80211_TPE_LOCAL_EIRP_PSD:
+ case IEEE80211_TPE_REG_CLIENT_EIRP_PSD:
+ txpwr_cnt = txpwr_cnt <= 4 ? txpwr_cnt : 4;
+ txpwr_cnt = txpwr_cnt ? (BIT(txpwr_cnt - 1)) : 1;
+ break;
+ }
+
+ return txpwr_cnt;
+}
+
+static u8 ath11k_mac_get_num_pwr_levels(struct cfg80211_chan_def *chan_def)
+{
+ if (chan_def->chan->flags & IEEE80211_CHAN_PSD) {
+ switch (chan_def->width) {
+ case NL80211_CHAN_WIDTH_20:
+ return 1;
+ case NL80211_CHAN_WIDTH_40:
+ return 2;
+ case NL80211_CHAN_WIDTH_80:
+ return 4;
+ case NL80211_CHAN_WIDTH_80P80:
+ case NL80211_CHAN_WIDTH_160:
+ return 8;
+ default:
+ return 1;
+ }
+ } else {
+ switch (chan_def->width) {
+ case NL80211_CHAN_WIDTH_20:
+ return 1;
+ case NL80211_CHAN_WIDTH_40:
+ return 2;
+ case NL80211_CHAN_WIDTH_80:
+ return 3;
+ case NL80211_CHAN_WIDTH_80P80:
+ case NL80211_CHAN_WIDTH_160:
+ return 4;
+ default:
+ return 1;
+ }
+ }
+}
+
+static void ath11k_mac_parse_tx_pwr_env(struct ath11k *ar,
+ struct ieee80211_vif *vif,
+ struct ieee80211_chanctx_conf *ctx)
+{
+ struct ath11k_base *ab = ar->ab;
+ struct ath11k_vif *arvif = (void *)vif->drv_priv;
+ struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
+ struct ieee80211_tx_pwr_env *single_tpe;
+ enum wmi_reg_6ghz_client_type client_type;
+ struct cur_regulatory_info *reg_info;
+ int i;
+ u8 pwr_count, pwr_interpret, pwr_category;
+ u8 psd_index = 0, non_psd_index = 0, local_tpe_count = 0, reg_tpe_count = 0;
+ bool use_local_tpe, non_psd_set = false, psd_set = false;
+
+ reg_info = &ab->reg_info_store[ar->pdev_idx];
+ client_type = reg_info->client_type;
+
+ for (i = 0; i < bss_conf->tx_pwr_env_num; i++) {
+ single_tpe = &bss_conf->tx_pwr_env[i];
+ pwr_category = u8_get_bits(single_tpe->tx_power_info,
+ IEEE80211_TX_PWR_ENV_INFO_CATEGORY);
+ pwr_interpret = u8_get_bits(single_tpe->tx_power_info,
+ IEEE80211_TX_PWR_ENV_INFO_INTERPRET);
+
+ if (pwr_category == client_type) {
+ if (pwr_interpret == IEEE80211_TPE_LOCAL_EIRP ||
+ pwr_interpret == IEEE80211_TPE_LOCAL_EIRP_PSD)
+ local_tpe_count++;
+ else if (pwr_interpret == IEEE80211_TPE_REG_CLIENT_EIRP ||
+ pwr_interpret == IEEE80211_TPE_REG_CLIENT_EIRP_PSD)
+ reg_tpe_count++;
+ }
+ }
+
+ if (!reg_tpe_count && !local_tpe_count) {
+ ath11k_warn(ab,
+ "no transmit power envelope match client power type %d\n",
+ client_type);
+ return;
+ } else if (!reg_tpe_count) {
+ use_local_tpe = true;
+ } else {
+ use_local_tpe = false;
+ }
+
+ for (i = 0; i < bss_conf->tx_pwr_env_num; i++) {
+ single_tpe = &bss_conf->tx_pwr_env[i];
+ pwr_category = u8_get_bits(single_tpe->tx_power_info,
+ IEEE80211_TX_PWR_ENV_INFO_CATEGORY);
+ pwr_interpret = u8_get_bits(single_tpe->tx_power_info,
+ IEEE80211_TX_PWR_ENV_INFO_INTERPRET);
+
+ if (pwr_category != client_type)
+ continue;
+
+ /* get local transmit power envelope */
+ if (use_local_tpe) {
+ if (pwr_interpret == IEEE80211_TPE_LOCAL_EIRP) {
+ non_psd_index = i;
+ non_psd_set = true;
+ } else if (pwr_interpret == IEEE80211_TPE_LOCAL_EIRP_PSD) {
+ psd_index = i;
+ psd_set = true;
+ }
+ /* get regulatory transmit power envelope */
+ } else {
+ if (pwr_interpret == IEEE80211_TPE_REG_CLIENT_EIRP) {
+ non_psd_index = i;
+ non_psd_set = true;
+ } else if (pwr_interpret == IEEE80211_TPE_REG_CLIENT_EIRP_PSD) {
+ psd_index = i;
+ psd_set = true;
+ }
+ }
+ }
+
+ if (non_psd_set && !psd_set) {
+ single_tpe = &bss_conf->tx_pwr_env[non_psd_index];
+ pwr_count = u8_get_bits(single_tpe->tx_power_info,
+ IEEE80211_TX_PWR_ENV_INFO_COUNT);
+ pwr_interpret = u8_get_bits(single_tpe->tx_power_info,
+ IEEE80211_TX_PWR_ENV_INFO_INTERPRET);
+ arvif->reg_tpc_info.is_psd_power = false;
+ arvif->reg_tpc_info.eirp_power = 0;
+
+ arvif->reg_tpc_info.num_pwr_levels =
+ ath11k_mac_get_tpe_count(pwr_interpret, pwr_count);
+ for (i = 0; i < arvif->reg_tpc_info.num_pwr_levels; i++) {
+ ath11k_dbg(ab, ATH11K_DBG_MAC,
+ "non PSD power[%d] : %d\n",
+ i, single_tpe->tx_power[i]);
+ arvif->reg_tpc_info.tpe[i] = single_tpe->tx_power[i] / 2;
+ }
+ }
+
+ if (psd_set) {
+ single_tpe = &bss_conf->tx_pwr_env[psd_index];
+ pwr_count = u8_get_bits(single_tpe->tx_power_info,
+ IEEE80211_TX_PWR_ENV_INFO_COUNT);
+ pwr_interpret = u8_get_bits(single_tpe->tx_power_info,
+ IEEE80211_TX_PWR_ENV_INFO_INTERPRET);
+ arvif->reg_tpc_info.is_psd_power = true;
+
+ if (pwr_count == 0) {
+ ath11k_dbg(ab, ATH11K_DBG_MAC,
+ "TPE PSD power : %d\n", single_tpe->tx_power[0]);
+ arvif->reg_tpc_info.num_pwr_levels =
+ ath11k_mac_get_num_pwr_levels(&ctx->def);
+ for (i = 0; i < arvif->reg_tpc_info.num_pwr_levels; i++)
+ arvif->reg_tpc_info.tpe[i] = single_tpe->tx_power[0] / 2;
+ } else {
+ arvif->reg_tpc_info.num_pwr_levels =
+ ath11k_mac_get_tpe_count(pwr_interpret, pwr_count);
+ for (i = 0; i < arvif->reg_tpc_info.num_pwr_levels; i++) {
+ ath11k_dbg(ab, ATH11K_DBG_MAC,
+ "TPE PSD power[%d] : %d\n",
+ i, single_tpe->tx_power[i]);
+ arvif->reg_tpc_info.tpe[i] = single_tpe->tx_power[i] / 2;
+ }
+ }
+ }
+}
+
static int
ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
@@ -7632,6 +7815,8 @@ ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
if (power_type == IEEE80211_REG_UNSET_AP)
power_type = IEEE80211_REG_LPI_AP;
ath11k_reg_handle_chan_list(ab, reg_info, power_type);
+
+ ath11k_mac_parse_tx_pwr_env(ar, vif, ctx);
}
/* for QCA6390 bss peer must be created before vdev_start */
--
2.40.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH v6 08/13] wifi: ath11k: save max tx power in vdev start response event from firmware
2023-09-20 8:23 [PATCH v6 00/13] wifi: ath11k: add support for 6 GHz station for various modes : LPI, SP and VLP Wen Gong
` (6 preceding siblings ...)
2023-09-20 8:23 ` [PATCH v6 07/13] wifi: ath11k: add parse of transmit power envelope element Wen Gong
@ 2023-09-20 8:23 ` Wen Gong
2023-09-21 20:04 ` Jeff Johnson
2023-09-20 8:23 ` [PATCH v6 09/13] wifi: ath11k: fill parameters for vdev set tpc power WMI command Wen Gong
` (4 subsequent siblings)
12 siblings, 1 reply; 48+ messages in thread
From: Wen Gong @ 2023-09-20 8:23 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson, quic_wgong
Save the max tx power received in the vdev start response event from
firmware. A subsequent patch will use this to calculate the final power
value for WMI_VDEV_SET_TPC_POWER_CMDID.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
---
drivers/net/wireless/ath/ath11k/core.h | 1 +
drivers/net/wireless/ath/ath11k/wmi.c | 3 ++-
drivers/net/wireless/ath/ath11k/wmi.h | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h
index 42e02df0526c..ebbea4719572 100644
--- a/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@ -775,6 +775,7 @@ struct ath11k {
/* protected by conf_mutex */
bool ps_state_enable;
bool ps_timekeeper_enable;
+ s8 max_allowed_tx_power;
};
struct ath11k_band_cap {
diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index c427299b7202..d93ed92335c7 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -5033,6 +5033,7 @@ static int ath11k_pull_vdev_start_resp_tlv(struct ath11k_base *ab, struct sk_buf
vdev_rsp->mac_id = ev->mac_id;
vdev_rsp->cfgd_tx_streams = ev->cfgd_tx_streams;
vdev_rsp->cfgd_rx_streams = ev->cfgd_rx_streams;
+ vdev_rsp->max_allowed_tx_power = ev->max_allowed_tx_power;
kfree(tb);
return 0;
@@ -7425,7 +7426,7 @@ static void ath11k_vdev_start_resp_event(struct ath11k_base *ab, struct sk_buff
}
ar->last_wmi_vdev_start_status = 0;
-
+ ar->max_allowed_tx_power = vdev_start_resp.max_allowed_tx_power;
status = vdev_start_resp.status;
if (WARN_ON_ONCE(status)) {
diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index a34a04bd4612..106e1d672b9a 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -4143,6 +4143,7 @@ struct wmi_vdev_start_resp_event {
};
u32 cfgd_tx_streams;
u32 cfgd_rx_streams;
+ s32 max_allowed_tx_power;
} __packed;
/* VDEV start response status codes */
--
2.40.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH v6 09/13] wifi: ath11k: fill parameters for vdev set tpc power WMI command
2023-09-20 8:23 [PATCH v6 00/13] wifi: ath11k: add support for 6 GHz station for various modes : LPI, SP and VLP Wen Gong
` (7 preceding siblings ...)
2023-09-20 8:23 ` [PATCH v6 08/13] wifi: ath11k: save max tx power in vdev start response event from firmware Wen Gong
@ 2023-09-20 8:23 ` Wen Gong
2023-09-21 20:09 ` Jeff Johnson
` (2 more replies)
2023-09-20 8:23 ` [PATCH v6 10/13] wifi: ath11k: add WMI_TLV_SERVICE_EXT_TPC_REG_SUPPORT service bit Wen Gong
` (3 subsequent siblings)
12 siblings, 3 replies; 48+ messages in thread
From: Wen Gong @ 2023-09-20 8:23 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson, quic_wgong
Prepare the parameters which is needed for WMI command WMI_VDEV_SET_TPC_POWER_CMDID.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
---
drivers/net/wireless/ath/ath11k/mac.c | 277 ++++++++++++++++++++++++++
drivers/net/wireless/ath/ath11k/mac.h | 3 +
2 files changed, 280 insertions(+)
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index bfb900d98347..f05d66913abd 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -7661,6 +7661,283 @@ static u8 ath11k_mac_get_num_pwr_levels(struct cfg80211_chan_def *chan_def)
}
}
+static u16 ath11k_mac_get_6ghz_start_frequency(struct cfg80211_chan_def *chan_def)
+{
+ u16 diff_seq;
+
+ /* It is to get the lowest channel number's center frequency of the chan.
+ * For example,
+ * bandwidth=40 MHz, center frequency is 5965, lowest channel is 1
+ * with center frequency 5955, its diff is 5965 - 5955 = 10.
+ * bandwidth=80 MHz, center frequency is 5985, lowest channel is 1
+ * with center frequency 5955, its diff is 5985 - 5955 = 30.
+ * bandwidth=160 MHz, center frequency is 6025, lowest channel is 1
+ * with center frequency 5955, its diff is 6025 - 5955 = 70.
+ */
+ switch (chan_def->width) {
+ case NL80211_CHAN_WIDTH_160:
+ diff_seq = 70;
+ break;
+ case NL80211_CHAN_WIDTH_80:
+ case NL80211_CHAN_WIDTH_80P80:
+ diff_seq = 30;
+ break;
+ case NL80211_CHAN_WIDTH_40:
+ diff_seq = 10;
+ break;
+ default:
+ diff_seq = 0;
+ }
+
+ return chan_def->center_freq1 - diff_seq;
+}
+
+static u16 ath11k_mac_get_seg_freq(struct cfg80211_chan_def *chan_def,
+ u16 start_seq, u8 seq)
+{
+ u16 seg_seq;
+
+ /* It is to get the center frequency of the specific bandwidth.
+ * start_seq means the lowest channel number's center frequency.
+ * seq 0/1/2/3 means 20 MHz/40 MHz/80 MHz/160 MHz&80P80.
+ * For example,
+ * lowest channel is 1, its center frequency 5955,
+ * center frequency is 5955 when bandwidth=20 MHz, its diff is 5955 - 5955 = 0.
+ * lowest channel is 1, its center frequency 5955,
+ * center frequency is 5965 when bandwidth=40 MHz, its diff is 5965 - 5955 = 10.
+ * lowest channel is 1, its center frequency 5955,
+ * center frequency is 5985 when bandwidth=80 MHz, its diff is 5985 - 5955 = 30.
+ * lowest channel is 1, its center frequency 5955,
+ * center frequency is 6025 when bandwidth=160 MHz, its diff is 6025 - 5955 = 70.
+ */
+ if (chan_def->width == NL80211_CHAN_WIDTH_80P80 && seq == 3)
+ return chan_def->center_freq2;
+
+ seg_seq = 10 * (BIT(seq) - 1);
+ return seg_seq + start_seq;
+}
+
+static void ath11k_mac_get_psd_channel(struct ath11k *ar,
+ u16 step_freq,
+ u16 *start_freq,
+ u16 *center_freq,
+ u8 i,
+ struct ieee80211_channel **temp_chan,
+ s8 *tx_power)
+{
+ /* It is to get the the center frequency for each 20 MHz.
+ * For example, if the chan is 160 MHz and center frequency is 6025,
+ * then it include 8 channels, they are 1/5/9/13/17/21/25/29,
+ * channel number 1's center frequency is 5955, it is parameter start_freq.
+ * parameter i is the step of the 8 channels. i is 0~7 for the 8 channels.
+ * the channel 1/5/9/13/17/21/25/29 maps i=0/1/2/3/4/5/6/7,
+ * and maps its center frequency is 5955/5975/5995/6015/6035/6055/6075/6095,
+ * the gap is 20 for each channel, parameter step_freq means the gap.
+ * after get the center frequency of each channel, it is easy to find the
+ * struct ieee80211_channel of it and get the max_reg_power.
+ */
+ *center_freq = *start_freq + i * step_freq;
+ *temp_chan = ieee80211_get_channel(ar->hw->wiphy, *center_freq);
+ *tx_power = (*temp_chan)->max_reg_power;
+}
+
+static void ath11k_mac_get_eirp_power(struct ath11k *ar,
+ u16 *start_freq,
+ u16 *center_freq,
+ u8 i,
+ struct ieee80211_channel **temp_chan,
+ struct cfg80211_chan_def *def,
+ s8 *tx_power)
+{
+ /* It is to get the the center frequency for 20 MHz/40 MHz/80 MHz/
+ * 160 MHz&80P80 bandwidth, and then plus 10 to the center frequency,
+ * it is the center frequency of a channel number.
+ * For example, when configured channel number is 1.
+ * center frequency is 5965 when bandwidth=40 MHz, after plus 10, it is 5975,
+ * then it is channel number 5.
+ * center frequency is 5985 when bandwidth=80 MHz, after plus 10, it is 5995,
+ * then it is channel number 9.
+ * center frequency is 6025 when bandwidth=160 MHz, after plus 10, it is 6035,
+ * then it is channel number 17.
+ * after get the center frequency of each channel, it is easy to find the
+ * struct ieee80211_channel of it and get the max_reg_power.
+ */
+ *center_freq = ath11k_mac_get_seg_freq(def, *start_freq, i);
+
+ /* For the 20 MHz, its center frequency is same with same channel */
+ if (i != 0)
+ *center_freq += 10;
+
+ *temp_chan = ieee80211_get_channel(ar->hw->wiphy, *center_freq);
+ *tx_power = (*temp_chan)->max_reg_power;
+}
+
+void ath11k_mac_fill_reg_tpc_info(struct ath11k *ar,
+ struct ieee80211_vif *vif,
+ struct ieee80211_chanctx_conf *ctx)
+{
+ struct ath11k_base *ab = ar->ab;
+ struct ath11k_vif *arvif = (void *)vif->drv_priv;
+ struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
+ struct ath11k_reg_tpc_power_info *reg_tpc_info = &arvif->reg_tpc_info;
+ struct ieee80211_channel *chan, *temp_chan;
+ u8 pwr_lvl_idx, num_pwr_levels, pwr_reduction;
+ bool is_psd_power = false, is_tpe_present = false;
+ s8 max_tx_power[IEEE80211_MAX_NUM_PWR_LEVEL],
+ psd_power, tx_power, eirp_power;
+ u16 oper_freq, start_freq, center_freq;
+
+ chan = ctx->def.chan;
+ oper_freq = ctx->def.chan->center_freq;
+ start_freq = ath11k_mac_get_6ghz_start_frequency(&ctx->def);
+ pwr_reduction = bss_conf->pwr_reduction;
+
+ if (arvif->reg_tpc_info.num_pwr_levels) {
+ is_tpe_present = true;
+ num_pwr_levels = arvif->reg_tpc_info.num_pwr_levels;
+ } else {
+ num_pwr_levels = ath11k_mac_get_num_pwr_levels(&ctx->def);
+ }
+
+ for (pwr_lvl_idx = 0; pwr_lvl_idx < num_pwr_levels; pwr_lvl_idx++) {
+ /* STA received TPE IE*/
+ if (is_tpe_present) {
+ /* local power is PSD power*/
+ if (chan->flags & IEEE80211_CHAN_PSD) {
+ /* Connecting AP is psd power */
+ if (reg_tpc_info->is_psd_power) {
+ is_psd_power = true;
+ ath11k_mac_get_psd_channel(ar, 20,
+ &start_freq,
+ ¢er_freq,
+ pwr_lvl_idx,
+ &temp_chan,
+ &tx_power);
+ psd_power = temp_chan->psd;
+ eirp_power = tx_power;
+ max_tx_power[pwr_lvl_idx] =
+ min_t(s8,
+ psd_power,
+ reg_tpc_info->tpe[pwr_lvl_idx]);
+ /* Connecting AP is not psd power */
+ } else {
+ ath11k_mac_get_eirp_power(ar,
+ &start_freq,
+ ¢er_freq,
+ pwr_lvl_idx,
+ &temp_chan,
+ &ctx->def,
+ &tx_power);
+ psd_power = temp_chan->psd;
+ /* convert psd power to EIRP power based
+ * on channel width
+ */
+ tx_power =
+ min_t(s8, tx_power,
+ psd_power + 13 + pwr_lvl_idx * 3);
+ max_tx_power[pwr_lvl_idx] =
+ min_t(s8,
+ tx_power,
+ reg_tpc_info->tpe[pwr_lvl_idx]);
+ }
+ /* local power is not PSD power */
+ } else {
+ /* Connecting AP is psd power */
+ if (reg_tpc_info->is_psd_power) {
+ is_psd_power = true;
+ ath11k_mac_get_psd_channel(ar, 20,
+ &start_freq,
+ ¢er_freq,
+ pwr_lvl_idx,
+ &temp_chan,
+ &tx_power);
+ eirp_power = tx_power;
+ max_tx_power[pwr_lvl_idx] =
+ reg_tpc_info->tpe[pwr_lvl_idx];
+ /* Connecting AP is not psd power */
+ } else {
+ ath11k_mac_get_eirp_power(ar,
+ &start_freq,
+ ¢er_freq,
+ pwr_lvl_idx,
+ &temp_chan,
+ &ctx->def,
+ &tx_power);
+ max_tx_power[pwr_lvl_idx] =
+ min_t(s8,
+ tx_power,
+ reg_tpc_info->tpe[pwr_lvl_idx]);
+ }
+ }
+ /* STA not received TPE IE */
+ } else {
+ /* local power is PSD power*/
+ if (chan->flags & IEEE80211_CHAN_PSD) {
+ is_psd_power = true;
+ ath11k_mac_get_psd_channel(ar, 20,
+ &start_freq,
+ ¢er_freq,
+ pwr_lvl_idx,
+ &temp_chan,
+ &tx_power);
+ psd_power = temp_chan->psd;
+ eirp_power = tx_power;
+ max_tx_power[pwr_lvl_idx] = psd_power;
+ } else {
+ ath11k_mac_get_eirp_power(ar,
+ &start_freq,
+ ¢er_freq,
+ pwr_lvl_idx,
+ &temp_chan,
+ &ctx->def,
+ &tx_power);
+ max_tx_power[pwr_lvl_idx] = tx_power;
+ }
+ }
+
+ if (is_psd_power) {
+ /* If AP local power constraint is present */
+ if (pwr_reduction)
+ eirp_power = eirp_power - pwr_reduction;
+
+ /* If firmware updated max tx power is non zero, then take
+ * the min of firmware updated ap tx power
+ * and max power derived from above mentioned parameters.
+ */
+ ath11k_dbg(ab, ATH11K_DBG_MAC,
+ "eirp power : %d firmware report power : %d\n",
+ eirp_power, ar->max_allowed_tx_power);
+ if (ar->max_allowed_tx_power)
+ eirp_power = min_t(s8,
+ eirp_power,
+ ar->max_allowed_tx_power);
+ } else {
+ /* If AP local power constraint is present */
+ if (pwr_reduction)
+ max_tx_power[pwr_lvl_idx] =
+ max_tx_power[pwr_lvl_idx] - pwr_reduction;
+ /* If firmware updated max tx power is non zero, then take
+ * the min of firmware updated ap tx power
+ * and max power derived from above mentioned parameters.
+ */
+ if (ar->max_allowed_tx_power)
+ max_tx_power[pwr_lvl_idx] =
+ min_t(s8,
+ max_tx_power[pwr_lvl_idx],
+ ar->max_allowed_tx_power);
+ }
+ reg_tpc_info->chan_power_info[pwr_lvl_idx].chan_cfreq = center_freq;
+ reg_tpc_info->chan_power_info[pwr_lvl_idx].tx_power =
+ max_tx_power[pwr_lvl_idx];
+ }
+
+ reg_tpc_info->num_pwr_levels = num_pwr_levels;
+ reg_tpc_info->is_psd_power = is_psd_power;
+ reg_tpc_info->eirp_power = eirp_power;
+ reg_tpc_info->ap_power_type =
+ ath11k_reg_ap_pwr_convert(vif->bss_conf.power_type);
+}
+
static void ath11k_mac_parse_tx_pwr_env(struct ath11k *ar,
struct ieee80211_vif *vif,
struct ieee80211_chanctx_conf *ctx)
diff --git a/drivers/net/wireless/ath/ath11k/mac.h b/drivers/net/wireless/ath/ath11k/mac.h
index 94c5c61ae2bb..25c18be75f46 100644
--- a/drivers/net/wireless/ath/ath11k/mac.h
+++ b/drivers/net/wireless/ath/ath11k/mac.h
@@ -174,4 +174,7 @@ int ath11k_mac_wait_tx_complete(struct ath11k *ar);
int ath11k_mac_vif_set_keepalive(struct ath11k_vif *arvif,
enum wmi_sta_keepalive_method method,
u32 interval);
+void ath11k_mac_fill_reg_tpc_info(struct ath11k *ar,
+ struct ieee80211_vif *vif,
+ struct ieee80211_chanctx_conf *ctx);
#endif
--
2.40.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v6 09/13] wifi: ath11k: fill parameters for vdev set tpc power WMI command
2023-09-20 8:23 ` [PATCH v6 09/13] wifi: ath11k: fill parameters for vdev set tpc power WMI command Wen Gong
@ 2023-09-21 20:09 ` Jeff Johnson
2023-09-21 20:11 ` Jeff Johnson
2023-09-29 13:18 ` Kalle Valo
2 siblings, 0 replies; 48+ messages in thread
From: Jeff Johnson @ 2023-09-21 20:09 UTC (permalink / raw)
To: Wen Gong, ath11k; +Cc: linux-wireless, kvalo
On 9/20/2023 1:23 AM, Wen Gong wrote:
> Prepare the parameters which is needed for WMI command WMI_VDEV_SET_TPC_POWER_CMDID.
Kalle, can you s/is/are/ when you pull into pending?
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
(but I have a non-blocking comments I'll post separately)
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v6 09/13] wifi: ath11k: fill parameters for vdev set tpc power WMI command
2023-09-20 8:23 ` [PATCH v6 09/13] wifi: ath11k: fill parameters for vdev set tpc power WMI command Wen Gong
2023-09-21 20:09 ` Jeff Johnson
@ 2023-09-21 20:11 ` Jeff Johnson
2023-09-25 10:46 ` Wen Gong
2023-09-29 13:18 ` Kalle Valo
2 siblings, 1 reply; 48+ messages in thread
From: Jeff Johnson @ 2023-09-21 20:11 UTC (permalink / raw)
To: Wen Gong, ath11k; +Cc: linux-wireless, kvalo
On 9/20/2023 1:23 AM, Wen Gong wrote:
> Prepare the parameters which is needed for WMI command WMI_VDEV_SET_TPC_POWER_CMDID.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
> ---
> drivers/net/wireless/ath/ath11k/mac.c | 277 ++++++++++++++++++++++++++
> drivers/net/wireless/ath/ath11k/mac.h | 3 +
> 2 files changed, 280 insertions(+)
>
> diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
> index bfb900d98347..f05d66913abd 100644
> --- a/drivers/net/wireless/ath/ath11k/mac.c
> +++ b/drivers/net/wireless/ath/ath11k/mac.c
> @@ -7661,6 +7661,283 @@ static u8 ath11k_mac_get_num_pwr_levels(struct cfg80211_chan_def *chan_def)
> }
> }
>
> +static u16 ath11k_mac_get_6ghz_start_frequency(struct cfg80211_chan_def *chan_def)
> +{
> + u16 diff_seq;
> +
> + /* It is to get the lowest channel number's center frequency of the chan.
> + * For example,
> + * bandwidth=40 MHz, center frequency is 5965, lowest channel is 1
> + * with center frequency 5955, its diff is 5965 - 5955 = 10.
> + * bandwidth=80 MHz, center frequency is 5985, lowest channel is 1
> + * with center frequency 5955, its diff is 5985 - 5955 = 30.
> + * bandwidth=160 MHz, center frequency is 6025, lowest channel is 1
> + * with center frequency 5955, its diff is 6025 - 5955 = 70.
> + */
> + switch (chan_def->width) {
> + case NL80211_CHAN_WIDTH_160:
> + diff_seq = 70;
> + break;
> + case NL80211_CHAN_WIDTH_80:
> + case NL80211_CHAN_WIDTH_80P80:
> + diff_seq = 30;
> + break;
> + case NL80211_CHAN_WIDTH_40:
> + diff_seq = 10;
> + break;
> + default:
> + diff_seq = 0;
> + }
> +
> + return chan_def->center_freq1 - diff_seq;
> +}
> +
> +static u16 ath11k_mac_get_seg_freq(struct cfg80211_chan_def *chan_def,
> + u16 start_seq, u8 seq)
> +{
> + u16 seg_seq;
> +
> + /* It is to get the center frequency of the specific bandwidth.
> + * start_seq means the lowest channel number's center frequency.
> + * seq 0/1/2/3 means 20 MHz/40 MHz/80 MHz/160 MHz&80P80.
> + * For example,
> + * lowest channel is 1, its center frequency 5955,
> + * center frequency is 5955 when bandwidth=20 MHz, its diff is 5955 - 5955 = 0.
> + * lowest channel is 1, its center frequency 5955,
> + * center frequency is 5965 when bandwidth=40 MHz, its diff is 5965 - 5955 = 10.
> + * lowest channel is 1, its center frequency 5955,
> + * center frequency is 5985 when bandwidth=80 MHz, its diff is 5985 - 5955 = 30.
> + * lowest channel is 1, its center frequency 5955,
> + * center frequency is 6025 when bandwidth=160 MHz, its diff is 6025 - 5955 = 70.
> + */
> + if (chan_def->width == NL80211_CHAN_WIDTH_80P80 && seq == 3)
> + return chan_def->center_freq2;
> +
> + seg_seq = 10 * (BIT(seq) - 1);
> + return seg_seq + start_seq;
> +}
The above two functions are driver agnostic. Will other drivers need
this as well, and if so, should these go into core wireless?
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v6 09/13] wifi: ath11k: fill parameters for vdev set tpc power WMI command
2023-09-21 20:11 ` Jeff Johnson
@ 2023-09-25 10:46 ` Wen Gong
0 siblings, 0 replies; 48+ messages in thread
From: Wen Gong @ 2023-09-25 10:46 UTC (permalink / raw)
To: Jeff Johnson, ath11k; +Cc: linux-wireless, kvalo
On 9/22/2023 4:11 AM, Jeff Johnson wrote:
> On 9/20/2023 1:23 AM, Wen Gong wrote:
>> Prepare the parameters which is needed for WMI command
>> WMI_VDEV_SET_TPC_POWER_CMDID.
>>
>> Tested-on: WCN6855 hw2.0 PCI
>> WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>>
>> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
>> ---
>> drivers/net/wireless/ath/ath11k/mac.c | 277 ++++++++++++++++++++++++++
>> drivers/net/wireless/ath/ath11k/mac.h | 3 +
>> 2 files changed, 280 insertions(+)
>>
>> diff --git a/drivers/net/wireless/ath/ath11k/mac.c
>> b/drivers/net/wireless/ath/ath11k/mac.c
>> index bfb900d98347..f05d66913abd 100644
>> --- a/drivers/net/wireless/ath/ath11k/mac.c
>> +++ b/drivers/net/wireless/ath/ath11k/mac.c
>> @@ -7661,6 +7661,283 @@ static u8
>> ath11k_mac_get_num_pwr_levels(struct cfg80211_chan_def *chan_def)
>> }
>> }
>> +static u16 ath11k_mac_get_6ghz_start_frequency(struct
>> cfg80211_chan_def *chan_def)
>> +{
>> + u16 diff_seq;
>> +
>> + /* It is to get the lowest channel number's center frequency of
>> the chan.
>> + * For example,
>> + * bandwidth=40 MHz, center frequency is 5965, lowest channel is 1
>> + * with center frequency 5955, its diff is 5965 - 5955 = 10.
>> + * bandwidth=80 MHz, center frequency is 5985, lowest channel is 1
>> + * with center frequency 5955, its diff is 5985 - 5955 = 30.
>> + * bandwidth=160 MHz, center frequency is 6025, lowest channel is 1
>> + * with center frequency 5955, its diff is 6025 - 5955 = 70.
>> + */
>> + switch (chan_def->width) {
>> + case NL80211_CHAN_WIDTH_160:
>> + diff_seq = 70;
>> + break;
>> + case NL80211_CHAN_WIDTH_80:
>> + case NL80211_CHAN_WIDTH_80P80:
>> + diff_seq = 30;
>> + break;
>> + case NL80211_CHAN_WIDTH_40:
>> + diff_seq = 10;
>> + break;
>> + default:
>> + diff_seq = 0;
>> + }
>> +
>> + return chan_def->center_freq1 - diff_seq;
>> +}
>> +
>> +static u16 ath11k_mac_get_seg_freq(struct cfg80211_chan_def *chan_def,
>> + u16 start_seq, u8 seq)
>> +{
>> + u16 seg_seq;
>> +
>> + /* It is to get the center frequency of the specific bandwidth.
>> + * start_seq means the lowest channel number's center frequency.
>> + * seq 0/1/2/3 means 20 MHz/40 MHz/80 MHz/160 MHz&80P80.
>> + * For example,
>> + * lowest channel is 1, its center frequency 5955,
>> + * center frequency is 5955 when bandwidth=20 MHz, its diff is
>> 5955 - 5955 = 0.
>> + * lowest channel is 1, its center frequency 5955,
>> + * center frequency is 5965 when bandwidth=40 MHz, its diff is
>> 5965 - 5955 = 10.
>> + * lowest channel is 1, its center frequency 5955,
>> + * center frequency is 5985 when bandwidth=80 MHz, its diff is
>> 5985 - 5955 = 30.
>> + * lowest channel is 1, its center frequency 5955,
>> + * center frequency is 6025 when bandwidth=160 MHz, its diff is
>> 6025 - 5955 = 70.
>> + */
>> + if (chan_def->width == NL80211_CHAN_WIDTH_80P80 && seq == 3)
>> + return chan_def->center_freq2;
>> +
>> + seg_seq = 10 * (BIT(seq) - 1);
>> + return seg_seq + start_seq;
>> +}
>
> The above two functions are driver agnostic. Will other drivers need
> this as well, and if so, should these go into core wireless?
>
Not found other driver need it. If move them to core wireless, then it
will be a new dependency for it.
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v6 09/13] wifi: ath11k: fill parameters for vdev set tpc power WMI command
2023-09-20 8:23 ` [PATCH v6 09/13] wifi: ath11k: fill parameters for vdev set tpc power WMI command Wen Gong
2023-09-21 20:09 ` Jeff Johnson
2023-09-21 20:11 ` Jeff Johnson
@ 2023-09-29 13:18 ` Kalle Valo
2 siblings, 0 replies; 48+ messages in thread
From: Kalle Valo @ 2023-09-29 13:18 UTC (permalink / raw)
To: Wen Gong; +Cc: ath11k, linux-wireless, quic_jjohnson, quic_wgong
Wen Gong <quic_wgong@quicinc.com> wrote:
> Prepare the parameters which is needed for WMI command WMI_VDEV_SET_TPC_POWER_CMDID.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
And this also added new warnings:
drivers/net/wireless/ath/ath11k/mac.c: In function 'ath11k_mac_fill_reg_tpc_info':
drivers/net/wireless/ath/ath11k/mac.c:7791:13: error: variable 'oper_freq' set but not used [-Werror=unused-but-set-variable]
drivers/net/wireless/ath/ath11k/mac.c:7731: Possible repeated word: 'the'
drivers/net/wireless/ath/ath11k/mac.c:7755: Possible repeated word: 'the'
I fixed them in the pending branch:
https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=c9f905ac838d9a7d79adb49951c7b0579d020c0a
--
https://patchwork.kernel.org/project/linux-wireless/patch/20230920082349.29111-10-quic_wgong@quicinc.com/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v6 10/13] wifi: ath11k: add WMI_TLV_SERVICE_EXT_TPC_REG_SUPPORT service bit
2023-09-20 8:23 [PATCH v6 00/13] wifi: ath11k: add support for 6 GHz station for various modes : LPI, SP and VLP Wen Gong
` (8 preceding siblings ...)
2023-09-20 8:23 ` [PATCH v6 09/13] wifi: ath11k: fill parameters for vdev set tpc power WMI command Wen Gong
@ 2023-09-20 8:23 ` Wen Gong
2023-09-21 20:13 ` Jeff Johnson
2023-09-20 8:23 ` [PATCH v6 11/13] wifi: ath11k: discard BSS_CHANGED_TXPOWER when EXT_TPC_REG_SUPPORT for 6 GHz Wen Gong
` (2 subsequent siblings)
12 siblings, 1 reply; 48+ messages in thread
From: Wen Gong @ 2023-09-20 8:23 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson, quic_wgong
Firmware advertises support for SERVICE_EXT_TPC_REG via a WMI service bit.
Add the definition of this service bit so that a subsequent patch can
check whether or not firmware supports this service.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
---
drivers/net/wireless/ath/ath11k/wmi.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index 106e1d672b9a..ed1a6db23709 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -2112,6 +2112,7 @@ enum wmi_tlv_service {
/* The second 128 bits */
WMI_MAX_EXT_SERVICE = 256,
WMI_TLV_SERVICE_SCAN_CONFIG_PER_CHANNEL = 265,
+ WMI_TLV_SERVICE_EXT_TPC_REG_SUPPORT = 280,
WMI_TLV_SERVICE_REG_CC_EXT_EVENT_SUPPORT = 281,
WMI_TLV_SERVICE_BIOS_SAR_SUPPORT = 326,
WMI_TLV_SERVICE_SUPPORT_11D_FOR_HOST_SCAN = 357,
--
2.40.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* [PATCH v6 11/13] wifi: ath11k: discard BSS_CHANGED_TXPOWER when EXT_TPC_REG_SUPPORT for 6 GHz
2023-09-20 8:23 [PATCH v6 00/13] wifi: ath11k: add support for 6 GHz station for various modes : LPI, SP and VLP Wen Gong
` (9 preceding siblings ...)
2023-09-20 8:23 ` [PATCH v6 10/13] wifi: ath11k: add WMI_TLV_SERVICE_EXT_TPC_REG_SUPPORT service bit Wen Gong
@ 2023-09-20 8:23 ` Wen Gong
2023-09-21 20:39 ` Jeff Johnson
2023-09-22 9:04 ` Aditya Kumar Singh
2023-09-20 8:23 ` [PATCH v6 12/13] wifi: ath11k: add handler for WMI_VDEV_SET_TPC_POWER_CMDID Wen Gong
2023-09-20 8:23 ` [PATCH v6 13/13] wifi: ath11k: send TPC power to firmware for 6 GHz station Wen Gong
12 siblings, 2 replies; 48+ messages in thread
From: Wen Gong @ 2023-09-20 8:23 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson, quic_wgong
When station is connected to a 6 GHz AP, it has 2 way to configure
the power limit to firmware. The first way is to send 2 wmi command
WMI_PDEV_PARAM_TXPOWER_LIMIT2G/WMI_PDEV_PARAM_TXPOWER_LIMIT5G to
firmware, the second way is to send WMI_VDEV_SET_TPC_POWER_CMDID to
firmware which include more parameters for power control.
When firmware support SERVICE_EXT_TPC_REG, it means firmware support
the second way for WMI_VDEV_SET_TPC_POWER_CMDID, then ath11k discard
BSS_CHANGED_TXPOWER flag from mac80211 which is used to the first way
for 6 GHz band in this patch and select the second way in the subsequent
patch.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
---
drivers/net/wireless/ath/ath11k/mac.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index f05d66913abd..a8ae281d2635 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -3396,6 +3396,18 @@ static int ath11k_mac_config_obss_pd(struct ath11k *ar,
return 0;
}
+static bool ath11k_mac_supports_station_tpc(struct ath11k *ar,
+ struct ath11k_vif *arvif,
+ const struct cfg80211_chan_def *chandef)
+{
+ return ath11k_mac_supports_6ghz_cc_ext(ar) &&
+ test_bit(WMI_TLV_SERVICE_EXT_TPC_REG_SUPPORT, ar->ab->wmi_ab.svc_map) &&
+ arvif->vdev_type == WMI_VDEV_TYPE_STA &&
+ arvif->vdev_subtype == WMI_VDEV_SUBTYPE_NONE &&
+ chandef->chan &&
+ chandef->chan->band == NL80211_BAND_6GHZ;
+}
+
static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct ieee80211_bss_conf *info,
@@ -3595,9 +3607,13 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,
if (changed & BSS_CHANGED_TXPOWER) {
ath11k_dbg(ar->ab, ATH11K_DBG_MAC, "vdev_id %i txpower %d\n",
arvif->vdev_id, info->txpower);
-
- arvif->txpower = info->txpower;
- ath11k_mac_txpower_recalc(ar);
+ if (ath11k_mac_supports_station_tpc(ar, arvif, &info->chandef)) {
+ ath11k_dbg(ar->ab, ATH11K_DBG_MAC,
+ "discard tx power, change to set TPC power\n");
+ } else {
+ arvif->txpower = info->txpower;
+ ath11k_mac_txpower_recalc(ar);
+ }
}
if (changed & BSS_CHANGED_PS &&
--
2.40.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v6 11/13] wifi: ath11k: discard BSS_CHANGED_TXPOWER when EXT_TPC_REG_SUPPORT for 6 GHz
2023-09-20 8:23 ` [PATCH v6 11/13] wifi: ath11k: discard BSS_CHANGED_TXPOWER when EXT_TPC_REG_SUPPORT for 6 GHz Wen Gong
@ 2023-09-21 20:39 ` Jeff Johnson
2023-09-22 9:04 ` Aditya Kumar Singh
1 sibling, 0 replies; 48+ messages in thread
From: Jeff Johnson @ 2023-09-21 20:39 UTC (permalink / raw)
To: Wen Gong, ath11k; +Cc: linux-wireless, kvalo
On 9/20/2023 1:23 AM, Wen Gong wrote:
> When station is connected to a 6 GHz AP, it has 2 way to configure
s/way/ways/
> the power limit to firmware. The first way is to send 2 wmi command
s/wmi command/WMI commands/
> WMI_PDEV_PARAM_TXPOWER_LIMIT2G/WMI_PDEV_PARAM_TXPOWER_LIMIT5G to
> firmware, the second way is to send WMI_VDEV_SET_TPC_POWER_CMDID to
> firmware which include more parameters for power control.
Why would LIMIT2G/LIMIT5G be used for 6 GHz AP?
>
> When firmware support SERVICE_EXT_TPC_REG, it means firmware support
> the second way for WMI_VDEV_SET_TPC_POWER_CMDID, then ath11k discard
> BSS_CHANGED_TXPOWER flag from mac80211 which is used to the first way
> for 6 GHz band in this patch and select the second way in the subsequent
> patch.
So if i bisect at this patch and if firmware supports
SERVICE_EXT_TPC_REG, then there will not be any power limits sent to
firmware?
Ideally all patches in a series should be able to be bisected without
introducing regressive behavior.
Does it make sense to squash patches 11 and 13 so that there is no
regression? Patch 12 would then come before the squashed patch.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
> ---
> drivers/net/wireless/ath/ath11k/mac.c | 22 +++++++++++++++++++---
> 1 file changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
> index f05d66913abd..a8ae281d2635 100644
> --- a/drivers/net/wireless/ath/ath11k/mac.c
> +++ b/drivers/net/wireless/ath/ath11k/mac.c
> @@ -3396,6 +3396,18 @@ static int ath11k_mac_config_obss_pd(struct ath11k *ar,
> return 0;
> }
>
> +static bool ath11k_mac_supports_station_tpc(struct ath11k *ar,
> + struct ath11k_vif *arvif,
> + const struct cfg80211_chan_def *chandef)
> +{
> + return ath11k_mac_supports_6ghz_cc_ext(ar) &&
> + test_bit(WMI_TLV_SERVICE_EXT_TPC_REG_SUPPORT, ar->ab->wmi_ab.svc_map) &&
> + arvif->vdev_type == WMI_VDEV_TYPE_STA &&
> + arvif->vdev_subtype == WMI_VDEV_SUBTYPE_NONE &&
> + chandef->chan &&
> + chandef->chan->band == NL80211_BAND_6GHZ;
> +}
> +
> static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,
> struct ieee80211_vif *vif,
> struct ieee80211_bss_conf *info,
> @@ -3595,9 +3607,13 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,
> if (changed & BSS_CHANGED_TXPOWER) {
> ath11k_dbg(ar->ab, ATH11K_DBG_MAC, "vdev_id %i txpower %d\n",
> arvif->vdev_id, info->txpower);
> -
> - arvif->txpower = info->txpower;
> - ath11k_mac_txpower_recalc(ar);
> + if (ath11k_mac_supports_station_tpc(ar, arvif, &info->chandef)) {
> + ath11k_dbg(ar->ab, ATH11K_DBG_MAC,
> + "discard tx power, change to set TPC power\n");
> + } else {
> + arvif->txpower = info->txpower;
> + ath11k_mac_txpower_recalc(ar);
> + }
> }
>
> if (changed & BSS_CHANGED_PS &&
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v6 11/13] wifi: ath11k: discard BSS_CHANGED_TXPOWER when EXT_TPC_REG_SUPPORT for 6 GHz
2023-09-20 8:23 ` [PATCH v6 11/13] wifi: ath11k: discard BSS_CHANGED_TXPOWER when EXT_TPC_REG_SUPPORT for 6 GHz Wen Gong
2023-09-21 20:39 ` Jeff Johnson
@ 2023-09-22 9:04 ` Aditya Kumar Singh
2023-09-22 9:17 ` Wen Gong
1 sibling, 1 reply; 48+ messages in thread
From: Aditya Kumar Singh @ 2023-09-22 9:04 UTC (permalink / raw)
To: Wen Gong, ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson
On 9/20/23 13:53, Wen Gong wrote:
> When station is connected to a 6 GHz AP, it has 2 way to configure
> the power limit to firmware. The first way is to send 2 wmi command
> WMI_PDEV_PARAM_TXPOWER_LIMIT2G/WMI_PDEV_PARAM_TXPOWER_LIMIT5G to
> firmware, the second way is to send WMI_VDEV_SET_TPC_POWER_CMDID to
> firmware which include more parameters for power control.
>
> When firmware support SERVICE_EXT_TPC_REG, it means firmware support
> the second way for WMI_VDEV_SET_TPC_POWER_CMDID, then ath11k discard
> BSS_CHANGED_TXPOWER flag from mac80211 which is used to the first way
> for 6 GHz band in this patch and select the second way in the subsequent
> patch.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
> ---
> drivers/net/wireless/ath/ath11k/mac.c | 22 +++++++++++++++++++---
> 1 file changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
> index f05d66913abd..a8ae281d2635 100644
> --- a/drivers/net/wireless/ath/ath11k/mac.c
> +++ b/drivers/net/wireless/ath/ath11k/mac.c
> @@ -3396,6 +3396,18 @@ static int ath11k_mac_config_obss_pd(struct ath11k *ar,
> return 0;
> }
>
> +static bool ath11k_mac_supports_station_tpc(struct ath11k *ar,
> + struct ath11k_vif *arvif,
> + const struct cfg80211_chan_def *chandef)
> +{
> + return ath11k_mac_supports_6ghz_cc_ext(ar) &&
> + test_bit(WMI_TLV_SERVICE_EXT_TPC_REG_SUPPORT, ar->ab->wmi_ab.svc_map) &&
> + arvif->vdev_type == WMI_VDEV_TYPE_STA &&
> + arvif->vdev_subtype == WMI_VDEV_SUBTYPE_NONE &&
> + chandef->chan &&
> + chandef->chan->band == NL80211_BAND_6GHZ;
> +}
> +
> static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,
> struct ieee80211_vif *vif,
> struct ieee80211_bss_conf *info,
> @@ -3595,9 +3607,13 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,
> if (changed & BSS_CHANGED_TXPOWER) {
> ath11k_dbg(ar->ab, ATH11K_DBG_MAC, "vdev_id %i txpower %d\n",
> arvif->vdev_id, info->txpower);
> -
> - arvif->txpower = info->txpower;
> - ath11k_mac_txpower_recalc(ar);
> + if (ath11k_mac_supports_station_tpc(ar, arvif, &info->chandef)) {
So even if user wants to operate in low power value, we won't be
allowing to do that in case of 6 GHz station mode? Only TPC power is valid?
> + ath11k_dbg(ar->ab, ATH11K_DBG_MAC,
> + "discard tx power, change to set TPC power\n");
> + } else {
> + arvif->txpower = info->txpower;
> + ath11k_mac_txpower_recalc(ar);
> + }
> }
>
> if (changed & BSS_CHANGED_PS &&
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v6 11/13] wifi: ath11k: discard BSS_CHANGED_TXPOWER when EXT_TPC_REG_SUPPORT for 6 GHz
2023-09-22 9:04 ` Aditya Kumar Singh
@ 2023-09-22 9:17 ` Wen Gong
0 siblings, 0 replies; 48+ messages in thread
From: Wen Gong @ 2023-09-22 9:17 UTC (permalink / raw)
To: Aditya Kumar Singh, ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson
On 9/22/2023 5:04 PM, Aditya Kumar Singh wrote:
> On 9/20/23 13:53, Wen Gong wrote:
>>
[...]
>> @@ -3595,9 +3607,13 @@ static void
>> ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,
>> if (changed & BSS_CHANGED_TXPOWER) {
>> ath11k_dbg(ar->ab, ATH11K_DBG_MAC, "vdev_id %i txpower %d\n",
>> arvif->vdev_id, info->txpower);
>> -
>> - arvif->txpower = info->txpower;
>> - ath11k_mac_txpower_recalc(ar);
>> + if (ath11k_mac_supports_station_tpc(ar, arvif,
>> &info->chandef)) {
> So even if user wants to operate in low power value, we won't be
> allowing to do that in case of 6 GHz station mode? Only TPC power is
> valid?
>
You are right. I think I will drop this patch. Firmware will select the
lowest TX power from multi-source.
>> + ath11k_dbg(ar->ab, ATH11K_DBG_MAC,
>> + "discard tx power, change to set TPC power\n");
>> + } else {
>> + arvif->txpower = info->txpower;
>> + ath11k_mac_txpower_recalc(ar);
>> + }
>> }
>> if (changed & BSS_CHANGED_PS &&
>
>
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v6 12/13] wifi: ath11k: add handler for WMI_VDEV_SET_TPC_POWER_CMDID
2023-09-20 8:23 [PATCH v6 00/13] wifi: ath11k: add support for 6 GHz station for various modes : LPI, SP and VLP Wen Gong
` (10 preceding siblings ...)
2023-09-20 8:23 ` [PATCH v6 11/13] wifi: ath11k: discard BSS_CHANGED_TXPOWER when EXT_TPC_REG_SUPPORT for 6 GHz Wen Gong
@ 2023-09-20 8:23 ` Wen Gong
2023-09-21 20:37 ` Jeff Johnson
2023-09-20 8:23 ` [PATCH v6 13/13] wifi: ath11k: send TPC power to firmware for 6 GHz station Wen Gong
12 siblings, 1 reply; 48+ messages in thread
From: Wen Gong @ 2023-09-20 8:23 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson, quic_wgong
Add the handler for WMI_VDEV_SET_TPC_POWER_CMDID, it is for 6 GHz band.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
---
drivers/net/wireless/ath/ath11k/wmi.c | 63 +++++++++++++++++++++++++++
drivers/net/wireless/ath/ath11k/wmi.h | 61 ++++++++++++++++++++++++++
2 files changed, 124 insertions(+)
diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index d93ed92335c7..43c47967eec1 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -2379,6 +2379,69 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar,
return ret;
}
+int ath11k_wmi_send_vdev_set_tpc_power(struct ath11k *ar,
+ u32 vdev_id,
+ struct ath11k_reg_tpc_power_info *param)
+{
+ struct ath11k_pdev_wmi *wmi = ar->wmi;
+ struct wmi_vdev_set_tpc_power_cmd *cmd;
+ struct wmi_vdev_ch_power_info *ch;
+ struct sk_buff *skb;
+ struct wmi_tlv *tlv;
+ u8 *ptr;
+ int i, ret, len;
+
+ len = sizeof(*cmd) + TLV_HDR_SIZE;
+ len += (sizeof(struct wmi_vdev_ch_power_info) * param->num_pwr_levels);
+
+ skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, len);
+ if (!skb)
+ return -ENOMEM;
+
+ ptr = skb->data;
+
+ cmd = (struct wmi_vdev_set_tpc_power_cmd *)ptr;
+ cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_SET_TPC_POWER_CMD) |
+ FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);
+ cmd->vdev_id = vdev_id;
+ cmd->psd_power = param->is_psd_power;
+ cmd->eirp_power = param->eirp_power;
+ cmd->power_type_6ghz = param->ap_power_type;
+ ath11k_dbg(ar->ab, ATH11K_DBG_WMI,
+ "wmi tpc vdev id %d is psd power %d eirp power %d 6 GHz power type %d\n",
+ vdev_id, param->is_psd_power, param->eirp_power, param->ap_power_type);
+
+ ptr += sizeof(*cmd);
+ tlv = (struct wmi_tlv *)ptr;
+ tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) |
+ FIELD_PREP(WMI_TLV_LEN, param->num_pwr_levels * sizeof(*ch));
+
+ ptr += TLV_HDR_SIZE;
+ ch = (struct wmi_vdev_ch_power_info *)ptr;
+
+ for (i = 0; i < param->num_pwr_levels; i++, ch++) {
+ ch->tlv_header = FIELD_PREP(WMI_TLV_TAG,
+ WMI_TAG_VDEV_CH_POWER_INFO) |
+ FIELD_PREP(WMI_TLV_LEN,
+ sizeof(*ch) - TLV_HDR_SIZE);
+
+ ch->chan_cfreq = param->chan_power_info[i].chan_cfreq;
+ ch->tx_power = param->chan_power_info[i].tx_power;
+
+ ath11k_dbg(ar->ab, ATH11K_DBG_WMI,
+ "wmi tpc chan freq %d TX power %d\n",
+ ch->chan_cfreq, ch->tx_power);
+ }
+
+ ret = ath11k_wmi_cmd_send(wmi, skb,
+ WMI_VDEV_SET_TPC_POWER_CMDID);
+ if (ret) {
+ ath11k_warn(ar->ab, "failed to send WMI_VDEV_SET_TPC_POWER_CMDID\n");
+ dev_kfree_skb(skb);
+ }
+ return ret;
+}
+
int ath11k_wmi_send_scan_stop_cmd(struct ath11k *ar,
struct scan_cancel_param *param)
{
diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index ed1a6db23709..dbe973698a89 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -15,6 +15,7 @@ struct ath11k;
struct ath11k_fw_stats;
struct ath11k_fw_dbglog;
struct ath11k_vif;
+struct ath11k_reg_tpc_power_info;
#define PSOC_HOST_MAX_NUM_SS (8)
@@ -327,6 +328,36 @@ enum wmi_tlv_cmd_id {
WMI_VDEV_SET_CUSTOM_AGGR_SIZE_CMDID,
WMI_VDEV_ENCRYPT_DECRYPT_DATA_REQ_CMDID,
WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_CMDID,
+ /** WMI commands related to dbg arp stats */
+ WMI_VDEV_SET_ARP_STAT_CMDID,
+ WMI_VDEV_GET_ARP_STAT_CMDID,
+ /** get tx power for the current vdev */
+ WMI_VDEV_GET_TX_POWER_CMDID,
+ /* limit STA offchannel activity */
+ WMI_VDEV_LIMIT_OFFCHAN_CMDID,
+ /** To set custom software retries per-AC for vdev */
+ WMI_VDEV_SET_CUSTOM_SW_RETRY_TH_CMDID,
+ /** To set chainmask configuration for vdev */
+ WMI_VDEV_CHAINMASK_CONFIG_CMDID,
+ WMI_VDEV_GET_BCN_RECEPTION_STATS_CMDID,
+ /* request LTE-Coex info */
+ WMI_VDEV_GET_MWS_COEX_INFO_CMDID,
+ /** delete all peer (excluding bss peer) */
+ WMI_VDEV_DELETE_ALL_PEER_CMDID,
+ /* To set bss max idle time related parameters */
+ WMI_VDEV_BSS_MAX_IDLE_TIME_CMDID,
+ /** Indicates firmware to trigger Audio sync */
+ WMI_VDEV_AUDIO_SYNC_TRIGGER_CMDID,
+ /** Gives Qtimer value to firmware */
+ WMI_VDEV_AUDIO_SYNC_QTIMER_CMDID,
+ /** Preferred channel list for each vdev */
+ WMI_VDEV_SET_PCL_CMDID,
+ /** VDEV_GET_BIG_DATA_CMD IS DEPRECATED - DO NOT USE */
+ WMI_VDEV_GET_BIG_DATA_CMDID,
+ /** Get per vdev BIG DATA stats phase 2 */
+ WMI_VDEV_GET_BIG_DATA_P2_CMDID,
+ /** set TPC PSD/non-PSD power */
+ WMI_VDEV_SET_TPC_POWER_CMDID,
WMI_PEER_CREATE_CMDID = WMI_TLV_CMD(WMI_GRP_PEER),
WMI_PEER_DELETE_CMDID,
WMI_PEER_FLUSH_TIDS_CMDID,
@@ -1878,6 +1909,8 @@ enum wmi_tlv_tag {
WMI_TAG_PDEV_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMD,
WMI_TAG_REGULATORY_RULE_EXT_STRUCT = 0x3A9,
WMI_TAG_REG_CHAN_LIST_CC_EXT_EVENT,
+ WMI_TAG_VDEV_SET_TPC_POWER_CMD = 0x3B5,
+ WMI_TAG_VDEV_CH_POWER_INFO,
WMI_TAG_PDEV_SET_BIOS_SAR_TABLE_CMD = 0x3D8,
WMI_TAG_PDEV_SET_BIOS_GEO_TABLE_CMD,
WMI_TAG_MAX
@@ -3168,6 +3201,31 @@ struct wlan_ssid {
u8 ssid[WLAN_SSID_MAX_LEN];
};
+struct wmi_vdev_ch_power_info {
+ u32 tlv_header;
+ u32 chan_cfreq; /* Channel center frequency (MHz) */
+ /* Unit: dBm, either PSD/EIRP power for this frequency or
+ * incremental for non-PSD BW
+ */
+ u32 tx_power;
+} __packed;
+
+struct wmi_vdev_set_tpc_power_cmd {
+ u32 tlv_header;
+ u32 vdev_id;
+ u32 psd_power; /* Value: 0 or 1, is PSD power or not */
+ u32 eirp_power; /* Maximum EIRP power (dBm units), valid only if power is PSD */
+ u32 power_type_6ghz; /* Type: WMI_6GHZ_REG_TYPE, used for halphy CTL lookup */
+ /* This fixed_param TLV is followed by the below TLVs:
+ * num_pwr_levels of wmi_vdev_ch_power_info
+ * For PSD power, it is the PSD/EIRP power of the frequency (20 MHz chunks).
+ * For non-PSD power, the power values are for 20, 40, and till
+ * BSS BW power levels.
+ * The num_pwr_levels will be checked by sw how many elements present
+ * in the variable-length array.
+ */
+} __packed;
+
#define WMI_IE_BITMAP_SIZE 8
/* prefix used by scan requestor ids on the host */
@@ -6512,4 +6570,7 @@ void ath11k_reg_reset_info(struct cur_regulatory_info *reg_info);
int ath11k_reg_handle_chan_list(struct ath11k_base *ab,
struct cur_regulatory_info *reg_info,
enum ieee80211_ap_reg_power power_type);
+int ath11k_wmi_send_vdev_set_tpc_power(struct ath11k *ar,
+ u32 vdev_id,
+ struct ath11k_reg_tpc_power_info *param);
#endif
--
2.40.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v6 12/13] wifi: ath11k: add handler for WMI_VDEV_SET_TPC_POWER_CMDID
2023-09-20 8:23 ` [PATCH v6 12/13] wifi: ath11k: add handler for WMI_VDEV_SET_TPC_POWER_CMDID Wen Gong
@ 2023-09-21 20:37 ` Jeff Johnson
0 siblings, 0 replies; 48+ messages in thread
From: Jeff Johnson @ 2023-09-21 20:37 UTC (permalink / raw)
To: Wen Gong, ath11k; +Cc: linux-wireless, kvalo
On 9/20/2023 1:23 AM, Wen Gong wrote:
> Add the handler for WMI_VDEV_SET_TPC_POWER_CMDID, it is for 6 GHz band.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
> ---
> drivers/net/wireless/ath/ath11k/wmi.c | 63 +++++++++++++++++++++++++++
> drivers/net/wireless/ath/ath11k/wmi.h | 61 ++++++++++++++++++++++++++
> 2 files changed, 124 insertions(+)
>
> diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
> index d93ed92335c7..43c47967eec1 100644
> --- a/drivers/net/wireless/ath/ath11k/wmi.c
> +++ b/drivers/net/wireless/ath/ath11k/wmi.c
> @@ -2379,6 +2379,69 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar,
> return ret;
> }
>
> +int ath11k_wmi_send_vdev_set_tpc_power(struct ath11k *ar,
> + u32 vdev_id,
> + struct ath11k_reg_tpc_power_info *param)
> +{
> + struct ath11k_pdev_wmi *wmi = ar->wmi;
> + struct wmi_vdev_set_tpc_power_cmd *cmd;
> + struct wmi_vdev_ch_power_info *ch;
> + struct sk_buff *skb;
> + struct wmi_tlv *tlv;
> + u8 *ptr;
> + int i, ret, len;
> +
> + len = sizeof(*cmd) + TLV_HDR_SIZE;
> + len += (sizeof(struct wmi_vdev_ch_power_info) * param->num_pwr_levels);
sizeof(*ch) is preferred
and since you need this sum both here and when you fill the TLV,
consider calculating it once and using the calculated value in both places
> +
> + skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, len);
> + if (!skb)
> + return -ENOMEM;
> +
> + ptr = skb->data;
> +
> + cmd = (struct wmi_vdev_set_tpc_power_cmd *)ptr;
> + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_SET_TPC_POWER_CMD) |
> + FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);
> + cmd->vdev_id = vdev_id;
> + cmd->psd_power = param->is_psd_power;
> + cmd->eirp_power = param->eirp_power;
> + cmd->power_type_6ghz = param->ap_power_type;
> + ath11k_dbg(ar->ab, ATH11K_DBG_WMI,
> + "wmi tpc vdev id %d is psd power %d eirp power %d 6 GHz power type %d\n",
> + vdev_id, param->is_psd_power, param->eirp_power, param->ap_power_type);
> +
> + ptr += sizeof(*cmd);
> + tlv = (struct wmi_tlv *)ptr;
> + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) |
> + FIELD_PREP(WMI_TLV_LEN, param->num_pwr_levels * sizeof(*ch));
as noted above you can use previously calculated length here
> +
> + ptr += TLV_HDR_SIZE;
> + ch = (struct wmi_vdev_ch_power_info *)ptr;
> +
> + for (i = 0; i < param->num_pwr_levels; i++, ch++) {
> + ch->tlv_header = FIELD_PREP(WMI_TLV_TAG,
> + WMI_TAG_VDEV_CH_POWER_INFO) |
> + FIELD_PREP(WMI_TLV_LEN,
> + sizeof(*ch) - TLV_HDR_SIZE);
> +
> + ch->chan_cfreq = param->chan_power_info[i].chan_cfreq;
> + ch->tx_power = param->chan_power_info[i].tx_power;
> +
> + ath11k_dbg(ar->ab, ATH11K_DBG_WMI,
> + "wmi tpc chan freq %d TX power %d\n",
> + ch->chan_cfreq, ch->tx_power);
> + }
> +
> + ret = ath11k_wmi_cmd_send(wmi, skb,
> + WMI_VDEV_SET_TPC_POWER_CMDID);
> + if (ret) {
> + ath11k_warn(ar->ab, "failed to send WMI_VDEV_SET_TPC_POWER_CMDID\n");
> + dev_kfree_skb(skb);
> + }
> + return ret;
> +}
> +
> int ath11k_wmi_send_scan_stop_cmd(struct ath11k *ar,
> struct scan_cancel_param *param)
> {
> diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
> index ed1a6db23709..dbe973698a89 100644
> --- a/drivers/net/wireless/ath/ath11k/wmi.h
> +++ b/drivers/net/wireless/ath/ath11k/wmi.h
> @@ -15,6 +15,7 @@ struct ath11k;
> struct ath11k_fw_stats;
> struct ath11k_fw_dbglog;
> struct ath11k_vif;
> +struct ath11k_reg_tpc_power_info;
>
> #define PSOC_HOST_MAX_NUM_SS (8)
>
> @@ -327,6 +328,36 @@ enum wmi_tlv_cmd_id {
> WMI_VDEV_SET_CUSTOM_AGGR_SIZE_CMDID,
> WMI_VDEV_ENCRYPT_DECRYPT_DATA_REQ_CMDID,
> WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_CMDID,
> + /** WMI commands related to dbg arp stats */
> + WMI_VDEV_SET_ARP_STAT_CMDID,
> + WMI_VDEV_GET_ARP_STAT_CMDID,
> + /** get tx power for the current vdev */
> + WMI_VDEV_GET_TX_POWER_CMDID,
> + /* limit STA offchannel activity */
> + WMI_VDEV_LIMIT_OFFCHAN_CMDID,
> + /** To set custom software retries per-AC for vdev */
> + WMI_VDEV_SET_CUSTOM_SW_RETRY_TH_CMDID,
> + /** To set chainmask configuration for vdev */
> + WMI_VDEV_CHAINMASK_CONFIG_CMDID,
> + WMI_VDEV_GET_BCN_RECEPTION_STATS_CMDID,
> + /* request LTE-Coex info */
> + WMI_VDEV_GET_MWS_COEX_INFO_CMDID,
> + /** delete all peer (excluding bss peer) */
> + WMI_VDEV_DELETE_ALL_PEER_CMDID,
> + /* To set bss max idle time related parameters */
> + WMI_VDEV_BSS_MAX_IDLE_TIME_CMDID,
> + /** Indicates firmware to trigger Audio sync */
> + WMI_VDEV_AUDIO_SYNC_TRIGGER_CMDID,
> + /** Gives Qtimer value to firmware */
> + WMI_VDEV_AUDIO_SYNC_QTIMER_CMDID,
> + /** Preferred channel list for each vdev */
> + WMI_VDEV_SET_PCL_CMDID,
> + /** VDEV_GET_BIG_DATA_CMD IS DEPRECATED - DO NOT USE */
> + WMI_VDEV_GET_BIG_DATA_CMDID,
> + /** Get per vdev BIG DATA stats phase 2 */
> + WMI_VDEV_GET_BIG_DATA_P2_CMDID,
> + /** set TPC PSD/non-PSD power */
> + WMI_VDEV_SET_TPC_POWER_CMDID,
> WMI_PEER_CREATE_CMDID = WMI_TLV_CMD(WMI_GRP_PEER),
> WMI_PEER_DELETE_CMDID,
> WMI_PEER_FLUSH_TIDS_CMDID,
> @@ -1878,6 +1909,8 @@ enum wmi_tlv_tag {
> WMI_TAG_PDEV_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMD,
> WMI_TAG_REGULATORY_RULE_EXT_STRUCT = 0x3A9,
> WMI_TAG_REG_CHAN_LIST_CC_EXT_EVENT,
> + WMI_TAG_VDEV_SET_TPC_POWER_CMD = 0x3B5,
> + WMI_TAG_VDEV_CH_POWER_INFO,
> WMI_TAG_PDEV_SET_BIOS_SAR_TABLE_CMD = 0x3D8,
> WMI_TAG_PDEV_SET_BIOS_GEO_TABLE_CMD,
> WMI_TAG_MAX
> @@ -3168,6 +3201,31 @@ struct wlan_ssid {
> u8 ssid[WLAN_SSID_MAX_LEN];
> };
>
> +struct wmi_vdev_ch_power_info {
> + u32 tlv_header;
> + u32 chan_cfreq; /* Channel center frequency (MHz) */
> + /* Unit: dBm, either PSD/EIRP power for this frequency or
> + * incremental for non-PSD BW
> + */
> + u32 tx_power;
> +} __packed;
> +
> +struct wmi_vdev_set_tpc_power_cmd {
> + u32 tlv_header;
> + u32 vdev_id;
> + u32 psd_power; /* Value: 0 or 1, is PSD power or not */
> + u32 eirp_power; /* Maximum EIRP power (dBm units), valid only if power is PSD */
> + u32 power_type_6ghz; /* Type: WMI_6GHZ_REG_TYPE, used for halphy CTL lookup */
> + /* This fixed_param TLV is followed by the below TLVs:
> + * num_pwr_levels of wmi_vdev_ch_power_info
> + * For PSD power, it is the PSD/EIRP power of the frequency (20 MHz chunks).
> + * For non-PSD power, the power values are for 20, 40, and till
> + * BSS BW power levels.
> + * The num_pwr_levels will be checked by sw how many elements present
> + * in the variable-length array.
> + */
> +} __packed;
> +
> #define WMI_IE_BITMAP_SIZE 8
>
> /* prefix used by scan requestor ids on the host */
> @@ -6512,4 +6570,7 @@ void ath11k_reg_reset_info(struct cur_regulatory_info *reg_info);
> int ath11k_reg_handle_chan_list(struct ath11k_base *ab,
> struct cur_regulatory_info *reg_info,
> enum ieee80211_ap_reg_power power_type);
> +int ath11k_wmi_send_vdev_set_tpc_power(struct ath11k *ar,
> + u32 vdev_id,
> + struct ath11k_reg_tpc_power_info *param);
> #endif
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v6 13/13] wifi: ath11k: send TPC power to firmware for 6 GHz station
2023-09-20 8:23 [PATCH v6 00/13] wifi: ath11k: add support for 6 GHz station for various modes : LPI, SP and VLP Wen Gong
` (11 preceding siblings ...)
2023-09-20 8:23 ` [PATCH v6 12/13] wifi: ath11k: add handler for WMI_VDEV_SET_TPC_POWER_CMDID Wen Gong
@ 2023-09-20 8:23 ` Wen Gong
2023-09-21 20:38 ` Jeff Johnson
2023-09-22 9:24 ` Aditya Kumar Singh
12 siblings, 2 replies; 48+ messages in thread
From: Wen Gong @ 2023-09-20 8:23 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson, quic_wgong
When station is connected to a 6 GHz AP, it has 2 way to configure
the power limit to firmware. The first way is to send 2 wmi command
WMI_PDEV_PARAM_TXPOWER_LIMIT2G/WMI_PDEV_PARAM_TXPOWER_LIMIT5G to
firmware, the second way is to send WMI_VDEV_SET_TPC_POWER_CMDID to
firmware which include more parameters for power control.
The first way is disabled in previous patch
"ath11k: discard BSS_CHANGED_TXPOWER when EXT_TPC_REG_SUPPORT for 6 GHz".
Prepare the parameter for wmi command WMI_VDEV_SET_TPC_POWER_CMDID and
send the firmware after vdev start response success from firmware, it
is for the second way of power control.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
---
drivers/net/wireless/ath/ath11k/mac.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index a8ae281d2635..f8b907a758b1 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -7296,6 +7296,12 @@ ath11k_mac_vdev_start_restart(struct ath11k_vif *arvif,
return ret;
}
+ if (ath11k_mac_supports_station_tpc(ar, arvif, chandef)) {
+ ath11k_mac_fill_reg_tpc_info(ar, arvif->vif, &arvif->chanctx);
+ ath11k_wmi_send_vdev_set_tpc_power(ar, arvif->vdev_id,
+ &arvif->reg_tpc_info);
+ }
+
if (!restart)
ar->num_started_vdevs++;
@@ -8108,7 +8114,7 @@ ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
if (power_type == IEEE80211_REG_UNSET_AP)
power_type = IEEE80211_REG_LPI_AP;
ath11k_reg_handle_chan_list(ab, reg_info, power_type);
-
+ arvif->chanctx = *ctx;
ath11k_mac_parse_tx_pwr_env(ar, vif, ctx);
}
--
2.40.1
^ permalink raw reply related [flat|nested] 48+ messages in thread* Re: [PATCH v6 13/13] wifi: ath11k: send TPC power to firmware for 6 GHz station
2023-09-20 8:23 ` [PATCH v6 13/13] wifi: ath11k: send TPC power to firmware for 6 GHz station Wen Gong
@ 2023-09-21 20:38 ` Jeff Johnson
2023-09-22 9:24 ` Aditya Kumar Singh
1 sibling, 0 replies; 48+ messages in thread
From: Jeff Johnson @ 2023-09-21 20:38 UTC (permalink / raw)
To: Wen Gong, ath11k; +Cc: linux-wireless, kvalo
On 9/20/2023 1:23 AM, Wen Gong wrote:
> When station is connected to a 6 GHz AP, it has 2 way to configure
> the power limit to firmware. The first way is to send 2 wmi command
> WMI_PDEV_PARAM_TXPOWER_LIMIT2G/WMI_PDEV_PARAM_TXPOWER_LIMIT5G to
> firmware, the second way is to send WMI_VDEV_SET_TPC_POWER_CMDID to
> firmware which include more parameters for power control.
>
> The first way is disabled in previous patch
> "ath11k: discard BSS_CHANGED_TXPOWER when EXT_TPC_REG_SUPPORT for 6 GHz".
>
> Prepare the parameter for wmi command WMI_VDEV_SET_TPC_POWER_CMDID and
> send the firmware after vdev start response success from firmware, it
> is for the second way of power control.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
As previously mentioned I'd squash this with patch 11
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v6 13/13] wifi: ath11k: send TPC power to firmware for 6 GHz station
2023-09-20 8:23 ` [PATCH v6 13/13] wifi: ath11k: send TPC power to firmware for 6 GHz station Wen Gong
2023-09-21 20:38 ` Jeff Johnson
@ 2023-09-22 9:24 ` Aditya Kumar Singh
2023-09-22 10:12 ` Wen Gong
1 sibling, 1 reply; 48+ messages in thread
From: Aditya Kumar Singh @ 2023-09-22 9:24 UTC (permalink / raw)
To: Wen Gong, ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson
On 9/20/23 13:53, Wen Gong wrote:
> When station is connected to a 6 GHz AP, it has 2 way to configure
> the power limit to firmware. The first way is to send 2 wmi command
> WMI_PDEV_PARAM_TXPOWER_LIMIT2G/WMI_PDEV_PARAM_TXPOWER_LIMIT5G to
> firmware, the second way is to send WMI_VDEV_SET_TPC_POWER_CMDID to
> firmware which include more parameters for power control.
>
> The first way is disabled in previous patch
> "ath11k: discard BSS_CHANGED_TXPOWER when EXT_TPC_REG_SUPPORT for 6 GHz".
>
> Prepare the parameter for wmi command WMI_VDEV_SET_TPC_POWER_CMDID and
> send the firmware after vdev start response success from firmware, it
> is for the second way of power control.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
> ---
> drivers/net/wireless/ath/ath11k/mac.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
> index a8ae281d2635..f8b907a758b1 100644
> --- a/drivers/net/wireless/ath/ath11k/mac.c
> +++ b/drivers/net/wireless/ath/ath11k/mac.c
> @@ -7296,6 +7296,12 @@ ath11k_mac_vdev_start_restart(struct ath11k_vif *arvif,
> return ret;
> }
>
> + if (ath11k_mac_supports_station_tpc(ar, arvif, chandef)) {
> + ath11k_mac_fill_reg_tpc_info(ar, arvif->vif, &arvif->chanctx);
So we are passing local copy of channel context stored in
arvif->chanctx. Do we need to update it when channel changes?
I see that during assignment time, we are copying/updating it and
accordingly the command will be sent to firmware, but what about when
STA moves channel? arvif->chanctx should be updated and tpc command
should be sent again in that case?
> + ath11k_wmi_send_vdev_set_tpc_power(ar, arvif->vdev_id,
> + &arvif->reg_tpc_info);
> + }
> +
> if (!restart)
> ar->num_started_vdevs++;
>
> @@ -8108,7 +8114,7 @@ ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
> if (power_type == IEEE80211_REG_UNSET_AP)
> power_type = IEEE80211_REG_LPI_AP;
> ath11k_reg_handle_chan_list(ab, reg_info, power_type);
> -
> + arvif->chanctx = *ctx;
> ath11k_mac_parse_tx_pwr_env(ar, vif, ctx);
> }
>
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v6 13/13] wifi: ath11k: send TPC power to firmware for 6 GHz station
2023-09-22 9:24 ` Aditya Kumar Singh
@ 2023-09-22 10:12 ` Wen Gong
2023-09-22 13:25 ` Aditya Kumar Singh
0 siblings, 1 reply; 48+ messages in thread
From: Wen Gong @ 2023-09-22 10:12 UTC (permalink / raw)
To: Aditya Kumar Singh, ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson
On 9/22/2023 5:24 PM, Aditya Kumar Singh wrote:
> On 9/20/23 13:53, Wen Gong wrote:
>> When station is connected to a 6 GHz AP, it has 2 way to configure
>> the power limit to firmware. The first way is to send 2 wmi command
>> WMI_PDEV_PARAM_TXPOWER_LIMIT2G/WMI_PDEV_PARAM_TXPOWER_LIMIT5G to
>> firmware, the second way is to send WMI_VDEV_SET_TPC_POWER_CMDID to
>> firmware which include more parameters for power control.
>>
>> The first way is disabled in previous patch
>> "ath11k: discard BSS_CHANGED_TXPOWER when EXT_TPC_REG_SUPPORT for 6
>> GHz".
>>
>> Prepare the parameter for wmi command WMI_VDEV_SET_TPC_POWER_CMDID and
>> send the firmware after vdev start response success from firmware, it
>> is for the second way of power control.
>>
>> Tested-on: WCN6855 hw2.0 PCI
>> WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>>
>> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
>> ---
>> drivers/net/wireless/ath/ath11k/mac.c | 8 +++++++-
>> 1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/wireless/ath/ath11k/mac.c
>> b/drivers/net/wireless/ath/ath11k/mac.c
>> index a8ae281d2635..f8b907a758b1 100644
>> --- a/drivers/net/wireless/ath/ath11k/mac.c
>> +++ b/drivers/net/wireless/ath/ath11k/mac.c
>> @@ -7296,6 +7296,12 @@ ath11k_mac_vdev_start_restart(struct
>> ath11k_vif *arvif,
>> return ret;
>> }
>> + if (ath11k_mac_supports_station_tpc(ar, arvif, chandef)) {
>> + ath11k_mac_fill_reg_tpc_info(ar, arvif->vif, &arvif->chanctx);
> So we are passing local copy of channel context stored in
> arvif->chanctx. Do we need to update it when channel changes?
>
> I see that during assignment time, we are copying/updating it and
> accordingly the command will be sent to firmware, but what about when
> STA moves channel? arvif->chanctx should be updated and tpc command
> should be sent again in that case?
This has been discussed before here per question of Johannes:"Could this
information change? Should we track it in beacons?":
[PATCH 9/9] mac80211: save transmit power envelope element and power
constraint
https://lore.kernel.org/linux-wireless/38e7d9d2eebafa7245a36a0a0396094526eb3efd.camel@sipsolutions.net/
>
>> + ath11k_wmi_send_vdev_set_tpc_power(ar, arvif->vdev_id,
>> + &arvif->reg_tpc_info);
>> + }
>> +
>> if (!restart)
>> ar->num_started_vdevs++;
>> @@ -8108,7 +8114,7 @@ ath11k_mac_op_assign_vif_chanctx(struct
>> ieee80211_hw *hw,
>> if (power_type == IEEE80211_REG_UNSET_AP)
>> power_type = IEEE80211_REG_LPI_AP;
>> ath11k_reg_handle_chan_list(ab, reg_info, power_type);
>> -
>> + arvif->chanctx = *ctx;
>> ath11k_mac_parse_tx_pwr_env(ar, vif, ctx);
>> }
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v6 13/13] wifi: ath11k: send TPC power to firmware for 6 GHz station
2023-09-22 10:12 ` Wen Gong
@ 2023-09-22 13:25 ` Aditya Kumar Singh
2023-09-25 2:15 ` Wen Gong
0 siblings, 1 reply; 48+ messages in thread
From: Aditya Kumar Singh @ 2023-09-22 13:25 UTC (permalink / raw)
To: Wen Gong, ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson
On 9/22/23 15:42, Wen Gong wrote:
> On 9/22/2023 5:24 PM, Aditya Kumar Singh wrote:
>> On 9/20/23 13:53, Wen Gong wrote:
>>> When station is connected to a 6 GHz AP, it has 2 way to configure
>>> the power limit to firmware. The first way is to send 2 wmi command
>>> WMI_PDEV_PARAM_TXPOWER_LIMIT2G/WMI_PDEV_PARAM_TXPOWER_LIMIT5G to
>>> firmware, the second way is to send WMI_VDEV_SET_TPC_POWER_CMDID to
>>> firmware which include more parameters for power control.
>>>
>>> The first way is disabled in previous patch
>>> "ath11k: discard BSS_CHANGED_TXPOWER when EXT_TPC_REG_SUPPORT for 6
>>> GHz".
>>>
>>> Prepare the parameter for wmi command WMI_VDEV_SET_TPC_POWER_CMDID and
>>> send the firmware after vdev start response success from firmware, it
>>> is for the second way of power control.
>>>
>>> Tested-on: WCN6855 hw2.0 PCI
>>> WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>>>
>>> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
>>> ---
>>> drivers/net/wireless/ath/ath11k/mac.c | 8 +++++++-
>>> 1 file changed, 7 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/net/wireless/ath/ath11k/mac.c
>>> b/drivers/net/wireless/ath/ath11k/mac.c
>>> index a8ae281d2635..f8b907a758b1 100644
>>> --- a/drivers/net/wireless/ath/ath11k/mac.c
>>> +++ b/drivers/net/wireless/ath/ath11k/mac.c
>>> @@ -7296,6 +7296,12 @@ ath11k_mac_vdev_start_restart(struct
>>> ath11k_vif *arvif,
>>> return ret;
>>> }
>>> + if (ath11k_mac_supports_station_tpc(ar, arvif, chandef)) {
>>> + ath11k_mac_fill_reg_tpc_info(ar, arvif->vif, &arvif->chanctx);
>> So we are passing local copy of channel context stored in
>> arvif->chanctx. Do we need to update it when channel changes?
>>
>> I see that during assignment time, we are copying/updating it and
>> accordingly the command will be sent to firmware, but what about when
>> STA moves channel? arvif->chanctx should be updated and tpc command
>> should be sent again in that case?
>
> This has been discussed before here per question of Johannes:"Could this
> information change? Should we track it in beacons?":
>
> [PATCH 9/9] mac80211: save transmit power envelope element and power
> constraint
>
> https://lore.kernel.org/linux-wireless/38e7d9d2eebafa7245a36a0a0396094526eb3efd.camel@sipsolutions.net/
That's fine. That's w.r.t to TX power change. I'm saying here about CSA?
What when AP tries to switch channel? For that client need not
disassociate and associate back right?
In that case, channel context in mac80211 layer will change. But our
driver's arvif->chanctx will have previous one only. We are using
channel context to get the ieee80211_channel which has the PSD value,
and that value we are sending to firmware via TPC command during intial
association time. So when channel changes, firmware also should be
updated with the latest PSD values via TPC command for the latest
channel right?
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v6 13/13] wifi: ath11k: send TPC power to firmware for 6 GHz station
2023-09-22 13:25 ` Aditya Kumar Singh
@ 2023-09-25 2:15 ` Wen Gong
2023-09-25 5:41 ` Aditya Kumar Singh
0 siblings, 1 reply; 48+ messages in thread
From: Wen Gong @ 2023-09-25 2:15 UTC (permalink / raw)
To: Aditya Kumar Singh, ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson
On 9/22/2023 9:25 PM, Aditya Kumar Singh wrote:
> On 9/22/23 15:42, Wen Gong wrote:
>> On 9/22/2023 5:24 PM, Aditya Kumar Singh wrote:
>>> On 9/20/23 13:53, Wen Gong wrote:
>>>> When station is connected to a 6 GHz AP, it has 2 way to configure
>>>> the power limit to firmware. The first way is to send 2 wmi command
>>>> WMI_PDEV_PARAM_TXPOWER_LIMIT2G/WMI_PDEV_PARAM_TXPOWER_LIMIT5G to
>>>> firmware, the second way is to send WMI_VDEV_SET_TPC_POWER_CMDID to
>>>> firmware which include more parameters for power control.
>>>>
>>>> The first way is disabled in previous patch
>>>> "ath11k: discard BSS_CHANGED_TXPOWER when EXT_TPC_REG_SUPPORT for 6
>>>> GHz".
>>>>
>>>> Prepare the parameter for wmi command WMI_VDEV_SET_TPC_POWER_CMDID and
>>>> send the firmware after vdev start response success from firmware, it
>>>> is for the second way of power control.
>>>>
>>>> Tested-on: WCN6855 hw2.0 PCI
>>>> WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>>>>
>>>> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
>>>> ---
>>>> drivers/net/wireless/ath/ath11k/mac.c | 8 +++++++-
>>>> 1 file changed, 7 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/net/wireless/ath/ath11k/mac.c
>>>> b/drivers/net/wireless/ath/ath11k/mac.c
>>>> index a8ae281d2635..f8b907a758b1 100644
>>>> --- a/drivers/net/wireless/ath/ath11k/mac.c
>>>> +++ b/drivers/net/wireless/ath/ath11k/mac.c
>>>> @@ -7296,6 +7296,12 @@ ath11k_mac_vdev_start_restart(struct
>>>> ath11k_vif *arvif,
>>>> return ret;
>>>> }
>>>> + if (ath11k_mac_supports_station_tpc(ar, arvif, chandef)) {
>>>> + ath11k_mac_fill_reg_tpc_info(ar, arvif->vif,
>>>> &arvif->chanctx);
>>> So we are passing local copy of channel context stored in
>>> arvif->chanctx. Do we need to update it when channel changes?
>>>
>>> I see that during assignment time, we are copying/updating it and
>>> accordingly the command will be sent to firmware, but what about
>>> when STA moves channel? arvif->chanctx should be updated and tpc
>>> command should be sent again in that case?
>>
>> This has been discussed before here per question of Johannes:"Could
>> this information change? Should we track it in beacons?":
>>
>> [PATCH 9/9] mac80211: save transmit power envelope element and power
>> constraint
>>
>> https://lore.kernel.org/linux-wireless/38e7d9d2eebafa7245a36a0a0396094526eb3efd.camel@sipsolutions.net/
>>
> That's fine. That's w.r.t to TX power change. I'm saying here about
> CSA? What when AP tries to switch channel? For that client need not
> disassociate and associate back right?
>
> In that case, channel context in mac80211 layer will change. But our
> driver's arvif->chanctx will have previous one only. We are using
> channel context to get the ieee80211_channel which has the PSD value,
> and that value we are sending to firmware via TPC command during
> intial association time. So when channel changes, firmware also should
> be updated with the latest PSD values via TPC command for the latest
> channel right?
>
You are right. CSA may be change channel bandwidth.
Currently we could keep NOT support CSA as well as CSA for MLO since
these are the basic TPC support feature.
We could make new patch later to support CSA fro TPC power, OK?
>
>
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v6 13/13] wifi: ath11k: send TPC power to firmware for 6 GHz station
2023-09-25 2:15 ` Wen Gong
@ 2023-09-25 5:41 ` Aditya Kumar Singh
2023-09-25 10:50 ` Wen Gong
0 siblings, 1 reply; 48+ messages in thread
From: Aditya Kumar Singh @ 2023-09-25 5:41 UTC (permalink / raw)
To: Wen Gong, ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson
On 9/25/23 07:45, Wen Gong wrote:
> On 9/22/2023 9:25 PM, Aditya Kumar Singh wrote:
>> On 9/22/23 15:42, Wen Gong wrote:
>>> On 9/22/2023 5:24 PM, Aditya Kumar Singh wrote:
>>>> On 9/20/23 13:53, Wen Gong wrote:
>>>>> When station is connected to a 6 GHz AP, it has 2 way to configure
>>>>> the power limit to firmware. The first way is to send 2 wmi command
>>>>> WMI_PDEV_PARAM_TXPOWER_LIMIT2G/WMI_PDEV_PARAM_TXPOWER_LIMIT5G to
>>>>> firmware, the second way is to send WMI_VDEV_SET_TPC_POWER_CMDID to
>>>>> firmware which include more parameters for power control.
>>>>>
>>>>> The first way is disabled in previous patch
>>>>> "ath11k: discard BSS_CHANGED_TXPOWER when EXT_TPC_REG_SUPPORT for 6
>>>>> GHz".
>>>>>
>>>>> Prepare the parameter for wmi command WMI_VDEV_SET_TPC_POWER_CMDID and
>>>>> send the firmware after vdev start response success from firmware, it
>>>>> is for the second way of power control.
>>>>>
>>>>> Tested-on: WCN6855 hw2.0 PCI
>>>>> WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>>>>>
>>>>> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
>>>>> ---
>>>>> drivers/net/wireless/ath/ath11k/mac.c | 8 +++++++-
>>>>> 1 file changed, 7 insertions(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/drivers/net/wireless/ath/ath11k/mac.c
>>>>> b/drivers/net/wireless/ath/ath11k/mac.c
>>>>> index a8ae281d2635..f8b907a758b1 100644
>>>>> --- a/drivers/net/wireless/ath/ath11k/mac.c
>>>>> +++ b/drivers/net/wireless/ath/ath11k/mac.c
>>>>> @@ -7296,6 +7296,12 @@ ath11k_mac_vdev_start_restart(struct
>>>>> ath11k_vif *arvif,
>>>>> return ret;
>>>>> }
>>>>> + if (ath11k_mac_supports_station_tpc(ar, arvif, chandef)) {
>>>>> + ath11k_mac_fill_reg_tpc_info(ar, arvif->vif,
>>>>> &arvif->chanctx);
>>>> So we are passing local copy of channel context stored in
>>>> arvif->chanctx. Do we need to update it when channel changes?
>>>>
>>>> I see that during assignment time, we are copying/updating it and
>>>> accordingly the command will be sent to firmware, but what about
>>>> when STA moves channel? arvif->chanctx should be updated and tpc
>>>> command should be sent again in that case?
>>>
>>> This has been discussed before here per question of Johannes:"Could
>>> this information change? Should we track it in beacons?":
>>>
>>> [PATCH 9/9] mac80211: save transmit power envelope element and power
>>> constraint
>>>
>>> https://lore.kernel.org/linux-wireless/38e7d9d2eebafa7245a36a0a0396094526eb3efd.camel@sipsolutions.net/
>> That's fine. That's w.r.t to TX power change. I'm saying here about
>> CSA? What when AP tries to switch channel? For that client need not
>> disassociate and associate back right?
>>
>> In that case, channel context in mac80211 layer will change. But our
>> driver's arvif->chanctx will have previous one only. We are using
>> channel context to get the ieee80211_channel which has the PSD value,
>> and that value we are sending to firmware via TPC command during
>> intial association time. So when channel changes, firmware also should
>> be updated with the latest PSD values via TPC command for the latest
>> channel right?
>>
> You are right. CSA may be change channel bandwidth.
>
> Currently we could keep NOT support CSA as well as CSA for MLO since
> these are the basic TPC support feature.
>
> We could make new patch later to support CSA fro TPC power, OK?
Not supporting w.r.t MLO CSA is okay. That's WIP. But for non-MLO case,
I think it should be supported. And if not, then may be explicitly
mention it somewhere as _TODO_ ? What if by the time patch is sent for
that, meanwhile a bug is filed?
Anyways, I will let maintainers take a call on this. I don't have any
further comments.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH v6 13/13] wifi: ath11k: send TPC power to firmware for 6 GHz station
2023-09-25 5:41 ` Aditya Kumar Singh
@ 2023-09-25 10:50 ` Wen Gong
0 siblings, 0 replies; 48+ messages in thread
From: Wen Gong @ 2023-09-25 10:50 UTC (permalink / raw)
To: Aditya Kumar Singh, ath11k; +Cc: linux-wireless, kvalo, quic_jjohnson
On 9/25/2023 1:41 PM, Aditya Kumar Singh wrote:
> On 9/25/23 07:45, Wen Gong wrote:
>> On 9/22/2023 9:25 PM, Aditya Kumar Singh wrote:
>>> On 9/22/23 15:42, Wen Gong wrote:
>>>> On 9/22/2023 5:24 PM, Aditya Kumar Singh wrote:
>>>>> On 9/20/23 13:53, Wen Gong wrote:
>>>>>> When station is connected to a 6 GHz AP, it has 2 way to configure
>>>>>> the power limit to firmware. The first way is to send 2 wmi command
>>>>>> WMI_PDEV_PARAM_TXPOWER_LIMIT2G/WMI_PDEV_PARAM_TXPOWER_LIMIT5G to
>>>>>> firmware, the second way is to send WMI_VDEV_SET_TPC_POWER_CMDID to
>>>>>> firmware which include more parameters for power control.
>>>>>>
>>>>>> The first way is disabled in previous patch
>>>>>> "ath11k: discard BSS_CHANGED_TXPOWER when EXT_TPC_REG_SUPPORT for
>>>>>> 6 GHz".
>>>>>>
>>>>>> Prepare the parameter for wmi command
>>>>>> WMI_VDEV_SET_TPC_POWER_CMDID and
>>>>>> send the firmware after vdev start response success from
>>>>>> firmware, it
>>>>>> is for the second way of power control.
>>>>>>
>>>>>> Tested-on: WCN6855 hw2.0 PCI
>>>>>> WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23
>>>>>>
>>>>>> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
>>>>>> ---
>>>>>> drivers/net/wireless/ath/ath11k/mac.c | 8 +++++++-
>>>>>> 1 file changed, 7 insertions(+), 1 deletion(-)
>>>>>>
>>>>>> diff --git a/drivers/net/wireless/ath/ath11k/mac.c
>>>>>> b/drivers/net/wireless/ath/ath11k/mac.c
>>>>>> index a8ae281d2635..f8b907a758b1 100644
>>>>>> --- a/drivers/net/wireless/ath/ath11k/mac.c
>>>>>> +++ b/drivers/net/wireless/ath/ath11k/mac.c
>>>>>> @@ -7296,6 +7296,12 @@ ath11k_mac_vdev_start_restart(struct
>>>>>> ath11k_vif *arvif,
>>>>>> return ret;
>>>>>> }
>>>>>> + if (ath11k_mac_supports_station_tpc(ar, arvif, chandef)) {
>>>>>> + ath11k_mac_fill_reg_tpc_info(ar, arvif->vif,
>>>>>> &arvif->chanctx);
>>>>> So we are passing local copy of channel context stored in
>>>>> arvif->chanctx. Do we need to update it when channel changes?
>>>>>
>>>>> I see that during assignment time, we are copying/updating it and
>>>>> accordingly the command will be sent to firmware, but what about
>>>>> when STA moves channel? arvif->chanctx should be updated and tpc
>>>>> command should be sent again in that case?
>>>>
>>>> This has been discussed before here per question of Johannes:"Could
>>>> this information change? Should we track it in beacons?":
>>>>
>>>> [PATCH 9/9] mac80211: save transmit power envelope element and
>>>> power constraint
>>>>
>>>> https://lore.kernel.org/linux-wireless/38e7d9d2eebafa7245a36a0a0396094526eb3efd.camel@sipsolutions.net/
>>>>
>>> That's fine. That's w.r.t to TX power change. I'm saying here about
>>> CSA? What when AP tries to switch channel? For that client need not
>>> disassociate and associate back right?
>>>
>>> In that case, channel context in mac80211 layer will change. But our
>>> driver's arvif->chanctx will have previous one only. We are using
>>> channel context to get the ieee80211_channel which has the PSD
>>> value, and that value we are sending to firmware via TPC command
>>> during intial association time. So when channel changes, firmware
>>> also should be updated with the latest PSD values via TPC command
>>> for the latest channel right?
>>>
>> You are right. CSA may be change channel bandwidth.
>>
>> Currently we could keep NOT support CSA as well as CSA for MLO since
>> these are the basic TPC support feature.
>>
>> We could make new patch later to support CSA fro TPC power, OK?
> Not supporting w.r.t MLO CSA is okay. That's WIP. But for non-MLO
> case, I think it should be supported. And if not, then may be
> explicitly mention it somewhere as _TODO_ ? What if by the time patch
> is sent for that, meanwhile a bug is filed?
I will add _TODO_ next version as you said.
>
> Anyways, I will let maintainers take a call on this. I don't have any
> further comments.
>
^ permalink raw reply [flat|nested] 48+ messages in thread