wifi: ath12k: Rearrange PPDU radio stats

Encapsulate PPDU stats in dp_pdev as these stats are related to data path
out-of-band operations. This reorganization improves the structuring of
data path stats and enhances the efficiency of data path operations by
consolidating both in-band (per packet) fields and out-of-band data path
stats within the same ath12k_pdev_dp object.

ppdu_list_lock is used to protect HTT pdev stats update.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Signed-off-by: Ripan Deuri <quic_rdeuri@quicinc.com>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20251007110203.1541167-3-quic_rdeuri@quicinc.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
index d5c70278967336e970a7ab97bc8e76f4108affbf..6764d81d033460d7e835d3f4f87aba3d8cb4bd75 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -654,23 +654,6 @@ struct ath12k_debug {
        bool extd_rx_stats;
 };
 
-struct ath12k_per_peer_tx_stats {
-       u32 succ_bytes;
-       u32 retry_bytes;
-       u32 failed_bytes;
-       u32 duration;
-       u16 succ_pkts;
-       u16 retry_pkts;
-       u16 failed_pkts;
-       u16 ru_start;
-       u16 ru_tones;
-       u8 ba_fails;
-       u8 ppdu_type;
-       u32 mu_grpid;
-       u32 mu_pos;
-       bool is_ampdu;
-};
-
 struct ath12k_pdev_rssi_offsets {
        s32 temp_offset;
        s8 min_nf_dbm;
@@ -795,9 +778,6 @@ struct ath12k {
        struct ath12k_wow wow;
        struct completion target_suspend;
        bool target_suspend_ack;
-       struct ath12k_per_peer_tx_stats peer_tx_stats;
-       struct list_head ppdu_stats_info;
-       u32 ppdu_stat_list_depth;
 
        struct ath12k_per_peer_tx_stats cached_stats;
        u32 last_ppdu_id;

diff --git a/drivers/net/wireless/ath/ath12k/dp.h b/drivers/net/wireless/ath/ath12k/dp.h
index 6de93f481d9911ad865aaeb629bebd526a5c63f6..1bb46a1b2d63acf4992e987373e20c5615a84632 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/dp.h
+++ b/drivers/net/wireless/ath/ath12k/dp.h
@@ -156,6 +156,12 @@ struct ath12k_pdev_dp {
        struct ieee80211_hw *hw;
        u8 hw_link_id;
 
+       /* Protects ppdu stats */
+       spinlock_t ppdu_list_lock;
+       struct ath12k_per_peer_tx_stats peer_tx_stats;
+       struct list_head ppdu_stats_info;
+       u32 ppdu_stat_list_depth;
+
        struct dp_srng rxdma_mon_dst_ring[MAX_RXDMA_PER_PDEV];
        struct dp_srng tx_mon_dst_ring[MAX_RXDMA_PER_PDEV];
 

diff --git a/drivers/net/wireless/ath/ath12k/dp_cmn.h b/drivers/net/wireless/ath/ath12k/dp_cmn.h
index 3dc61d1a416256a6264674713e0d02bfbbe10493..243fb5a680167295a38a733e86e02a9b732f377c 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/dp_cmn.h
+++ b/drivers/net/wireless/ath/ath12k/dp_cmn.h
@@ -34,6 +34,24 @@ struct ath12k_dp_vif {
        struct ath12k_dp_link_vif dp_link_vif[ATH12K_NUM_MAX_LINKS];
 };
 
+/* TODO: Move this to a separate dp_stats file */
+struct ath12k_per_peer_tx_stats {
+       u32 succ_bytes;
+       u32 retry_bytes;
+       u32 failed_bytes;
+       u32 duration;
+       u16 succ_pkts;
+       u16 retry_pkts;
+       u16 failed_pkts;
+       u16 ru_start;
+       u16 ru_tones;
+       u8 ba_fails;
+       u8 ppdu_type;
+       u32 mu_grpid;
+       u32 mu_pos;
+       bool is_ampdu;
+};
+
 static inline struct ath12k_dp_link_vif *
 ath12k_dp_vif_to_dp_link_vif(struct ath12k_dp_vif *dp_vif, u8 link_id)
 {

diff --git a/drivers/net/wireless/ath/ath12k/dp_htt.c b/drivers/net/wireless/ath/ath12k/dp_htt.c
index 267220f43fd2c4decc4a5ce599de23cffd0615ce..1a0d3e4ac8bb7404f52c5f3262a9defea13b740e 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/dp_htt.c
+++ b/drivers/net/wireless/ath/ath12k/dp_htt.c
@@ -183,14 +183,15 @@ int ath12k_dp_htt_tlv_iter(struct ath12k_base *ab, const void *ptr, size_t len,
 }
 
 static void
-ath12k_update_per_peer_tx_stats(struct ath12k *ar,
+ath12k_update_per_peer_tx_stats(struct ath12k_pdev_dp *dp_pdev,
                                struct htt_ppdu_stats *ppdu_stats, u8 user)
 {
-       struct ath12k_base *ab = ar->ab;
+       struct ath12k_dp *dp = dp_pdev->dp;
+       struct ath12k_base *ab = dp->ab;
        struct ath12k_peer *peer;
        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;
+       struct ath12k_per_peer_tx_stats *peer_stats = &dp_pdev->peer_tx_stats;
        struct htt_ppdu_user_stats *usr_stats = &ppdu_stats->user_stats[user];
        struct htt_ppdu_stats_common *common = &ppdu_stats->common;
        int ret;
@@ -360,34 +361,34 @@ ath12k_update_per_peer_tx_stats(struct ath12k *ar,
        rcu_read_unlock();
 }
 
-static void ath12k_htt_update_ppdu_stats(struct ath12k *ar,
+static void ath12k_htt_update_ppdu_stats(struct ath12k_pdev_dp *dp_pdev,
                                         struct htt_ppdu_stats *ppdu_stats)
 {
        u8 user;
 
        for (user = 0; user < HTT_PPDU_STATS_MAX_USERS - 1; user++)
-               ath12k_update_per_peer_tx_stats(ar, ppdu_stats, user);
+               ath12k_update_per_peer_tx_stats(dp_pdev, ppdu_stats, user);
 }
 
 static
-struct htt_ppdu_stats_info *ath12k_dp_htt_get_ppdu_desc(struct ath12k *ar,
+struct htt_ppdu_stats_info *ath12k_dp_htt_get_ppdu_desc(struct ath12k_pdev_dp *dp_pdev,
                                                        u32 ppdu_id)
 {
        struct htt_ppdu_stats_info *ppdu_info;
 
-       lockdep_assert_held(&ar->data_lock);
-       if (!list_empty(&ar->ppdu_stats_info)) {
-               list_for_each_entry(ppdu_info, &ar->ppdu_stats_info, list) {
+       lockdep_assert_held(&dp_pdev->ppdu_list_lock);
+       if (!list_empty(&dp_pdev->ppdu_stats_info)) {
+               list_for_each_entry(ppdu_info, &dp_pdev->ppdu_stats_info, list) {
                        if (ppdu_info->ppdu_id == ppdu_id)
                                return ppdu_info;
                }
 
-               if (ar->ppdu_stat_list_depth > HTT_PPDU_DESC_MAX_DEPTH) {
-                       ppdu_info = list_first_entry(&ar->ppdu_stats_info,
+               if (dp_pdev->ppdu_stat_list_depth > HTT_PPDU_DESC_MAX_DEPTH) {
+                       ppdu_info = list_first_entry(&dp_pdev->ppdu_stats_info,
                                                     typeof(*ppdu_info), list);
                        list_del(&ppdu_info->list);
-                       ar->ppdu_stat_list_depth--;
-                       ath12k_htt_update_ppdu_stats(ar, &ppdu_info->ppdu_stats);
+                       dp_pdev->ppdu_stat_list_depth--;
+                       ath12k_htt_update_ppdu_stats(dp_pdev, &ppdu_info->ppdu_stats);
                        kfree(ppdu_info);
                }
        }
@@ -396,8 +397,8 @@ struct htt_ppdu_stats_info *ath12k_dp_htt_get_ppdu_desc(struct ath12k *ar,
        if (!ppdu_info)
                return NULL;
 
-       list_add_tail(&ppdu_info->list, &ar->ppdu_stats_info);
-       ar->ppdu_stat_list_depth++;
+       list_add_tail(&ppdu_info->list, &dp_pdev->ppdu_stats_info);
+       dp_pdev->ppdu_stat_list_depth++;
 
        return ppdu_info;
 }
@@ -435,14 +436,15 @@ static void ath12k_copy_to_bar(struct ath12k_peer *peer,
 static int ath12k_htt_pull_ppdu_stats(struct ath12k_base *ab,
                                      struct sk_buff *skb)
 {
+       struct ath12k_dp *dp = ath12k_ab_to_dp(ab);
        struct ath12k_htt_ppdu_stats_msg *msg;
        struct htt_ppdu_stats_info *ppdu_info;
        struct ath12k_peer *peer = NULL;
        struct htt_ppdu_user_stats *usr_stats = NULL;
        u32 peer_id = 0;
-       struct ath12k *ar;
+       struct ath12k_pdev_dp *dp_pdev;
        int ret, i;
-       u8 pdev_id;
+       u8 pdev_id, pdev_idx;
        u32 ppdu_id, len;
 
        msg = (struct ath12k_htt_ppdu_stats_msg *)skb->data;
@@ -457,17 +459,24 @@ static int ath12k_htt_pull_ppdu_stats(struct ath12k_base *ab,
        pdev_id = le32_get_bits(msg->info, HTT_T2H_PPDU_STATS_INFO_PDEV_ID);
        ppdu_id = le32_to_cpu(msg->ppdu_id);
 
+       pdev_idx = DP_HW2SW_MACID(pdev_id);
+       if (pdev_idx >= MAX_RADIOS) {
+               ath12k_warn(ab, "HTT PPDU STATS invalid pdev id %u", pdev_id);
+               return -EINVAL;
+       }
+
        rcu_read_lock();
-       ar = ath12k_mac_get_ar_by_pdev_id(ab, pdev_id);
-       if (!ar) {
+
+       dp_pdev = ath12k_dp_to_pdev_dp(dp, pdev_idx);
+       if (!dp_pdev) {
                ret = -EINVAL;
                goto exit;
        }
 
-       spin_lock_bh(&ar->data_lock);
-       ppdu_info = ath12k_dp_htt_get_ppdu_desc(ar, ppdu_id);
+       spin_lock_bh(&dp_pdev->ppdu_list_lock);
+       ppdu_info = ath12k_dp_htt_get_ppdu_desc(dp_pdev, ppdu_id);
        if (!ppdu_info) {
-               spin_unlock_bh(&ar->data_lock);
+               spin_unlock_bh(&dp_pdev->ppdu_list_lock);
                ret = -EINVAL;
                goto exit;
        }
@@ -477,13 +486,13 @@ static int ath12k_htt_pull_ppdu_stats(struct ath12k_base *ab,
                                     ath12k_htt_tlv_ppdu_stats_parse,
                                     (void *)ppdu_info);
        if (ret) {
-               spin_unlock_bh(&ar->data_lock);
+               spin_unlock_bh(&dp_pdev->ppdu_list_lock);
                ath12k_warn(ab, "Failed to parse tlv %d\n", ret);
                goto exit;
        }
 
        if (ppdu_info->ppdu_stats.common.num_users >= HTT_PPDU_STATS_MAX_USERS) {
-               spin_unlock_bh(&ar->data_lock);
+               spin_unlock_bh(&dp_pdev->ppdu_list_lock);
                ath12k_warn(ab,
                            "HTT PPDU STATS event has unexpected num_users %u, should be smaller than %u\n",
                            ppdu_info->ppdu_stats.common.num_users,
@@ -531,7 +540,7 @@ static int ath12k_htt_pull_ppdu_stats(struct ath12k_base *ab,
                }
        }
 
-       spin_unlock_bh(&ar->data_lock);
+       spin_unlock_bh(&dp_pdev->ppdu_list_lock);
 
 exit:
        rcu_read_unlock();

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 692a88f25b5c0e3f7455a71bc1318e6eb0455db9..ebe7aba92ecc443dcd0d69c38a7320c14862e443 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -9306,6 +9306,7 @@ int ath12k_mac_rfkill_enable_radio(struct ath12k *ar, bool enable)
 
 static void ath12k_mac_stop(struct ath12k *ar)
 {
+       struct ath12k_pdev_dp *dp_pdev = &ar->dp;
        struct ath12k_hw *ah = ar->ah;
        struct htt_ppdu_stats_info *ppdu_stats, *tmp;
        struct ath12k_wmi_scan_chan_list_arg *arg;
@@ -9330,13 +9331,14 @@ static void ath12k_mac_stop(struct ath12k *ar)
        ar->state_11d = ATH12K_11D_IDLE;
        complete(&ar->completed_11d_scan);
 
-       spin_lock_bh(&ar->data_lock);
-
-       list_for_each_entry_safe(ppdu_stats, tmp, &ar->ppdu_stats_info, list) {
+       spin_lock_bh(&dp_pdev->ppdu_list_lock);
+       list_for_each_entry_safe(ppdu_stats, tmp, &dp_pdev->ppdu_stats_info, list) {
                list_del(&ppdu_stats->list);
                kfree(ppdu_stats);
        }
+       spin_unlock_bh(&dp_pdev->ppdu_list_lock);
 
+       spin_lock_bh(&ar->data_lock);
        while ((arg = list_first_entry_or_null(&ar->regd_channel_update_queue,
                                               struct ath12k_wmi_scan_chan_list_arg,
                                               list))) {
@@ -13998,8 +14000,9 @@ static void ath12k_mac_setup(struct ath12k *ar)
        ar->vdev_id_11d_scan = ATH12K_11D_INVALID_VDEV_ID;
 
        spin_lock_init(&ar->data_lock);
+       spin_lock_init(&ar->dp.ppdu_list_lock);
        INIT_LIST_HEAD(&ar->arvifs);
-       INIT_LIST_HEAD(&ar->ppdu_stats_info);
+       INIT_LIST_HEAD(&ar->dp.ppdu_stats_info);
 
        init_completion(&ar->vdev_setup_done);
        init_completion(&ar->vdev_delete_done);