* [PATCH v2 1/5] wifi: mac80211: correct RX stats packet increment for multi-link
2025-02-13 17:32 [PATCH v2 0/5] wifi: mac80211/ath12k: add support to fill link statistics of multi-link station Sarika Sharma
@ 2025-02-13 17:32 ` Sarika Sharma
2025-02-13 20:17 ` Ben Greear
2025-02-13 17:32 ` [PATCH v2 2/5] wifi: ath12k: add link support for multi-link in arsta Sarika Sharma
` (3 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Sarika Sharma @ 2025-02-13 17:32 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, johannes, Sarika Sharma
Currently, RX stats packets are incremented for deflink member for
non-ML and multi-link(ML) station case. However, for ML station,
packets should be incremented based on the specific link.
Therefore, if a valid link_id is present, fetch the corresponding
link station information and increment the RX packets for that link.
For non-MLO stations, the deflink will still be used.
Signed-off-by: Sarika Sharma <quic_sarishar@quicinc.com>
---
net/mac80211/rx.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 1e28efe4203c..eb3e2d550c8f 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -231,8 +231,19 @@ static void __ieee80211_queue_skb_to_iface(struct ieee80211_sub_if_data *sdata,
skb_queue_tail(&sdata->skb_queue, skb);
wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work);
- if (sta)
- sta->deflink.rx_stats.packets++;
+ if (sta) {
+ struct link_sta_info *link_sta_info;
+
+ if (link_id >= 0) {
+ link_sta_info = rcu_dereference(sta->link[link_id]);
+ if (!link_sta_info)
+ return;
+ } else {
+ link_sta_info = &sta->deflink;
+ }
+
+ link_sta_info->rx_stats.packets++;
+ }
}
static void ieee80211_queue_skb_to_iface(struct ieee80211_sub_if_data *sdata,
--
2.34.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v2 1/5] wifi: mac80211: correct RX stats packet increment for multi-link
2025-02-13 17:32 ` [PATCH v2 1/5] wifi: mac80211: correct RX stats packet increment for multi-link Sarika Sharma
@ 2025-02-13 20:17 ` Ben Greear
2025-02-17 3:52 ` Sarika Sharma
0 siblings, 1 reply; 10+ messages in thread
From: Ben Greear @ 2025-02-13 20:17 UTC (permalink / raw)
To: Sarika Sharma, ath12k; +Cc: linux-wireless, johannes
On 2/13/25 9:32 AM, Sarika Sharma wrote:
> Currently, RX stats packets are incremented for deflink member for
> non-ML and multi-link(ML) station case. However, for ML station,
> packets should be incremented based on the specific link.
>
> Therefore, if a valid link_id is present, fetch the corresponding
> link station information and increment the RX packets for that link.
> For non-MLO stations, the deflink will still be used.
>
> Signed-off-by: Sarika Sharma <quic_sarishar@quicinc.com>
> ---
> net/mac80211/rx.c | 15 +++++++++++++--
> 1 file changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
> index 1e28efe4203c..eb3e2d550c8f 100644
> --- a/net/mac80211/rx.c
> +++ b/net/mac80211/rx.c
> @@ -231,8 +231,19 @@ static void __ieee80211_queue_skb_to_iface(struct ieee80211_sub_if_data *sdata,
>
> skb_queue_tail(&sdata->skb_queue, skb);
> wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work);
> - if (sta)
> - sta->deflink.rx_stats.packets++;
> + if (sta) {
> + struct link_sta_info *link_sta_info;
> +
> + if (link_id >= 0) {
> + link_sta_info = rcu_dereference(sta->link[link_id]);
> + if (!link_sta_info)
> + return;
I think if you cannot find the link_sta_info here, you should just use deflink
so the packet is still counted?
Thanks,
Ben
> + } else {
> + link_sta_info = &sta->deflink;
> + }
> +
> + link_sta_info->rx_stats.packets++;
> + }
> }
>
> static void ieee80211_queue_skb_to_iface(struct ieee80211_sub_if_data *sdata,
--
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc http://www.candelatech.com
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v2 1/5] wifi: mac80211: correct RX stats packet increment for multi-link
2025-02-13 20:17 ` Ben Greear
@ 2025-02-17 3:52 ` Sarika Sharma
0 siblings, 0 replies; 10+ messages in thread
From: Sarika Sharma @ 2025-02-17 3:52 UTC (permalink / raw)
To: Ben Greear, ath12k; +Cc: linux-wireless, johannes
On 2/14/2025 1:47 AM, Ben Greear wrote:
> On 2/13/25 9:32 AM, Sarika Sharma wrote:
>> Currently, RX stats packets are incremented for deflink member for
>> non-ML and multi-link(ML) station case. However, for ML station,
>> packets should be incremented based on the specific link.
>>
>> Therefore, if a valid link_id is present, fetch the corresponding
>> link station information and increment the RX packets for that link.
>> For non-MLO stations, the deflink will still be used.
>>
>> Signed-off-by: Sarika Sharma <quic_sarishar@quicinc.com>
>> ---
>> net/mac80211/rx.c | 15 +++++++++++++--
>> 1 file changed, 13 insertions(+), 2 deletions(-)
>>
>> diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
>> index 1e28efe4203c..eb3e2d550c8f 100644
>> --- a/net/mac80211/rx.c
>> +++ b/net/mac80211/rx.c
>> @@ -231,8 +231,19 @@ static void __ieee80211_queue_skb_to_iface(struct
>> ieee80211_sub_if_data *sdata,
>> skb_queue_tail(&sdata->skb_queue, skb);
>> wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work);
>> - if (sta)
>> - sta->deflink.rx_stats.packets++;
>> + if (sta) {
>> + struct link_sta_info *link_sta_info;
>> +
>> + if (link_id >= 0) {
>> + link_sta_info = rcu_dereference(sta->link[link_id]);
>> + if (!link_sta_info)
>> + return;
>
> I think if you cannot find the link_sta_info here, you should just use
> deflink
> so the packet is still counted?
>
> Thanks,
> Ben
Currently, we are consistently searching for link_sta, and if link_sta
is not found, we return. We are not utilizing deflink when the link of
link_sta is NULL. Additionally, while populating stats in station_info
structure, we are checking sta_link for link stats instead of deflink.
I believe that filling the stats in deflink is not beneficial for MLO
link-level stats.
May be Johannes can comment on this, if still required I believe this
could be taken as separate changes.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 2/5] wifi: ath12k: add link support for multi-link in arsta
2025-02-13 17:32 [PATCH v2 0/5] wifi: mac80211/ath12k: add support to fill link statistics of multi-link station Sarika Sharma
2025-02-13 17:32 ` [PATCH v2 1/5] wifi: mac80211: correct RX stats packet increment for multi-link Sarika Sharma
@ 2025-02-13 17:32 ` Sarika Sharma
2025-02-13 17:32 ` [PATCH v2 3/5] wifi: ath12k: add EHT support for TX rate Sarika Sharma
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Sarika Sharma @ 2025-02-13 17:32 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, johannes, Sarika Sharma
Currently, statistics in arsta are updated at deflink for both non-ML
and multi-link(ML) station. Link statistics are not updated for
multi-link operation(MLO).
Hence, add support to correctly obtain the link ID if the peer is ML,
fetch the arsta from the appropriate link ID, and update the
statistics in the corresponding arsta.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Signed-off-by: Sarika Sharma <quic_sarishar@quicinc.com>
---
drivers/net/wireless/ath/ath12k/dp_mon.c | 23 ++++++++++++++------
drivers/net/wireless/ath/ath12k/dp_rx.c | 9 +++++---
drivers/net/wireless/ath/ath12k/peer.h | 27 +++++++++++++++++++++++-
3 files changed, 48 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/dp_mon.c b/drivers/net/wireless/ath/ath12k/dp_mon.c
index d22800e89485..aecc4612c777 100644
--- a/drivers/net/wireless/ath/ath12k/dp_mon.c
+++ b/drivers/net/wireless/ath/ath12k/dp_mon.c
@@ -3106,7 +3106,6 @@ ath12k_dp_mon_rx_update_user_stats(struct ath12k *ar,
struct hal_rx_mon_ppdu_info *ppdu_info,
u32 uid)
{
- struct ath12k_sta *ahsta;
struct ath12k_link_sta *arsta;
struct ath12k_rx_peer_stats *rx_stats = NULL;
struct hal_rx_user_status *user_stats = &ppdu_info->userstats[uid];
@@ -3124,10 +3123,14 @@ ath12k_dp_mon_rx_update_user_stats(struct ath12k *ar,
return;
}
- ahsta = ath12k_sta_to_ahsta(peer->sta);
- arsta = &ahsta->deflink;
- rx_stats = arsta->rx_stats;
+ arsta = ath12k_peer_get_link_sta(ar->ab, peer);
+ if (!arsta) {
+ ath12k_warn(ar->ab, "link sta not found on peer %pM id %d\n",
+ peer->addr, peer->peer_id);
+ return;
+ }
+ rx_stats = arsta->rx_stats;
if (!rx_stats)
return;
@@ -3240,7 +3243,6 @@ int ath12k_dp_mon_srng_process(struct ath12k *ar, int *budget,
struct dp_srng *mon_dst_ring;
struct hal_srng *srng;
struct dp_rxdma_mon_ring *buf_ring;
- struct ath12k_sta *ahsta = NULL;
struct ath12k_link_sta *arsta;
struct ath12k_peer *peer;
struct sk_buff_head skb_list;
@@ -3367,8 +3369,15 @@ int ath12k_dp_mon_srng_process(struct ath12k *ar, int *budget,
}
if (ppdu_info->reception_type == HAL_RX_RECEPTION_TYPE_SU) {
- ahsta = ath12k_sta_to_ahsta(peer->sta);
- arsta = &ahsta->deflink;
+ arsta = ath12k_peer_get_link_sta(ar->ab, peer);
+ if (!arsta) {
+ ath12k_warn(ar->ab, "link sta not found on peer %pM id %d\n",
+ peer->addr, peer->peer_id);
+ spin_unlock_bh(&ab->base_lock);
+ rcu_read_unlock();
+ dev_kfree_skb_any(skb);
+ continue;
+ }
ath12k_dp_mon_rx_update_peer_su_stats(ar, arsta,
ppdu_info);
} else if ((ppdu_info->fc_valid) &&
diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.c b/drivers/net/wireless/ath/ath12k/dp_rx.c
index 95c9056642cf..1fa7cf044afe 100644
--- a/drivers/net/wireless/ath/ath12k/dp_rx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_rx.c
@@ -1362,7 +1362,6 @@ ath12k_update_per_peer_tx_stats(struct ath12k *ar,
struct ath12k_base *ab = ar->ab;
struct ath12k_peer *peer;
struct ieee80211_sta *sta;
- struct ath12k_sta *ahsta;
struct ath12k_link_sta *arsta;
struct htt_ppdu_stats_user_rate *user_rate;
struct ath12k_per_peer_tx_stats *peer_stats = &ar->peer_tx_stats;
@@ -1444,8 +1443,12 @@ ath12k_update_per_peer_tx_stats(struct ath12k *ar,
}
sta = peer->sta;
- ahsta = ath12k_sta_to_ahsta(sta);
- arsta = &ahsta->deflink;
+ arsta = ath12k_peer_get_link_sta(ab, peer);
+ if (!arsta) {
+ spin_unlock_bh(&ab->base_lock);
+ rcu_read_unlock();
+ return;
+ }
memset(&arsta->txrate, 0, sizeof(arsta->txrate));
diff --git a/drivers/net/wireless/ath/ath12k/peer.h b/drivers/net/wireless/ath/ath12k/peer.h
index 5870ee11a8c7..7474053f54b0 100644
--- a/drivers/net/wireless/ath/ath12k/peer.h
+++ b/drivers/net/wireless/ath/ath12k/peer.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: BSD-3-Clause-Clear */
/*
* Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#ifndef ATH12K_PEER_H
@@ -90,5 +90,30 @@ struct ath12k_peer *ath12k_peer_find_by_ast(struct ath12k_base *ab, int ast_hash
int ath12k_peer_ml_create(struct ath12k_hw *ah, struct ieee80211_sta *sta);
int ath12k_peer_ml_delete(struct ath12k_hw *ah, struct ieee80211_sta *sta);
int ath12k_peer_mlo_link_peers_delete(struct ath12k_vif *ahvif, struct ath12k_sta *ahsta);
+static inline
+struct ath12k_link_sta *ath12k_peer_get_link_sta(struct ath12k_base *ab,
+ struct ath12k_peer *peer)
+{
+ struct ath12k_sta *ahsta;
+ struct ath12k_link_sta *arsta;
+
+ if (!peer->sta)
+ return NULL;
+
+ ahsta = ath12k_sta_to_ahsta(peer->sta);
+ if (peer->ml_id & ATH12K_PEER_ML_ID_VALID) {
+ if (!(ahsta->links_map & BIT(peer->link_id))) {
+ ath12k_warn(ab, "peer %pM id %d link_id %d can't found in STA link_map 0x%x\n",
+ peer->addr, peer->peer_id, peer->link_id, ahsta->links_map);
+ return NULL;
+ }
+ arsta = rcu_dereference(ahsta->link[peer->link_id]);
+ if (!arsta)
+ return NULL;
+ } else {
+ arsta = &ahsta->deflink;
+ }
+ return arsta;
+}
#endif /* _PEER_H_ */
--
2.34.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 3/5] wifi: ath12k: add EHT support for TX rate
2025-02-13 17:32 [PATCH v2 0/5] wifi: mac80211/ath12k: add support to fill link statistics of multi-link station Sarika Sharma
2025-02-13 17:32 ` [PATCH v2 1/5] wifi: mac80211: correct RX stats packet increment for multi-link Sarika Sharma
2025-02-13 17:32 ` [PATCH v2 2/5] wifi: ath12k: add link support for multi-link in arsta Sarika Sharma
@ 2025-02-13 17:32 ` Sarika Sharma
2025-02-22 14:23 ` kernel test robot
2025-02-23 2:27 ` kernel test robot
2025-02-13 17:32 ` [PATCH v2 4/5] wifi: ath12k: correctly update bw for ofdma packets Sarika Sharma
2025-02-13 17:32 ` [PATCH v2 5/5] wifi: ath12k: fetch tx_retry and tx_failed from htt_ppdu_stats_user_cmpltn_common_tlv Sarika Sharma
4 siblings, 2 replies; 10+ messages in thread
From: Sarika Sharma @ 2025-02-13 17:32 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, johannes, Sarika Sharma
Currently, TX rates are not supported for EHT. Hence, add EHT
handling for TX rates and update the EHT-specific fields in arsta
accordingly.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Signed-off-by: Sarika Sharma <quic_sarishar@quicinc.com>
---
drivers/net/wireless/ath/ath12k/dp_rx.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.c b/drivers/net/wireless/ath/ath12k/dp_rx.c
index 1fa7cf044afe..5dab13b0787d 100644
--- a/drivers/net/wireless/ath/ath12k/dp_rx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_rx.c
@@ -1481,6 +1481,16 @@ ath12k_update_per_peer_tx_stats(struct ath12k *ar,
v = ath12k_he_ru_tones_to_nl80211_he_ru_alloc(tones);
arsta->txrate.he_ru_alloc = v;
break;
+ case WMI_RATE_PREAMBLE_EHT:
+ arsta->txrate.mcs = mcs;
+ arsta->txrate.flags = RATE_INFO_FLAGS_EHT_MCS;
+ arsta->txrate.he_dcm = dcm;
+ arsta->txrate.eht_gi = ath12k_eht_gi_to_nl80211_eht_gi(sgi);
+ tones = le16_to_cpu(user_rate->ru_end) -
+ le16_to_cpu(user_rate->ru_start) + 1;
+ v = ath12k_mac_eht_ru_tones_to_nl80211_eht_ru_alloc(tones);
+ arsta->txrate.eht_ru_alloc = v;
+ break;
}
arsta->txrate.nss = nss;
--
2.34.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2 3/5] wifi: ath12k: add EHT support for TX rate
2025-02-13 17:32 ` [PATCH v2 3/5] wifi: ath12k: add EHT support for TX rate Sarika Sharma
@ 2025-02-22 14:23 ` kernel test robot
2025-02-23 2:27 ` kernel test robot
1 sibling, 0 replies; 10+ messages in thread
From: kernel test robot @ 2025-02-22 14:23 UTC (permalink / raw)
To: Sarika Sharma, ath12k
Cc: oe-kbuild-all, linux-wireless, johannes, Sarika Sharma
Hi Sarika,
kernel test robot noticed the following build errors:
[auto build test ERROR on 704a2d7237043317ed1b0f8a08203e9ddde70097]
url: https://github.com/intel-lab-lkp/linux/commits/Sarika-Sharma/wifi-mac80211-correct-RX-stats-packet-increment-for-multi-link/20250214-014020
base: 704a2d7237043317ed1b0f8a08203e9ddde70097
patch link: https://lore.kernel.org/r/20250213173206.1665731-4-quic_sarishar%40quicinc.com
patch subject: [PATCH v2 3/5] wifi: ath12k: add EHT support for TX rate
config: powerpc-allmodconfig (https://download.01.org/0day-ci/archive/20250222/202502222240.pXNQqv36-lkp@intel.com/config)
compiler: powerpc64-linux-gcc (GCC) 14.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250222/202502222240.pXNQqv36-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202502222240.pXNQqv36-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/net/wireless/ath/ath12k/dp_rx.c: In function 'ath12k_update_per_peer_tx_stats':
>> drivers/net/wireless/ath/ath12k/dp_rx.c:1488:40: error: implicit declaration of function 'ath12k_eht_gi_to_nl80211_eht_gi'; did you mean 'ath12k_he_gi_to_nl80211_he_gi'? [-Wimplicit-function-declaration]
1488 | arsta->txrate.eht_gi = ath12k_eht_gi_to_nl80211_eht_gi(sgi);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| ath12k_he_gi_to_nl80211_he_gi
drivers/net/wireless/ath/ath12k/dp_rx.c:1364:31: warning: variable 'sta' set but not used [-Wunused-but-set-variable]
1364 | struct ieee80211_sta *sta;
| ^~~
vim +1488 drivers/net/wireless/ath/ath12k/dp_rx.c
1357
1358 static void
1359 ath12k_update_per_peer_tx_stats(struct ath12k *ar,
1360 struct htt_ppdu_stats *ppdu_stats, u8 user)
1361 {
1362 struct ath12k_base *ab = ar->ab;
1363 struct ath12k_peer *peer;
1364 struct ieee80211_sta *sta;
1365 struct ath12k_link_sta *arsta;
1366 struct htt_ppdu_stats_user_rate *user_rate;
1367 struct ath12k_per_peer_tx_stats *peer_stats = &ar->peer_tx_stats;
1368 struct htt_ppdu_user_stats *usr_stats = &ppdu_stats->user_stats[user];
1369 struct htt_ppdu_stats_common *common = &ppdu_stats->common;
1370 int ret;
1371 u8 flags, mcs, nss, bw, sgi, dcm, rate_idx = 0;
1372 u32 v, succ_bytes = 0;
1373 u16 tones, rate = 0, succ_pkts = 0;
1374 u32 tx_duration = 0;
1375 u8 tid = HTT_PPDU_STATS_NON_QOS_TID;
1376 bool is_ampdu = false;
1377
1378 if (!(usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_RATE)))
1379 return;
1380
1381 if (usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_COMMON))
1382 is_ampdu =
1383 HTT_USR_CMPLTN_IS_AMPDU(usr_stats->cmpltn_cmn.flags);
1384
1385 if (usr_stats->tlv_flags &
1386 BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_ACK_BA_STATUS)) {
1387 succ_bytes = le32_to_cpu(usr_stats->ack_ba.success_bytes);
1388 succ_pkts = le32_get_bits(usr_stats->ack_ba.info,
1389 HTT_PPDU_STATS_ACK_BA_INFO_NUM_MSDU_M);
1390 tid = le32_get_bits(usr_stats->ack_ba.info,
1391 HTT_PPDU_STATS_ACK_BA_INFO_TID_NUM);
1392 }
1393
1394 if (common->fes_duration_us)
1395 tx_duration = le32_to_cpu(common->fes_duration_us);
1396
1397 user_rate = &usr_stats->rate;
1398 flags = HTT_USR_RATE_PREAMBLE(user_rate->rate_flags);
1399 bw = HTT_USR_RATE_BW(user_rate->rate_flags) - 2;
1400 nss = HTT_USR_RATE_NSS(user_rate->rate_flags) + 1;
1401 mcs = HTT_USR_RATE_MCS(user_rate->rate_flags);
1402 sgi = HTT_USR_RATE_GI(user_rate->rate_flags);
1403 dcm = HTT_USR_RATE_DCM(user_rate->rate_flags);
1404
1405 /* Note: If host configured fixed rates and in some other special
1406 * cases, the broadcast/management frames are sent in different rates.
1407 * Firmware rate's control to be skipped for this?
1408 */
1409
1410 if (flags == WMI_RATE_PREAMBLE_HE && mcs > ATH12K_HE_MCS_MAX) {
1411 ath12k_warn(ab, "Invalid HE mcs %d peer stats", mcs);
1412 return;
1413 }
1414
1415 if (flags == WMI_RATE_PREAMBLE_VHT && mcs > ATH12K_VHT_MCS_MAX) {
1416 ath12k_warn(ab, "Invalid VHT mcs %d peer stats", mcs);
1417 return;
1418 }
1419
1420 if (flags == WMI_RATE_PREAMBLE_HT && (mcs > ATH12K_HT_MCS_MAX || nss < 1)) {
1421 ath12k_warn(ab, "Invalid HT mcs %d nss %d peer stats",
1422 mcs, nss);
1423 return;
1424 }
1425
1426 if (flags == WMI_RATE_PREAMBLE_CCK || flags == WMI_RATE_PREAMBLE_OFDM) {
1427 ret = ath12k_mac_hw_ratecode_to_legacy_rate(mcs,
1428 flags,
1429 &rate_idx,
1430 &rate);
1431 if (ret < 0)
1432 return;
1433 }
1434
1435 rcu_read_lock();
1436 spin_lock_bh(&ab->base_lock);
1437 peer = ath12k_peer_find_by_id(ab, usr_stats->peer_id);
1438
1439 if (!peer || !peer->sta) {
1440 spin_unlock_bh(&ab->base_lock);
1441 rcu_read_unlock();
1442 return;
1443 }
1444
1445 sta = peer->sta;
1446 arsta = ath12k_peer_get_link_sta(ab, peer);
1447 if (!arsta) {
1448 spin_unlock_bh(&ab->base_lock);
1449 rcu_read_unlock();
1450 return;
1451 }
1452
1453 memset(&arsta->txrate, 0, sizeof(arsta->txrate));
1454
1455 switch (flags) {
1456 case WMI_RATE_PREAMBLE_OFDM:
1457 arsta->txrate.legacy = rate;
1458 break;
1459 case WMI_RATE_PREAMBLE_CCK:
1460 arsta->txrate.legacy = rate;
1461 break;
1462 case WMI_RATE_PREAMBLE_HT:
1463 arsta->txrate.mcs = mcs + 8 * (nss - 1);
1464 arsta->txrate.flags = RATE_INFO_FLAGS_MCS;
1465 if (sgi)
1466 arsta->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
1467 break;
1468 case WMI_RATE_PREAMBLE_VHT:
1469 arsta->txrate.mcs = mcs;
1470 arsta->txrate.flags = RATE_INFO_FLAGS_VHT_MCS;
1471 if (sgi)
1472 arsta->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
1473 break;
1474 case WMI_RATE_PREAMBLE_HE:
1475 arsta->txrate.mcs = mcs;
1476 arsta->txrate.flags = RATE_INFO_FLAGS_HE_MCS;
1477 arsta->txrate.he_dcm = dcm;
1478 arsta->txrate.he_gi = ath12k_he_gi_to_nl80211_he_gi(sgi);
1479 tones = le16_to_cpu(user_rate->ru_end) -
1480 le16_to_cpu(user_rate->ru_start) + 1;
1481 v = ath12k_he_ru_tones_to_nl80211_he_ru_alloc(tones);
1482 arsta->txrate.he_ru_alloc = v;
1483 break;
1484 case WMI_RATE_PREAMBLE_EHT:
1485 arsta->txrate.mcs = mcs;
1486 arsta->txrate.flags = RATE_INFO_FLAGS_EHT_MCS;
1487 arsta->txrate.he_dcm = dcm;
> 1488 arsta->txrate.eht_gi = ath12k_eht_gi_to_nl80211_eht_gi(sgi);
1489 tones = le16_to_cpu(user_rate->ru_end) -
1490 le16_to_cpu(user_rate->ru_start) + 1;
1491 v = ath12k_mac_eht_ru_tones_to_nl80211_eht_ru_alloc(tones);
1492 arsta->txrate.eht_ru_alloc = v;
1493 break;
1494 }
1495
1496 arsta->txrate.nss = nss;
1497 arsta->txrate.bw = ath12k_mac_bw_to_mac80211_bw(bw);
1498 arsta->tx_duration += tx_duration;
1499 memcpy(&arsta->last_txrate, &arsta->txrate, sizeof(struct rate_info));
1500
1501 /* PPDU stats reported for mgmt packet doesn't have valid tx bytes.
1502 * So skip peer stats update for mgmt packets.
1503 */
1504 if (tid < HTT_PPDU_STATS_NON_QOS_TID) {
1505 memset(peer_stats, 0, sizeof(*peer_stats));
1506 peer_stats->succ_pkts = succ_pkts;
1507 peer_stats->succ_bytes = succ_bytes;
1508 peer_stats->is_ampdu = is_ampdu;
1509 peer_stats->duration = tx_duration;
1510 peer_stats->ba_fails =
1511 HTT_USR_CMPLTN_LONG_RETRY(usr_stats->cmpltn_cmn.flags) +
1512 HTT_USR_CMPLTN_SHORT_RETRY(usr_stats->cmpltn_cmn.flags);
1513 }
1514
1515 spin_unlock_bh(&ab->base_lock);
1516 rcu_read_unlock();
1517 }
1518
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v2 3/5] wifi: ath12k: add EHT support for TX rate
2025-02-13 17:32 ` [PATCH v2 3/5] wifi: ath12k: add EHT support for TX rate Sarika Sharma
2025-02-22 14:23 ` kernel test robot
@ 2025-02-23 2:27 ` kernel test robot
1 sibling, 0 replies; 10+ messages in thread
From: kernel test robot @ 2025-02-23 2:27 UTC (permalink / raw)
To: Sarika Sharma, ath12k
Cc: llvm, oe-kbuild-all, linux-wireless, johannes, Sarika Sharma
Hi Sarika,
kernel test robot noticed the following build errors:
[auto build test ERROR on 704a2d7237043317ed1b0f8a08203e9ddde70097]
url: https://github.com/intel-lab-lkp/linux/commits/Sarika-Sharma/wifi-mac80211-correct-RX-stats-packet-increment-for-multi-link/20250214-014020
base: 704a2d7237043317ed1b0f8a08203e9ddde70097
patch link: https://lore.kernel.org/r/20250213173206.1665731-4-quic_sarishar%40quicinc.com
patch subject: [PATCH v2 3/5] wifi: ath12k: add EHT support for TX rate
config: powerpc-allyesconfig (https://download.01.org/0day-ci/archive/20250223/202502231023.vzEGxJWz-lkp@intel.com/config)
compiler: clang version 16.0.6 (https://github.com/llvm/llvm-project 7cbf1a2591520c2491aa35339f227775f4d3adf6)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250223/202502231023.vzEGxJWz-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202502231023.vzEGxJWz-lkp@intel.com/
All errors (new ones prefixed by >>):
>> drivers/net/wireless/ath/ath12k/dp_rx.c:1488:26: error: call to undeclared function 'ath12k_eht_gi_to_nl80211_eht_gi'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
arsta->txrate.eht_gi = ath12k_eht_gi_to_nl80211_eht_gi(sgi);
^
drivers/net/wireless/ath/ath12k/dp_rx.c:1364:24: warning: variable 'sta' set but not used [-Wunused-but-set-variable]
struct ieee80211_sta *sta;
^
1 warning and 1 error generated.
vim +/ath12k_eht_gi_to_nl80211_eht_gi +1488 drivers/net/wireless/ath/ath12k/dp_rx.c
1357
1358 static void
1359 ath12k_update_per_peer_tx_stats(struct ath12k *ar,
1360 struct htt_ppdu_stats *ppdu_stats, u8 user)
1361 {
1362 struct ath12k_base *ab = ar->ab;
1363 struct ath12k_peer *peer;
1364 struct ieee80211_sta *sta;
1365 struct ath12k_link_sta *arsta;
1366 struct htt_ppdu_stats_user_rate *user_rate;
1367 struct ath12k_per_peer_tx_stats *peer_stats = &ar->peer_tx_stats;
1368 struct htt_ppdu_user_stats *usr_stats = &ppdu_stats->user_stats[user];
1369 struct htt_ppdu_stats_common *common = &ppdu_stats->common;
1370 int ret;
1371 u8 flags, mcs, nss, bw, sgi, dcm, rate_idx = 0;
1372 u32 v, succ_bytes = 0;
1373 u16 tones, rate = 0, succ_pkts = 0;
1374 u32 tx_duration = 0;
1375 u8 tid = HTT_PPDU_STATS_NON_QOS_TID;
1376 bool is_ampdu = false;
1377
1378 if (!(usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_RATE)))
1379 return;
1380
1381 if (usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_COMMON))
1382 is_ampdu =
1383 HTT_USR_CMPLTN_IS_AMPDU(usr_stats->cmpltn_cmn.flags);
1384
1385 if (usr_stats->tlv_flags &
1386 BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_ACK_BA_STATUS)) {
1387 succ_bytes = le32_to_cpu(usr_stats->ack_ba.success_bytes);
1388 succ_pkts = le32_get_bits(usr_stats->ack_ba.info,
1389 HTT_PPDU_STATS_ACK_BA_INFO_NUM_MSDU_M);
1390 tid = le32_get_bits(usr_stats->ack_ba.info,
1391 HTT_PPDU_STATS_ACK_BA_INFO_TID_NUM);
1392 }
1393
1394 if (common->fes_duration_us)
1395 tx_duration = le32_to_cpu(common->fes_duration_us);
1396
1397 user_rate = &usr_stats->rate;
1398 flags = HTT_USR_RATE_PREAMBLE(user_rate->rate_flags);
1399 bw = HTT_USR_RATE_BW(user_rate->rate_flags) - 2;
1400 nss = HTT_USR_RATE_NSS(user_rate->rate_flags) + 1;
1401 mcs = HTT_USR_RATE_MCS(user_rate->rate_flags);
1402 sgi = HTT_USR_RATE_GI(user_rate->rate_flags);
1403 dcm = HTT_USR_RATE_DCM(user_rate->rate_flags);
1404
1405 /* Note: If host configured fixed rates and in some other special
1406 * cases, the broadcast/management frames are sent in different rates.
1407 * Firmware rate's control to be skipped for this?
1408 */
1409
1410 if (flags == WMI_RATE_PREAMBLE_HE && mcs > ATH12K_HE_MCS_MAX) {
1411 ath12k_warn(ab, "Invalid HE mcs %d peer stats", mcs);
1412 return;
1413 }
1414
1415 if (flags == WMI_RATE_PREAMBLE_VHT && mcs > ATH12K_VHT_MCS_MAX) {
1416 ath12k_warn(ab, "Invalid VHT mcs %d peer stats", mcs);
1417 return;
1418 }
1419
1420 if (flags == WMI_RATE_PREAMBLE_HT && (mcs > ATH12K_HT_MCS_MAX || nss < 1)) {
1421 ath12k_warn(ab, "Invalid HT mcs %d nss %d peer stats",
1422 mcs, nss);
1423 return;
1424 }
1425
1426 if (flags == WMI_RATE_PREAMBLE_CCK || flags == WMI_RATE_PREAMBLE_OFDM) {
1427 ret = ath12k_mac_hw_ratecode_to_legacy_rate(mcs,
1428 flags,
1429 &rate_idx,
1430 &rate);
1431 if (ret < 0)
1432 return;
1433 }
1434
1435 rcu_read_lock();
1436 spin_lock_bh(&ab->base_lock);
1437 peer = ath12k_peer_find_by_id(ab, usr_stats->peer_id);
1438
1439 if (!peer || !peer->sta) {
1440 spin_unlock_bh(&ab->base_lock);
1441 rcu_read_unlock();
1442 return;
1443 }
1444
1445 sta = peer->sta;
1446 arsta = ath12k_peer_get_link_sta(ab, peer);
1447 if (!arsta) {
1448 spin_unlock_bh(&ab->base_lock);
1449 rcu_read_unlock();
1450 return;
1451 }
1452
1453 memset(&arsta->txrate, 0, sizeof(arsta->txrate));
1454
1455 switch (flags) {
1456 case WMI_RATE_PREAMBLE_OFDM:
1457 arsta->txrate.legacy = rate;
1458 break;
1459 case WMI_RATE_PREAMBLE_CCK:
1460 arsta->txrate.legacy = rate;
1461 break;
1462 case WMI_RATE_PREAMBLE_HT:
1463 arsta->txrate.mcs = mcs + 8 * (nss - 1);
1464 arsta->txrate.flags = RATE_INFO_FLAGS_MCS;
1465 if (sgi)
1466 arsta->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
1467 break;
1468 case WMI_RATE_PREAMBLE_VHT:
1469 arsta->txrate.mcs = mcs;
1470 arsta->txrate.flags = RATE_INFO_FLAGS_VHT_MCS;
1471 if (sgi)
1472 arsta->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
1473 break;
1474 case WMI_RATE_PREAMBLE_HE:
1475 arsta->txrate.mcs = mcs;
1476 arsta->txrate.flags = RATE_INFO_FLAGS_HE_MCS;
1477 arsta->txrate.he_dcm = dcm;
1478 arsta->txrate.he_gi = ath12k_he_gi_to_nl80211_he_gi(sgi);
1479 tones = le16_to_cpu(user_rate->ru_end) -
1480 le16_to_cpu(user_rate->ru_start) + 1;
1481 v = ath12k_he_ru_tones_to_nl80211_he_ru_alloc(tones);
1482 arsta->txrate.he_ru_alloc = v;
1483 break;
1484 case WMI_RATE_PREAMBLE_EHT:
1485 arsta->txrate.mcs = mcs;
1486 arsta->txrate.flags = RATE_INFO_FLAGS_EHT_MCS;
1487 arsta->txrate.he_dcm = dcm;
> 1488 arsta->txrate.eht_gi = ath12k_eht_gi_to_nl80211_eht_gi(sgi);
1489 tones = le16_to_cpu(user_rate->ru_end) -
1490 le16_to_cpu(user_rate->ru_start) + 1;
1491 v = ath12k_mac_eht_ru_tones_to_nl80211_eht_ru_alloc(tones);
1492 arsta->txrate.eht_ru_alloc = v;
1493 break;
1494 }
1495
1496 arsta->txrate.nss = nss;
1497 arsta->txrate.bw = ath12k_mac_bw_to_mac80211_bw(bw);
1498 arsta->tx_duration += tx_duration;
1499 memcpy(&arsta->last_txrate, &arsta->txrate, sizeof(struct rate_info));
1500
1501 /* PPDU stats reported for mgmt packet doesn't have valid tx bytes.
1502 * So skip peer stats update for mgmt packets.
1503 */
1504 if (tid < HTT_PPDU_STATS_NON_QOS_TID) {
1505 memset(peer_stats, 0, sizeof(*peer_stats));
1506 peer_stats->succ_pkts = succ_pkts;
1507 peer_stats->succ_bytes = succ_bytes;
1508 peer_stats->is_ampdu = is_ampdu;
1509 peer_stats->duration = tx_duration;
1510 peer_stats->ba_fails =
1511 HTT_USR_CMPLTN_LONG_RETRY(usr_stats->cmpltn_cmn.flags) +
1512 HTT_USR_CMPLTN_SHORT_RETRY(usr_stats->cmpltn_cmn.flags);
1513 }
1514
1515 spin_unlock_bh(&ab->base_lock);
1516 rcu_read_unlock();
1517 }
1518
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 4/5] wifi: ath12k: correctly update bw for ofdma packets
2025-02-13 17:32 [PATCH v2 0/5] wifi: mac80211/ath12k: add support to fill link statistics of multi-link station Sarika Sharma
` (2 preceding siblings ...)
2025-02-13 17:32 ` [PATCH v2 3/5] wifi: ath12k: add EHT support for TX rate Sarika Sharma
@ 2025-02-13 17:32 ` Sarika Sharma
2025-02-13 17:32 ` [PATCH v2 5/5] wifi: ath12k: fetch tx_retry and tx_failed from htt_ppdu_stats_user_cmpltn_common_tlv Sarika Sharma
4 siblings, 0 replies; 10+ messages in thread
From: Sarika Sharma @ 2025-02-13 17:32 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, johannes, Sarika Sharma
Currently, arsta->txrate.bw is filled from ath12k_mac_bw_to_mac80211_bw(bw)
during ath12k_update_per_peer_tx_stats(). But in tx_completion path bw
is filled differently if ppdu_type is ofdma for HE/EHT rates.
Hence, update arsta->txrate.bw correctly if packet is ofdma for HE
and EHT rate.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Signed-off-by: Sarika Sharma <quic_sarishar@quicinc.com>
---
drivers/net/wireless/ath/ath12k/dp.h | 2 ++
drivers/net/wireless/ath/ath12k/dp_rx.c | 15 ++++++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/dp.h b/drivers/net/wireless/ath/ath12k/dp.h
index 75435a931548..3ddbf781c2b5 100644
--- a/drivers/net/wireless/ath/ath12k/dp.h
+++ b/drivers/net/wireless/ath/ath12k/dp.h
@@ -1508,6 +1508,8 @@ enum HTT_PPDU_STATS_PPDU_TYPE {
#define HTT_PPDU_STATS_USER_RATE_FLAGS_DCM_M BIT(28)
#define HTT_PPDU_STATS_USER_RATE_FLAGS_LDPC_M BIT(29)
+#define HTT_USR_RATE_PPDU_TYPE(_val) \
+ le32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_INFO1_PPDU_TYPE_M)
#define HTT_USR_RATE_PREAMBLE(_val) \
le32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_FLAGS_PREAMBLE_M)
#define HTT_USR_RATE_BW(_val) \
diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.c b/drivers/net/wireless/ath/ath12k/dp_rx.c
index 5dab13b0787d..35b9aafca642 100644
--- a/drivers/net/wireless/ath/ath12k/dp_rx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_rx.c
@@ -1368,12 +1368,12 @@ ath12k_update_per_peer_tx_stats(struct ath12k *ar,
struct htt_ppdu_user_stats *usr_stats = &ppdu_stats->user_stats[user];
struct htt_ppdu_stats_common *common = &ppdu_stats->common;
int ret;
- u8 flags, mcs, nss, bw, sgi, dcm, rate_idx = 0;
+ u8 flags, mcs, nss, bw, sgi, dcm, ppdu_type, rate_idx = 0;
u32 v, succ_bytes = 0;
u16 tones, rate = 0, succ_pkts = 0;
u32 tx_duration = 0;
u8 tid = HTT_PPDU_STATS_NON_QOS_TID;
- bool is_ampdu = false;
+ bool is_ampdu = false, is_ofdma = false;
if (!(usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_RATE)))
return;
@@ -1402,6 +1402,10 @@ ath12k_update_per_peer_tx_stats(struct ath12k *ar,
sgi = HTT_USR_RATE_GI(user_rate->rate_flags);
dcm = HTT_USR_RATE_DCM(user_rate->rate_flags);
+ ppdu_type = HTT_USR_RATE_PPDU_TYPE(user_rate->info1);
+ is_ofdma = (ppdu_type == HTT_PPDU_STATS_PPDU_TYPE_MU_OFDMA) ||
+ (ppdu_type == HTT_PPDU_STATS_PPDU_TYPE_MU_MIMO_OFDMA);
+
/* Note: If host configured fixed rates and in some other special
* cases, the broadcast/management frames are sent in different rates.
* Firmware rate's control to be skipped for this?
@@ -1452,6 +1456,8 @@ ath12k_update_per_peer_tx_stats(struct ath12k *ar,
memset(&arsta->txrate, 0, sizeof(arsta->txrate));
+ arsta->txrate.bw = ath12k_mac_bw_to_mac80211_bw(bw);
+
switch (flags) {
case WMI_RATE_PREAMBLE_OFDM:
arsta->txrate.legacy = rate;
@@ -1480,6 +1486,8 @@ ath12k_update_per_peer_tx_stats(struct ath12k *ar,
le16_to_cpu(user_rate->ru_start) + 1;
v = ath12k_he_ru_tones_to_nl80211_he_ru_alloc(tones);
arsta->txrate.he_ru_alloc = v;
+ if (is_ofdma)
+ arsta->txrate.bw = RATE_INFO_BW_HE_RU;
break;
case WMI_RATE_PREAMBLE_EHT:
arsta->txrate.mcs = mcs;
@@ -1490,11 +1498,12 @@ ath12k_update_per_peer_tx_stats(struct ath12k *ar,
le16_to_cpu(user_rate->ru_start) + 1;
v = ath12k_mac_eht_ru_tones_to_nl80211_eht_ru_alloc(tones);
arsta->txrate.eht_ru_alloc = v;
+ if (is_ofdma)
+ arsta->txrate.bw = RATE_INFO_BW_EHT_RU;
break;
}
arsta->txrate.nss = nss;
- arsta->txrate.bw = ath12k_mac_bw_to_mac80211_bw(bw);
arsta->tx_duration += tx_duration;
memcpy(&arsta->last_txrate, &arsta->txrate, sizeof(struct rate_info));
--
2.34.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 5/5] wifi: ath12k: fetch tx_retry and tx_failed from htt_ppdu_stats_user_cmpltn_common_tlv
2025-02-13 17:32 [PATCH v2 0/5] wifi: mac80211/ath12k: add support to fill link statistics of multi-link station Sarika Sharma
` (3 preceding siblings ...)
2025-02-13 17:32 ` [PATCH v2 4/5] wifi: ath12k: correctly update bw for ofdma packets Sarika Sharma
@ 2025-02-13 17:32 ` Sarika Sharma
4 siblings, 0 replies; 10+ messages in thread
From: Sarika Sharma @ 2025-02-13 17:32 UTC (permalink / raw)
To: ath12k; +Cc: linux-wireless, johannes, Sarika Sharma
Currently, tx_retries and tx_failed are updated only in mac80211 during
tx_completion path for sta->deflink. This works fine for non-ML
station but for multi-link (ML) station, these values should be updated
for sta->link[link_id] as per tx link_id. However, in tx_completion path
there is no way to determine the link_id for which packet is retried or
failed.
Therefore, update the tx_retries and tx_failed in arsta structure from
htt_ppdu_stats_user_cmpltn_common_tlv during
ath12k_update_per_peer_tx_stats() call to utilize the values from arsta.
Also, during 'iw dev xxxx station dump' populate the tx_retries and
tx_failed in station_info structure to ensure values are correctly
reflected.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Signed-off-by: Sarika Sharma <quic_sarishar@quicinc.com>
---
drivers/net/wireless/ath/ath12k/core.h | 2 ++
drivers/net/wireless/ath/ath12k/dp_rx.c | 11 ++++++++++-
drivers/net/wireless/ath/ath12k/mac.c | 5 +++++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
index 3fac4f00d383..8050dd70f077 100644
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -517,6 +517,8 @@ struct ath12k_link_sta {
/* for firmware use only */
u8 link_idx;
+ u32 tx_retry_failed;
+ u32 tx_retry_count;
};
struct ath12k_sta {
diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.c b/drivers/net/wireless/ath/ath12k/dp_rx.c
index 35b9aafca642..a5117965ea5a 100644
--- a/drivers/net/wireless/ath/ath12k/dp_rx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_rx.c
@@ -1374,13 +1374,20 @@ ath12k_update_per_peer_tx_stats(struct ath12k *ar,
u32 tx_duration = 0;
u8 tid = HTT_PPDU_STATS_NON_QOS_TID;
bool is_ampdu = false, is_ofdma = false;
+ u16 tx_retry_failed = 0, tx_retry_count = 0;
if (!(usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_RATE)))
return;
- if (usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_COMMON))
+ if (usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_COMMON)) {
is_ampdu =
HTT_USR_CMPLTN_IS_AMPDU(usr_stats->cmpltn_cmn.flags);
+ tx_retry_failed =
+ usr_stats->cmpltn_cmn.mpdu_tried - usr_stats->cmpltn_cmn.mpdu_success;
+ tx_retry_count =
+ HTT_USR_CMPLTN_LONG_RETRY(usr_stats->cmpltn_cmn.flags) +
+ HTT_USR_CMPLTN_SHORT_RETRY(usr_stats->cmpltn_cmn.flags);
+ }
if (usr_stats->tlv_flags &
BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_ACK_BA_STATUS)) {
@@ -1503,6 +1510,8 @@ ath12k_update_per_peer_tx_stats(struct ath12k *ar,
break;
}
+ arsta->tx_retry_failed += tx_retry_failed;
+ arsta->tx_retry_count += tx_retry_count;
arsta->txrate.nss = nss;
arsta->tx_duration += tx_duration;
memcpy(&arsta->last_txrate, &arsta->txrate, sizeof(struct rate_info));
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index accdf4b2241f..243bf2ac599f 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -10361,6 +10361,11 @@ static void ath12k_mac_op_link_sta_statistics(struct ieee80211_hw *hw,
sinfo->signal_avg += ATH12K_DEFAULT_NOISE_FLOOR;
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG);
+
+ sinfo->tx_retries = arsta->tx_retry_count;
+ sinfo->tx_failed = arsta->tx_retry_failed;
+ sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_RETRIES);
+ sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_FAILED);
}
static int ath12k_mac_op_cancel_remain_on_channel(struct ieee80211_hw *hw,
--
2.34.1
^ permalink raw reply related [flat|nested] 10+ messages in thread