* [PATCH 1/4] wifi: ath11k: add a debugfs file listing the firmware WMI services
2026-10-03 15:55 [PATCH 0/4] wifi: ath11k: beacon protection and firmware airtime fairness Andrei-Alexandru Bleortu
@ 2026-10-03 15:55 ` Andrei-Alexandru Bleortu
2026-10-03 15:55 ` [PATCH 2/4] wifi: ath11k: support beacon protection Andrei-Alexandru Bleortu
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Andrei-Alexandru Bleortu @ 2026-10-03 15:55 UTC (permalink / raw)
To: Jeff Johnson, Johannes Berg
Cc: ath11k, linux-kernel, linux-wireless, Felix Fietkau
Whether a feature is available often comes down to a WMI service bit
the firmware reports at boot, and ath11k only logs the ext services,
at debug level. List every set bit of the service map in
<soc>/wmi_services, as ath10k's file of the same name does, so the
capabilities of a given firmware build can be read directly.
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.9.0.1-02146-QCAHKSWPL_SILICONZ-1
Tested-on: IPQ5018 hw1.0 AHB WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
Assisted-by: LLM
Signed-off-by: Andrei-Alexandru Bleortu <me@andrei-z.com>
---
drivers/net/wireless/ath/ath11k/debugfs.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c
index 70922612d..75d2e81c7 100644
--- a/drivers/net/wireless/ath/ath11k/debugfs.c
+++ b/drivers/net/wireless/ath/ath11k/debugfs.c
@@ -851,6 +851,18 @@ static const struct file_operations fops_sram_dump = {
.llseek = default_llseek,
};
+static int ath11k_wmi_services_show(struct seq_file *m, void *v)
+{
+ struct ath11k_base *ab = m->private;
+ unsigned int i;
+
+ for_each_set_bit(i, ab->wmi_ab.svc_map, WMI_MAX_EXT2_SERVICE)
+ seq_printf(m, "%u\n", i);
+
+ return 0;
+}
+DEFINE_SHOW_ATTRIBUTE(ath11k_wmi_services);
+
int ath11k_debugfs_pdev_create(struct ath11k_base *ab)
{
if (test_bit(ATH11K_FLAG_REGISTERED, &ab->dev_flags))
@@ -862,6 +874,9 @@ int ath11k_debugfs_pdev_create(struct ath11k_base *ab)
debugfs_create_file("soc_dp_stats", 0400, ab->debugfs_soc, ab,
&fops_soc_dp_stats);
+ debugfs_create_file("wmi_services", 0400, ab->debugfs_soc, ab,
+ &ath11k_wmi_services_fops);
+
if (ab->hw_params.sram_dump.start != 0)
debugfs_create_file("sram", 0400, ab->debugfs_soc, ab,
&fops_sram_dump);
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/4] wifi: ath11k: support beacon protection
2026-10-03 15:55 [PATCH 0/4] wifi: ath11k: beacon protection and firmware airtime fairness Andrei-Alexandru Bleortu
2026-10-03 15:55 ` [PATCH 1/4] wifi: ath11k: add a debugfs file listing the firmware WMI services Andrei-Alexandru Bleortu
@ 2026-10-03 15:55 ` Andrei-Alexandru Bleortu
2026-10-03 15:55 ` [PATCH 3/4] wifi: mac80211: notify driver on airtime weight changes Andrei-Alexandru Bleortu
2026-10-03 15:55 ` [PATCH 4/4] wifi: ath11k: support firmware airtime fairness Andrei-Alexandru Bleortu
3 siblings, 0 replies; 5+ messages in thread
From: Andrei-Alexandru Bleortu @ 2026-10-03 15:55 UTC (permalink / raw)
To: Jeff Johnson, Johannes Berg
Cc: ath11k, linux-kernel, linux-wireless, Felix Fietkau
Firmware with WMI_TLV_SERVICE_BEACON_PROTECTION_SUPPORT protects the
beacons it transmits with the BIGTK. Advertise
NL80211_EXT_FEATURE_BEACON_PROTECTION when the service is present,
install the BIGTK (key index 6/7) in hardware with the BIP ciphers, and
set the beacon protection bit of the beacon template command when the
beacon's Extended Capabilities, or those of a nontransmitted BSSID
profile in it, enable it. The IGTK (index 4/5) stays in software, which
protects the management frames mac80211 sends.
This follows the ath12k change that added the same support, commit
"wifi: ath12k: allow beacon protection keys to be installed in hardware".
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.9.0.1-02146-QCAHKSWPL_SILICONZ-1
Tested-on: IPQ5018 hw1.0 AHB WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
Assisted-by: LLM
Signed-off-by: Andrei-Alexandru Bleortu <me@andrei-z.com>
---
drivers/net/wireless/ath/ath11k/core.h | 1 +
drivers/net/wireless/ath/ath11k/mac.c | 61 +++++++++++++++++++++++---
drivers/net/wireless/ath/ath11k/wmi.c | 2 +
drivers/net/wireless/ath/ath11k/wmi.h | 5 ++-
4 files changed, 63 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h
index a0d725923..31eee25c0 100644
--- a/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@ -408,6 +408,7 @@ struct ath11k_vif {
int txpower;
bool rsnie_present;
bool wpaie_present;
+ bool beacon_prot;
bool bcca_zero_sent;
bool do_not_send_tmpl;
struct ath11k_arp_ns_offload arp_ns_offload;
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index c1fa42edd..57cc6dbdd 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -1495,6 +1495,44 @@ static int ath11k_mac_remove_vendor_ie(struct sk_buff *skb, unsigned int oui,
return 0;
}
+static bool ath11k_mac_ext_capa_bcn_prot(const struct element *ext_capa)
+{
+ return ext_capa && ext_capa->datalen >= 11 &&
+ (ext_capa->data[10] & WLAN_EXT_CAPA11_BCN_PROTECT);
+}
+
+/* Beacon protection covers the whole beacon, so enable it when the
+ * transmitted BSS or any nontransmitted profile in it advertises it.
+ */
+static bool ath11k_mac_bcn_prot_enabled(struct sk_buff *bcn)
+{
+ struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)bcn->data;
+ const u8 *ies = mgmt->u.beacon.variable;
+ int ies_len = skb_tail_pointer(bcn) - ies;
+ const struct element *elem, *profile;
+
+ if (ath11k_mac_ext_capa_bcn_prot(cfg80211_find_elem(WLAN_EID_EXT_CAPABILITY,
+ ies, ies_len)))
+ return true;
+
+ for_each_element_id(elem, WLAN_EID_MULTIPLE_BSSID, ies, ies_len) {
+ if (elem->datalen < 1)
+ continue;
+
+ for_each_element(profile, elem->data + 1, elem->datalen - 1) {
+ if (profile->id != 0)
+ continue;
+
+ if (ath11k_mac_ext_capa_bcn_prot(cfg80211_find_elem(WLAN_EID_EXT_CAPABILITY,
+ profile->data,
+ profile->datalen)))
+ return true;
+ }
+ }
+
+ return false;
+}
+
static int ath11k_mac_set_vif_params(struct ath11k_vif *arvif,
struct sk_buff *bcn)
{
@@ -1598,6 +1636,7 @@ static int ath11k_mac_setup_bcn_tmpl_ema(struct ath11k_vif *arvif,
params |= ((!i ? 1 : 0) << WMI_EMA_FIRST_TMPL_SHIFT);
params |= ((i + 1 == beacons->cnt ? 1 : 0) << WMI_EMA_LAST_TMPL_SHIFT);
+ tx_arvif->beacon_prot = ath11k_mac_bcn_prot_enabled(beacons->bcn[i].skb);
ret = ath11k_wmi_bcn_tmpl(tx_arvif->ar, tx_arvif->vdev_id,
&beacons->bcn[i].offs,
beacons->bcn[i].skb, params);
@@ -1651,6 +1690,7 @@ static int ath11k_mac_setup_bcn_tmpl_mbssid(struct ath11k_vif *arvif,
goto free;
}
+ arvif->beacon_prot = ath11k_mac_bcn_prot_enabled(bcn);
ret = ath11k_wmi_bcn_tmpl(ar, arvif->vdev_id, &offs, bcn, 0);
if (ret)
ath11k_warn(ab, "failed to submit beacon template command: %d\n",
@@ -4412,6 +4452,14 @@ static int ath11k_install_key(struct ath11k_vif *arvif,
arg.key_cipher = WMI_CIPHER_AES_GCM;
key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV_MGMT;
break;
+ case WLAN_CIPHER_SUITE_AES_CMAC:
+ case WLAN_CIPHER_SUITE_BIP_CMAC_256:
+ arg.key_cipher = WMI_CIPHER_AES_CMAC;
+ break;
+ case WLAN_CIPHER_SUITE_BIP_GMAC_128:
+ case WLAN_CIPHER_SUITE_BIP_GMAC_256:
+ arg.key_cipher = WMI_CIPHER_AES_GMAC;
+ break;
default:
ath11k_warn(ar->ab, "cipher %d is not supported\n", key->cipher);
return -EOPNOTSUPP;
@@ -4523,11 +4571,10 @@ static int ath11k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
int ret = 0;
u32 flags = 0;
- /* BIP needs to be done in software */
- if (key->cipher == WLAN_CIPHER_SUITE_AES_CMAC ||
- key->cipher == WLAN_CIPHER_SUITE_BIP_GMAC_128 ||
- key->cipher == WLAN_CIPHER_SUITE_BIP_GMAC_256 ||
- key->cipher == WLAN_CIPHER_SUITE_BIP_CMAC_256)
+ /* The IGTK protects management frames, which are done in software;
+ * only the BIGTK (index 6/7) goes to the firmware, which signs beacons.
+ */
+ if (key->keyidx == 4 || key->keyidx == 5)
return 1;
if (test_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &ar->ab->dev_flags))
@@ -10633,6 +10680,10 @@ static int __ath11k_mac_register(struct ath11k *ar)
wiphy_ext_feature_set(ar->hw->wiphy,
NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER);
+ if (test_bit(WMI_TLV_SERVICE_BEACON_PROTECTION_SUPPORT, ar->ab->wmi_ab.svc_map))
+ wiphy_ext_feature_set(ar->hw->wiphy,
+ NL80211_EXT_FEATURE_BEACON_PROTECTION);
+
ar->hw->wiphy->mbssid_max_interfaces = TARGET_NUM_VDEVS(ab);
ar->hw->wiphy->ema_max_profile_periodicity = TARGET_EMA_MAX_PROFILE_PERIOD;
diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 08fd6795e..2c3e14a65 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -1811,6 +1811,8 @@ int ath11k_wmi_bcn_tmpl(struct ath11k *ar, u32 vdev_id,
cmd->buf_len = bcn->len;
cmd->mbssid_ie_offset = offs->mbssid_off;
cmd->ema_params = ema_params;
+ if (arvif->beacon_prot)
+ cmd->feature_enable_bitmap |= WMI_BCN_TMPL_BEACON_PROTECTION_EN;
ptr = skb->data + sizeof(*cmd);
diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index b2dade051..ae8b4cc08 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -2128,6 +2128,7 @@ enum wmi_tlv_service {
WMI_TLV_SERVICE_PER_PEER_HTT_STATS_RESET = 213,
WMI_TLV_SERVICE_FREQINFO_IN_METADATA = 219,
WMI_TLV_SERVICE_EXT2_MSG = 220,
+ WMI_TLV_SERVICE_BEACON_PROTECTION_SUPPORT = 244,
WMI_TLV_SERVICE_PEER_POWER_SAVE_DURATION_SUPPORT = 246,
WMI_TLV_SERVICE_SRG_SRP_SPATIAL_REUSE_SUPPORT = 249,
WMI_TLV_SERVICE_MBSS_PARAM_IN_VDEV_START_SUPPORT = 253,
@@ -3628,6 +3629,8 @@ struct ath11k_wmi_p2p_noa_info {
#define WMI_EMA_FIRST_TMPL_SHIFT 16
#define WMI_EMA_LAST_TMPL_SHIFT 24
+#define WMI_BCN_TMPL_BEACON_PROTECTION_EN BIT(0)
+
struct wmi_bcn_tmpl_cmd {
u32 tlv_header;
u32 vdev_id;
@@ -5237,7 +5240,7 @@ enum wmi_ap_ps_peer_param {
#define DISABLE_SIFS_RESPONSE_TRIGGER 0
-#define WMI_MAX_KEY_INDEX 3
+#define WMI_MAX_KEY_INDEX 7
#define WMI_MAX_KEY_LEN 32
#define WMI_KEY_PAIRWISE 0x00
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/4] wifi: mac80211: notify driver on airtime weight changes
2026-10-03 15:55 [PATCH 0/4] wifi: ath11k: beacon protection and firmware airtime fairness Andrei-Alexandru Bleortu
2026-10-03 15:55 ` [PATCH 1/4] wifi: ath11k: add a debugfs file listing the firmware WMI services Andrei-Alexandru Bleortu
2026-10-03 15:55 ` [PATCH 2/4] wifi: ath11k: support beacon protection Andrei-Alexandru Bleortu
@ 2026-10-03 15:55 ` Andrei-Alexandru Bleortu
2026-10-03 15:55 ` [PATCH 4/4] wifi: ath11k: support firmware airtime fairness Andrei-Alexandru Bleortu
3 siblings, 0 replies; 5+ messages in thread
From: Andrei-Alexandru Bleortu @ 2026-10-03 15:55 UTC (permalink / raw)
To: Jeff Johnson, Johannes Berg
Cc: ath11k, linux-kernel, linux-wireless, Felix Fietkau
From: Felix Fietkau <nbd@nbd.name>
Add a new sta_set_airtime_weight driver op so drivers can program the
airtime fairness weight into hardware. The op is called when the weight
is updated via sta_apply_parameters, and on station upload if a
non-default weight is already set.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Andrei-Alexandru Bleortu <me@andrei-z.com>
---
include/net/mac80211.h | 5 +++++
net/mac80211/cfg.c | 6 +++++-
net/mac80211/driver-ops.c | 4 ++++
net/mac80211/driver-ops.h | 19 +++++++++++++++++++
net/mac80211/sta_info.c | 7 ++++++-
net/mac80211/trace.h | 27 +++++++++++++++++++++++++++
6 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index cb9f8e14b..aab98d92e 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -4694,6 +4694,8 @@ struct ieee80211_prep_tx_info {
* @set_sar_specs: Update the SAR (TX power) settings.
* @sta_set_decap_offload: Called to notify the driver when a station is allowed
* to use rx decapsulation offload
+ * @sta_set_airtime_weight: Called to notify the driver of a change to a
+ * station's airtime fairness weight, so it can be programmed in hardware.
* @add_twt_setup: Update hw with TWT agreement parameters received from the peer.
* This callback allows the hw to check if requested parameters
* are supported and if there is enough room for a new agreement.
@@ -5108,6 +5110,9 @@ struct ieee80211_ops {
void (*sta_set_decap_offload)(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct ieee80211_sta *sta, bool enabled);
+ void (*sta_set_airtime_weight)(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif,
+ struct ieee80211_sta *sta, u16 weight);
void (*add_twt_setup)(struct ieee80211_hw *hw,
struct ieee80211_sta *sta,
struct ieee80211_twt_setup *twt);
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index bd1a857c8..28f99a8f8 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2616,8 +2616,12 @@ static int sta_apply_parameters(struct ieee80211_local *local,
if (ieee80211_vif_is_mesh(&sdata->vif))
sta_apply_mesh_params(local, sta, params);
- if (params->airtime_weight)
+ if (params->airtime_weight) {
sta->airtime_weight = params->airtime_weight;
+ if (sta->uploaded)
+ drv_sta_set_airtime_weight(local, sdata, &sta->sta,
+ sta->airtime_weight);
+ }
if (params->nmi_mac) {
struct ieee80211_sub_if_data *nmi =
diff --git a/net/mac80211/driver-ops.c b/net/mac80211/driver-ops.c
index 49753b73a..083c26517 100644
--- a/net/mac80211/driver-ops.c
+++ b/net/mac80211/driver-ops.c
@@ -157,6 +157,10 @@ int drv_sta_state(struct ieee80211_local *local,
sta->uploaded = true;
if (rcu_access_pointer(sta->sta.rates))
drv_sta_rate_tbl_update(local, sdata, &sta->sta);
+ if (sta->airtime_weight != IEEE80211_DEFAULT_AIRTIME_WEIGHT)
+ drv_sta_set_airtime_weight(local, sdata,
+ &sta->sta,
+ sta->airtime_weight);
}
} else if (old_state == IEEE80211_STA_ASSOC &&
new_state == IEEE80211_STA_AUTH) {
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index f1c0b87fd..bd5c9d1ed 100644
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -1633,6 +1633,25 @@ static inline void drv_sta_set_decap_offload(struct ieee80211_local *local,
trace_drv_return_void(local);
}
+static inline void drv_sta_set_airtime_weight(struct ieee80211_local *local,
+ struct ieee80211_sub_if_data *sdata,
+ struct ieee80211_sta *sta,
+ u16 weight)
+{
+ sdata = get_bss_sdata(sdata);
+
+ might_sleep();
+ lockdep_assert_wiphy(local->hw.wiphy);
+ if (!check_sdata_in_driver(sdata))
+ return;
+
+ trace_drv_sta_set_airtime_weight(local, sdata, sta, weight);
+ if (local->ops->sta_set_airtime_weight)
+ local->ops->sta_set_airtime_weight(&local->hw, &sdata->vif, sta,
+ weight);
+ trace_drv_return_void(local);
+}
+
static inline void drv_add_twt_setup(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata,
struct ieee80211_sta *sta,
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index e81cd1551..2ce3ef905 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -872,8 +872,13 @@ static int sta_info_insert_drv_state(struct ieee80211_local *local,
* Drivers using legacy sta_add/sta_remove callbacks only
* get uploaded set to true after sta_add is called.
*/
- if (!local->ops->sta_add)
+ if (!local->ops->sta_add) {
sta->uploaded = true;
+ if (sta->airtime_weight != IEEE80211_DEFAULT_AIRTIME_WEIGHT)
+ drv_sta_set_airtime_weight(local, sdata,
+ &sta->sta,
+ sta->airtime_weight);
+ }
return 0;
}
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index 562a4964a..3ae7e78de 100644
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -2462,6 +2462,33 @@ DEFINE_EVENT(sta_flag_evt, drv_sta_set_decap_offload,
TP_ARGS(local, sdata, sta, enabled)
);
+TRACE_EVENT(drv_sta_set_airtime_weight,
+ TP_PROTO(struct ieee80211_local *local,
+ struct ieee80211_sub_if_data *sdata,
+ struct ieee80211_sta *sta, u16 weight),
+
+ TP_ARGS(local, sdata, sta, weight),
+
+ TP_STRUCT__entry(
+ LOCAL_ENTRY
+ VIF_ENTRY
+ STA_ENTRY
+ __field(u16, weight)
+ ),
+
+ TP_fast_assign(
+ LOCAL_ASSIGN;
+ VIF_ASSIGN;
+ STA_ASSIGN;
+ __entry->weight = weight;
+ ),
+
+ TP_printk(
+ LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " weight:%u",
+ LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->weight
+ )
+);
+
TRACE_EVENT(drv_add_twt_setup,
TP_PROTO(struct ieee80211_local *local,
struct ieee80211_sta *sta,
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 4/4] wifi: ath11k: support firmware airtime fairness
2026-10-03 15:55 [PATCH 0/4] wifi: ath11k: beacon protection and firmware airtime fairness Andrei-Alexandru Bleortu
` (2 preceding siblings ...)
2026-10-03 15:55 ` [PATCH 3/4] wifi: mac80211: notify driver on airtime weight changes Andrei-Alexandru Bleortu
@ 2026-10-03 15:55 ` Andrei-Alexandru Bleortu
3 siblings, 0 replies; 5+ messages in thread
From: Andrei-Alexandru Bleortu @ 2026-10-03 15:55 UTC (permalink / raw)
To: Jeff Johnson, Johannes Berg
Cc: ath11k, linux-kernel, linux-wireless, Felix Fietkau
Firmware with WMI_TLV_SERVICE_ATF schedules airtime between stations
itself, in proportion to per-station shares the host gives it in parts
per thousand. Enable it at init (resource config flag) and on each
radio, advertise NL80211_EXT_FEATURE_AIRTIME_FAIRNESS, and send the
shares of all AP stations of the radio, derived from their airtime
weights (sta_set_airtime_weight), whenever a station associates or
leaves or user space changes a weight.
The firmware schedules a station only within the share of its ATF group,
so group 0, which every station belongs to, first gets the whole radio
(WMI_ATF_SSID_GROUPING_REQUEST_CMDID, fair policy). Without the group,
the firmware passes no data at all to a station that has a share.
Both are needed: without the resource config flag the firmware takes the
shares but does not enforce them. With them, a station capped at 100/1000
under strict scheduling falls from 885 to 122 Mbit/s downlink and
recovers once uncapped, and at its full fair share it runs at full rate.
This matters most where the data path does not pass mac80211's queues,
such as NSS offload, where mac80211's own airtime scheduler never sees
the frames.
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.9.0.1-02146-QCAHKSWPL_SILICONZ-1
Assisted-by: LLM
Signed-off-by: Andrei-Alexandru Bleortu <me@andrei-z.com>
---
drivers/net/wireless/ath/ath11k/core.h | 1 +
drivers/net/wireless/ath/ath11k/mac.c | 105 +++++++++++++++++++++++++
drivers/net/wireless/ath/ath11k/wmi.c | 97 +++++++++++++++++++++++
drivers/net/wireless/ath/ath11k/wmi.h | 53 +++++++++++++
4 files changed, 256 insertions(+)
diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h
index 31eee25c0..bb5f730c8 100644
--- a/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@ -542,6 +542,7 @@ struct ath11k_per_peer_cfr_capture {
struct ath11k_sta {
struct ath11k_vif *arvif;
+ u16 airtime_weight;
/* the following are protected by ar->data_lock */
u32 changed; /* IEEE80211_RC_* */
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 57cc6dbdd..7a03c12d2 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -6732,6 +6732,16 @@ static int ath11k_mac_op_start(struct ieee80211_hw *hw)
goto err;
}
+ if (test_bit(WMI_TLV_SERVICE_ATF, ab->wmi_ab.svc_map)) {
+ ret = ath11k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_ATF_DYNAMIC_ENABLE,
+ 1, pdev->pdev_id);
+ if (ret) {
+ ath11k_err(ab, "failed to enable airtime fairness: %d\n",
+ ret);
+ goto err;
+ }
+ }
+
ret = ath11k_wmi_send_dfs_phyerr_offload_enable_cmd(ar, pdev->pdev_id);
if (ret) {
ath11k_err(ab, "failed to offload radar detection: %d\n",
@@ -9985,6 +9995,90 @@ static int ath11k_mac_station_remove(struct ath11k *ar,
return ret;
}
+#define ATH11K_ATF_PEERS_PER_CMD 32
+
+struct ath11k_mac_atf_iter {
+ struct ath11k_wmi_atf_peer_arg *peers;
+ u16 *weights;
+ u32 num, max, total;
+};
+
+static void ath11k_mac_atf_iter(void *data, struct ieee80211_sta *sta)
+{
+ struct ath11k_mac_atf_iter *it = data;
+ struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);
+
+ if (it->num == it->max || !arsta->arvif ||
+ arsta->arvif->vdev_type != WMI_VDEV_TYPE_AP)
+ return;
+
+ ether_addr_copy(it->peers[it->num].addr, sta->addr);
+ it->peers[it->num].vdev_id = arsta->arvif->vdev_id;
+ it->weights[it->num] = arsta->airtime_weight;
+ it->total += arsta->airtime_weight;
+ it->num++;
+}
+
+/* Firmware airtime fairness: give every station of the radio its share of
+ * the airtime, in proportion to its airtime weight. The firmware schedules
+ * a station only by the share of its group, so group 0 (every station's)
+ * gets the whole radio first.
+ */
+static int ath11k_mac_atf_update(struct ath11k *ar)
+{
+ struct ath11k_mac_atf_iter it = { .max = ar->max_num_stations };
+ u32 i, n;
+ int ret = 0;
+
+ lockdep_assert_held(&ar->conf_mutex);
+
+ if (!test_bit(WMI_TLV_SERVICE_ATF, ar->ab->wmi_ab.svc_map))
+ return 0;
+
+ it.peers = kcalloc(it.max, sizeof(*it.peers), GFP_KERNEL);
+ it.weights = kcalloc(it.max, sizeof(*it.weights), GFP_KERNEL);
+ if (!it.peers || !it.weights) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ ieee80211_iterate_stations_atomic(ar->hw, ath11k_mac_atf_iter, &it);
+
+ for (i = 0; i < it.num; i++)
+ it.peers[i].units = max_t(u32, 1, div_u64((u64)WMI_ATF_DENOMINATION *
+ it.weights[i], it.total));
+
+ ret = ath11k_wmi_send_atf_group(ar, 0, WMI_ATF_DENOMINATION);
+ if (ret)
+ goto out;
+
+ for (i = 0; i < it.num; i += n) {
+ n = min_t(u32, it.num - i, ATH11K_ATF_PEERS_PER_CMD);
+ ret = ath11k_wmi_send_peer_atf_request(ar, &it.peers[i], n,
+ i + n < it.num);
+ if (ret)
+ break;
+ }
+
+out:
+ kfree(it.weights);
+ kfree(it.peers);
+ return ret;
+}
+
+static void ath11k_mac_op_sta_set_airtime_weight(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif,
+ struct ieee80211_sta *sta, u16 weight)
+{
+ struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta);
+ struct ath11k *ar = hw->priv;
+
+ mutex_lock(&ar->conf_mutex);
+ arsta->airtime_weight = weight;
+ ath11k_mac_atf_update(ar);
+ mutex_unlock(&ar->conf_mutex);
+}
+
static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct ieee80211_sta *sta,
@@ -10012,6 +10106,7 @@ static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw,
new_state == IEEE80211_STA_NONE) {
memset(arsta, 0, sizeof(*arsta));
arsta->arvif = arvif;
+ arsta->airtime_weight = IEEE80211_DEFAULT_AIRTIME_WEIGHT;
arsta->peer_ps_state = WMI_PEER_PS_STATE_DISABLED;
INIT_WORK(&arsta->update_wk, ath11k_sta_rc_update_wk);
INIT_WORK(&arsta->set_4addr_wk, ath11k_sta_set_4addr_wk);
@@ -10043,6 +10138,9 @@ static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw,
mutex_unlock(&ar->ab->tbl_mtx_lock);
ath11k_cfr_decrement_peer_count(ar, arsta);
+
+ if (vif->type == NL80211_IFTYPE_AP)
+ ath11k_mac_atf_update(ar);
} else if (old_state == IEEE80211_STA_AUTH &&
new_state == IEEE80211_STA_ASSOC &&
(vif->type == NL80211_IFTYPE_AP ||
@@ -10052,6 +10150,8 @@ static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw,
if (ret)
ath11k_warn(ar->ab, "Failed to associate station: %pM\n",
sta->addr);
+ else if (vif->type == NL80211_IFTYPE_AP)
+ ath11k_mac_atf_update(ar);
spin_lock_bh(&ar->data_lock);
/* Set arsta bw and prev bw */
@@ -10143,6 +10243,7 @@ static const struct ieee80211_ops ath11k_ops = {
.sta_state = ath11k_mac_op_sta_state,
.sta_set_4addr = ath11k_mac_op_sta_set_4addr,
.sta_set_txpwr = ath11k_mac_op_sta_set_txpwr,
+ .sta_set_airtime_weight = ath11k_mac_op_sta_set_airtime_weight,
.link_sta_rc_update = ath11k_mac_op_sta_rc_update,
.conf_tx = ath11k_mac_op_conf_tx,
.set_antenna = ath11k_mac_op_set_antenna,
@@ -10684,6 +10785,10 @@ static int __ath11k_mac_register(struct ath11k *ar)
wiphy_ext_feature_set(ar->hw->wiphy,
NL80211_EXT_FEATURE_BEACON_PROTECTION);
+ if (test_bit(WMI_TLV_SERVICE_ATF, ar->ab->wmi_ab.svc_map))
+ wiphy_ext_feature_set(ar->hw->wiphy,
+ NL80211_EXT_FEATURE_AIRTIME_FAIRNESS);
+
ar->hw->wiphy->mbssid_max_interfaces = TARGET_NUM_VDEVS(ab);
ar->hw->wiphy->ema_max_profile_periodicity = TARGET_EMA_MAX_PROFILE_PERIOD;
diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 2c3e14a65..28f5d606a 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -4468,6 +4468,100 @@ int ath11k_wmi_set_hw_mode(struct ath11k_base *ab,
return 0;
}
+int ath11k_wmi_send_atf_group(struct ath11k *ar, u32 group_id, u32 units)
+{
+ struct ath11k_pdev_wmi *wmi = ar->wmi;
+ struct wmi_atf_ssid_grp_request_cmd *cmd;
+ struct wmi_atf_group_info *grp;
+ struct wmi_tlv *tlv;
+ struct sk_buff *skb;
+ int ret;
+
+ skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd) + TLV_HDR_SIZE + sizeof(*grp));
+ if (!skb)
+ return -ENOMEM;
+
+ cmd = (struct wmi_atf_ssid_grp_request_cmd *)skb->data;
+ cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ATF_SSID_GRP_REQUEST) |
+ FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);
+ cmd->pdev_id = ar->pdev->pdev_id;
+
+ tlv = (struct wmi_tlv *)(skb->data + sizeof(*cmd));
+ tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) |
+ FIELD_PREP(WMI_TLV_LEN, sizeof(*grp));
+ grp = (struct wmi_atf_group_info *)tlv->value;
+ grp->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ATF_GROUP_INFO) |
+ FIELD_PREP(WMI_TLV_LEN, sizeof(*grp) - TLV_HDR_SIZE);
+ grp->atf_group_id = group_id;
+ grp->atf_group_units = units;
+ grp->atf_group_flags = WMI_ATF_GROUP_POLICY_FAIR;
+
+ ret = ath11k_wmi_cmd_send(wmi, skb, WMI_ATF_SSID_GROUPING_REQUEST_CMDID);
+ if (ret) {
+ ath11k_warn(ar->ab, "failed to send atf group request: %d\n", ret);
+ dev_kfree_skb(skb);
+ return ret;
+ }
+
+ ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "cmd atf group %u units %u\n", group_id, units);
+
+ return 0;
+}
+
+int ath11k_wmi_send_peer_atf_request(struct ath11k *ar,
+ const struct ath11k_wmi_atf_peer_arg *peers,
+ u32 num_peers, bool more)
+{
+ struct ath11k_pdev_wmi *wmi = ar->wmi;
+ struct wmi_peer_atf_request_cmd *cmd;
+ struct wmi_atf_peer_info *info;
+ struct wmi_tlv *tlv;
+ struct sk_buff *skb;
+ u32 i, pdev_id = ar->pdev->pdev_id;
+ int ret, len;
+
+ len = sizeof(*cmd) + TLV_HDR_SIZE + num_peers * sizeof(*info);
+ skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, len);
+ if (!skb)
+ return -ENOMEM;
+
+ cmd = (struct wmi_peer_atf_request_cmd *)skb->data;
+ cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PEER_ATF_REQUEST) |
+ FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);
+ cmd->num_peers = num_peers;
+ cmd->pdev_id = pdev_id;
+ cmd->atf_flags = WMI_PEER_ATF_REQ_FLAG_FULL_UPDATE |
+ WMI_PEER_ATF_REQ_FLAG_PDEV_ID_VALID;
+ if (more)
+ cmd->atf_flags |= WMI_PEER_ATF_REQ_FLAG_PENDING_CMDS;
+
+ tlv = (struct wmi_tlv *)(skb->data + sizeof(*cmd));
+ tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) |
+ FIELD_PREP(WMI_TLV_LEN, num_peers * sizeof(*info));
+ info = (struct wmi_atf_peer_info *)tlv->value;
+
+ for (i = 0; i < num_peers; i++, info++) {
+ info->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ATF_PEER_INFO) |
+ FIELD_PREP(WMI_TLV_LEN, sizeof(*info) - TLV_HDR_SIZE);
+ ether_addr_copy(info->peer_macaddr.addr, peers[i].addr);
+ info->atf_units = peers[i].units;
+ info->vdev_id = peers[i].vdev_id;
+ info->pdev_id = pdev_id;
+ }
+
+ ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PEER_ATF_REQUEST_CMDID);
+ if (ret) {
+ ath11k_warn(ar->ab, "failed to send peer atf request: %d\n", ret);
+ dev_kfree_skb(skb);
+ return ret;
+ }
+
+ ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "cmd peer atf request pdev %u peers %u%s\n",
+ pdev_id, num_peers, more ? " (more)" : "");
+
+ return 0;
+}
+
int ath11k_wmi_cmd_init(struct ath11k_base *ab)
{
struct ath11k_wmi_base *wmi_ab = &ab->wmi_ab;
@@ -4483,6 +4577,9 @@ int ath11k_wmi_cmd_init(struct ath11k_base *ab)
ab->wmi_ab.svc_map))
config.is_reg_cc_ext_event_supported = 1;
+ if (test_bit(WMI_TLV_SERVICE_ATF, ab->wmi_ab.svc_map))
+ config.flag1 |= WMI_RSRC_CFG_FLAG1_ATF_CONFIG_ENABLE;
+
memcpy(&wmi_ab->wlan_resource_config, &config, sizeof(config));
init_param.res_cfg = &wmi_ab->wlan_resource_config;
diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index ae8b4cc08..53cce7fd7 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -212,6 +212,7 @@ enum wmi_cmd_group {
WMI_GRP_TWT = 0x3e,
WMI_GRP_MOTION_DET = 0x3f,
WMI_GRP_SPATIAL_REUSE = 0x40,
+ WMI_GRP_ATM = 0x45,
};
#define WMI_CMD_GRP(grp_id) (((grp_id) << 12) | 0x1)
@@ -2354,6 +2355,7 @@ struct wmi_init_cmd {
} __packed;
#define WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64 BIT(5)
+#define WMI_RSRC_CFG_FLAG1_ATF_CONFIG_ENABLE BIT(6)
#define WMI_RSRC_CFG_FLAG2_CALC_NEXT_DTIM_COUNT_SET BIT(9)
#define WMI_RSRC_CFG_FLAG1_ACK_RSSI BIT(18)
@@ -3631,6 +3633,53 @@ struct ath11k_wmi_p2p_noa_info {
#define WMI_BCN_TMPL_BEACON_PROTECTION_EN BIT(0)
+/* Airtime fairness: a share is in parts per thousand of the radio's airtime */
+#define WMI_ATF_DENOMINATION 1000
+#define WMI_PEER_ATF_REQ_FLAG_FULL_UPDATE BIT(0)
+#define WMI_PEER_ATF_REQ_FLAG_PENDING_CMDS BIT(1)
+#define WMI_PEER_ATF_REQ_FLAG_PDEV_ID_VALID BIT(2)
+#define WMI_ATF_GROUP_POLICY_FAIR 0
+
+#define WMI_ATF_SSID_GROUPING_REQUEST_CMDID WMI_TLV_CMD(WMI_GRP_ATM)
+/* Outside enum wmi_tlv_tag: its WMI_TAG_MAX sizes the TLV policy table. */
+#define WMI_TAG_ATF_SSID_GRP_REQUEST 0x346
+#define WMI_TAG_ATF_GROUP_INFO 0x347
+
+struct wmi_atf_ssid_grp_request_cmd {
+ u32 tlv_header;
+ u32 pdev_id;
+} __packed;
+
+struct wmi_atf_group_info {
+ u32 tlv_header;
+ u32 atf_group_id;
+ u32 atf_group_units;
+ u32 atf_group_flags;
+} __packed;
+
+struct wmi_peer_atf_request_cmd {
+ u32 tlv_header;
+ u32 num_peers;
+ u32 pdev_id;
+ u32 atf_flags;
+} __packed;
+
+struct wmi_atf_peer_info {
+ u32 tlv_header;
+ struct wmi_mac_addr peer_macaddr;
+ u32 atf_units;
+ u32 atf_groupid;
+ u32 atf_units_reserved;
+ u32 vdev_id;
+ u32 pdev_id;
+} __packed;
+
+struct ath11k_wmi_atf_peer_arg {
+ u8 addr[ETH_ALEN];
+ u32 vdev_id;
+ u32 units;
+};
+
struct wmi_bcn_tmpl_cmd {
u32 tlv_header;
u32 vdev_id;
@@ -6453,6 +6502,10 @@ int ath11k_wmi_vdev_start(struct ath11k *ar, struct wmi_vdev_start_req_arg *arg,
bool restart);
int ath11k_wmi_set_peer_param(struct ath11k *ar, const u8 *peer_addr,
u32 vdev_id, u32 param_id, u32 param_val);
+int ath11k_wmi_send_atf_group(struct ath11k *ar, u32 group_id, u32 units);
+int ath11k_wmi_send_peer_atf_request(struct ath11k *ar,
+ const struct ath11k_wmi_atf_peer_arg *peers,
+ u32 num_peers, bool more);
int ath11k_wmi_pdev_set_param(struct ath11k *ar, u32 param_id,
u32 param_value, u8 pdev_id);
int ath11k_wmi_pdev_set_ps_mode(struct ath11k *ar, int vdev_id,
^ permalink raw reply related [flat|nested] 5+ messages in thread