wifi: ath11k: move firmware stats out of debugfs

Currently, firmware stats, comprising pdev, vdev and beacon stats are
part of debugfs. In firmware pdev stats, firmware reports the final
Tx power used to transmit each packet. If driver wants to know the
final Tx power being used at firmware level, it can leverage from
firmware pdev stats.

Move firmware stats out of debugfs context in order to leverage
the final Tx power reported in it even when debugfs is disabled.

Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3

Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220603082814.31466-2-quic_adisi@quicinc.com

diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index 87808ffd4a6cf21b52f253ac8c20260094ff3cad..9894f908cc35173dc413905f0cf80603458e7f9e 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -600,6 +600,52 @@ static inline struct ath11k_pdev *ath11k_core_get_single_pdev(struct ath11k_base
        return &ab->pdevs[0];
 }
 
+void ath11k_fw_stats_pdevs_free(struct list_head *head)
+{
+       struct ath11k_fw_stats_pdev *i, *tmp;
+
+       list_for_each_entry_safe(i, tmp, head, list) {
+               list_del(&i->list);
+               kfree(i);
+       }
+}
+
+void ath11k_fw_stats_vdevs_free(struct list_head *head)
+{
+       struct ath11k_fw_stats_vdev *i, *tmp;
+
+       list_for_each_entry_safe(i, tmp, head, list) {
+               list_del(&i->list);
+               kfree(i);
+       }
+}
+
+void ath11k_fw_stats_bcn_free(struct list_head *head)
+{
+       struct ath11k_fw_stats_bcn *i, *tmp;
+
+       list_for_each_entry_safe(i, tmp, head, list) {
+               list_del(&i->list);
+               kfree(i);
+       }
+}
+
+void ath11k_fw_stats_init(struct ath11k *ar)
+{
+       INIT_LIST_HEAD(&ar->fw_stats.pdevs);
+       INIT_LIST_HEAD(&ar->fw_stats.vdevs);
+       INIT_LIST_HEAD(&ar->fw_stats.bcn);
+
+       init_completion(&ar->fw_stats_complete);
+}
+
+void ath11k_fw_stats_free(struct ath11k_fw_stats *stats)
+{
+       ath11k_fw_stats_pdevs_free(&stats->pdevs);
+       ath11k_fw_stats_vdevs_free(&stats->vdevs);
+       ath11k_fw_stats_bcn_free(&stats->bcn);
+}
+
 int ath11k_core_suspend(struct ath11k_base *ab)
 {
        int ret;

diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h
index d4e7490a6e8f33697227334ccd9a803d1c9837f9..b6246a2f2496560394106f9fc79cb5fc606fb02d 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@ -545,9 +545,6 @@ struct ath11k_debug {
        struct dentry *debugfs_pdev;
        struct ath11k_dbg_htt_stats htt_stats;
        u32 extd_tx_stats;
-       struct ath11k_fw_stats fw_stats;
-       struct completion fw_stats_complete;
-       bool fw_stats_done;
        u32 extd_rx_stats;
        u32 pktlog_filter;
        u32 pktlog_mode;
@@ -710,6 +707,9 @@ struct ath11k {
        u8 twt_enabled;
        bool nlo_enabled;
        u8 alpha2[REG_ALPHA2_LEN + 1];
+       struct ath11k_fw_stats fw_stats;
+       struct completion fw_stats_complete;
+       bool fw_stats_done;
 };
 
 struct ath11k_band_cap {
@@ -1112,6 +1112,12 @@ struct ath11k_fw_stats_bcn {
        u32 tx_bcn_outage_cnt;
 };
 
+void ath11k_fw_stats_init(struct ath11k *ar);
+void ath11k_fw_stats_pdevs_free(struct list_head *head);
+void ath11k_fw_stats_vdevs_free(struct list_head *head);
+void ath11k_fw_stats_bcn_free(struct list_head *head);
+void ath11k_fw_stats_free(struct ath11k_fw_stats *stats);
+
 extern const struct ce_pipe_config ath11k_target_ce_config_wlan_ipq8074[];
 extern const struct service_to_pipe ath11k_target_service_to_ce_map_wlan_ipq8074[];
 extern const struct service_to_pipe ath11k_target_service_to_ce_map_wlan_ipq6018[];

diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c
index 47113ab1ec457bba73de3abf252da45a70662f83..d6c14d054e0ba0b0c1cfd06febe505434bf52b9c 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/debugfs.c
+++ b/drivers/net/wireless/ath/ath11k/debugfs.c
@@ -92,91 +92,35 @@ void ath11k_debugfs_add_dbring_entry(struct ath11k *ar,
        spin_unlock_bh(&dbr_data->lock);
 }
 
-static void ath11k_fw_stats_pdevs_free(struct list_head *head)
-{
-       struct ath11k_fw_stats_pdev *i, *tmp;
-
-       list_for_each_entry_safe(i, tmp, head, list) {
-               list_del(&i->list);
-               kfree(i);
-       }
-}
-
-static void ath11k_fw_stats_vdevs_free(struct list_head *head)
-{
-       struct ath11k_fw_stats_vdev *i, *tmp;
-
-       list_for_each_entry_safe(i, tmp, head, list) {
-               list_del(&i->list);
-               kfree(i);
-       }
-}
-
-static void ath11k_fw_stats_bcn_free(struct list_head *head)
-{
-       struct ath11k_fw_stats_bcn *i, *tmp;
-
-       list_for_each_entry_safe(i, tmp, head, list) {
-               list_del(&i->list);
-               kfree(i);
-       }
-}
-
 static void ath11k_debugfs_fw_stats_reset(struct ath11k *ar)
 {
        spin_lock_bh(&ar->data_lock);
-       ar->debug.fw_stats_done = false;
-       ath11k_fw_stats_pdevs_free(&ar->debug.fw_stats.pdevs);
-       ath11k_fw_stats_vdevs_free(&ar->debug.fw_stats.vdevs);
+       ar->fw_stats_done = false;
+       ath11k_fw_stats_pdevs_free(&ar->fw_stats.pdevs);
+       ath11k_fw_stats_vdevs_free(&ar->fw_stats.vdevs);
        spin_unlock_bh(&ar->data_lock);
 }
 
-void ath11k_debugfs_fw_stats_process(struct ath11k_base *ab, struct sk_buff *skb)
+void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats *stats)
 {
-       struct ath11k_fw_stats stats = {};
-       struct ath11k *ar;
+       struct ath11k_base *ab = ar->ab;
        struct ath11k_pdev *pdev;
        bool is_end;
        static unsigned int num_vdev, num_bcn;
        size_t total_vdevs_started = 0;
-       int i, ret;
-
-       INIT_LIST_HEAD(&stats.pdevs);
-       INIT_LIST_HEAD(&stats.vdevs);
-       INIT_LIST_HEAD(&stats.bcn);
-
-       ret = ath11k_wmi_pull_fw_stats(ab, skb, &stats);
-       if (ret) {
-               ath11k_warn(ab, "failed to pull fw stats: %d\n", ret);
-               goto free;
-       }
-
-       rcu_read_lock();
-       ar = ath11k_mac_get_ar_by_pdev_id(ab, stats.pdev_id);
-       if (!ar) {
-               rcu_read_unlock();
-               ath11k_warn(ab, "failed to get ar for pdev_id %d: %d\n",
-                           stats.pdev_id, ret);
-               goto free;
-       }
+       int i;
 
-       spin_lock_bh(&ar->data_lock);
+       /* WMI_REQUEST_PDEV_STAT request has been already processed */
 
-       if (stats.stats_id == WMI_REQUEST_PDEV_STAT) {
-               list_splice_tail_init(&stats.pdevs, &ar->debug.fw_stats.pdevs);
-               ar->debug.fw_stats_done = true;
-               goto complete;
-       }
-
-       if (stats.stats_id == WMI_REQUEST_RSSI_PER_CHAIN_STAT) {
-               ar->debug.fw_stats_done = true;
-               goto complete;
+       if (stats->stats_id == WMI_REQUEST_RSSI_PER_CHAIN_STAT) {
+               ar->fw_stats_done = true;
+               return;
        }
 
-       if (stats.stats_id == WMI_REQUEST_VDEV_STAT) {
-               if (list_empty(&stats.vdevs)) {
+       if (stats->stats_id == WMI_REQUEST_VDEV_STAT) {
+               if (list_empty(&stats->vdevs)) {
                        ath11k_warn(ab, "empty vdev stats");
-                       goto complete;
+                       return;
                }
                /* FW sends all the active VDEV stats irrespective of PDEV,
                 * hence limit until the count of all VDEVs started
@@ -189,43 +133,34 @@ void ath11k_debugfs_fw_stats_process(struct ath11k_base *ab, struct sk_buff *skb
 
                is_end = ((++num_vdev) == total_vdevs_started);
 
-               list_splice_tail_init(&stats.vdevs,
-                                     &ar->debug.fw_stats.vdevs);
+               list_splice_tail_init(&stats->vdevs,
+                                     &ar->fw_stats.vdevs);
 
                if (is_end) {
-                       ar->debug.fw_stats_done = true;
+                       ar->fw_stats_done = true;
                        num_vdev = 0;
                }
-               goto complete;
+               return;
        }
 
-       if (stats.stats_id == WMI_REQUEST_BCN_STAT) {
-               if (list_empty(&stats.bcn)) {
+       if (stats->stats_id == WMI_REQUEST_BCN_STAT) {
+               if (list_empty(&stats->bcn)) {
                        ath11k_warn(ab, "empty bcn stats");
-                       goto complete;
+                       return;
                }
                /* Mark end until we reached the count of all started VDEVs
                 * within the PDEV
                 */
                is_end = ((++num_bcn) == ar->num_started_vdevs);
 
-               list_splice_tail_init(&stats.bcn,
-                                     &ar->debug.fw_stats.bcn);
+               list_splice_tail_init(&stats->bcn,
+                                     &ar->fw_stats.bcn);
 
                if (is_end) {
-                       ar->debug.fw_stats_done = true;
+                       ar->fw_stats_done = true;
                        num_bcn = 0;
                }
        }
-complete:
-       complete(&ar->debug.fw_stats_complete);
-       rcu_read_unlock();
-       spin_unlock_bh(&ar->data_lock);
-
-free:
-       ath11k_fw_stats_pdevs_free(&stats.pdevs);
-       ath11k_fw_stats_vdevs_free(&stats.vdevs);
-       ath11k_fw_stats_bcn_free(&stats.bcn);
 }
 
 static int ath11k_debugfs_fw_stats_request(struct ath11k *ar,
@@ -246,7 +181,7 @@ static int ath11k_debugfs_fw_stats_request(struct ath11k *ar,
 
        ath11k_debugfs_fw_stats_reset(ar);
 
-       reinit_completion(&ar->debug.fw_stats_complete);
+       reinit_completion(&ar->fw_stats_complete);
 
        ret = ath11k_wmi_send_stats_request_cmd(ar, req_param);
 
@@ -256,9 +191,8 @@ static int ath11k_debugfs_fw_stats_request(struct ath11k *ar,
                return ret;
        }
 
-       time_left =
-       wait_for_completion_timeout(&ar->debug.fw_stats_complete,
-                                   1 * HZ);
+       time_left = wait_for_completion_timeout(&ar->fw_stats_complete, 1 * HZ);
+
        if (!time_left)
                return -ETIMEDOUT;
 
@@ -267,7 +201,7 @@ static int ath11k_debugfs_fw_stats_request(struct ath11k *ar,
                        break;
 
                spin_lock_bh(&ar->data_lock);
-               if (ar->debug.fw_stats_done) {
+               if (ar->fw_stats_done) {
                        spin_unlock_bh(&ar->data_lock);
                        break;
                }
@@ -339,8 +273,7 @@ static int ath11k_open_pdev_stats(struct inode *inode, struct file *file)
                goto err_free;
        }
 
-       ath11k_wmi_fw_stats_fill(ar, &ar->debug.fw_stats, req_param.stats_id,
-                                buf);
+       ath11k_wmi_fw_stats_fill(ar, &ar->fw_stats, req_param.stats_id, buf);
 
        file->private_data = buf;
 
@@ -411,8 +344,7 @@ static int ath11k_open_vdev_stats(struct inode *inode, struct file *file)
                goto err_free;
        }
 
-       ath11k_wmi_fw_stats_fill(ar, &ar->debug.fw_stats, req_param.stats_id,
-                                buf);
+       ath11k_wmi_fw_stats_fill(ar, &ar->fw_stats, req_param.stats_id, buf);
 
        file->private_data = buf;
 
@@ -489,14 +421,13 @@ static int ath11k_open_bcn_stats(struct inode *inode, struct file *file)
                }
        }
 
-       ath11k_wmi_fw_stats_fill(ar, &ar->debug.fw_stats, req_param.stats_id,
-                                buf);
+       ath11k_wmi_fw_stats_fill(ar, &ar->fw_stats, req_param.stats_id, buf);
 
        /* since beacon stats request is looped for all active VDEVs, saved fw
         * stats is not freed for each request until done for all active VDEVs
         */
        spin_lock_bh(&ar->data_lock);
-       ath11k_fw_stats_bcn_free(&ar->debug.fw_stats.bcn);
+       ath11k_fw_stats_bcn_free(&ar->fw_stats.bcn);
        spin_unlock_bh(&ar->data_lock);
 
        file->private_data = buf;
@@ -1087,7 +1018,7 @@ void ath11k_debugfs_fw_stats_init(struct ath11k *ar)
        struct dentry *fwstats_dir = debugfs_create_dir("fw_stats",
                                                        ar->debug.debugfs_pdev);
 
-       ar->debug.fw_stats.debugfs_fwstats = fwstats_dir;
+       ar->fw_stats.debugfs_fwstats = fwstats_dir;
 
        /* all stats debugfs files created are under "fw_stats" directory
         * created per PDEV
@@ -1098,12 +1029,6 @@ void ath11k_debugfs_fw_stats_init(struct ath11k *ar)
                            &fops_vdev_stats);
        debugfs_create_file("beacon_stats", 0600, fwstats_dir, ar,
                            &fops_bcn_stats);
-
-       INIT_LIST_HEAD(&ar->debug.fw_stats.pdevs);
-       INIT_LIST_HEAD(&ar->debug.fw_stats.vdevs);
-       INIT_LIST_HEAD(&ar->debug.fw_stats.bcn);
-
-       init_completion(&ar->debug.fw_stats_complete);
 }
 
 static ssize_t ath11k_write_pktlog_filter(struct file *file,

diff --git a/drivers/net/wireless/ath/ath11k/debugfs.h b/drivers/net/wireless/ath/ath11k/debugfs.h
index 15edca8e0aecafcc123afd0700c15e8e52fcde93..3af0169f6cf218b0732a8c77bc665c2088550543 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/debugfs.h
+++ b/drivers/net/wireless/ath/ath11k/debugfs.h
@@ -269,7 +269,7 @@ int ath11k_debugfs_pdev_create(struct ath11k_base *ab);
 void ath11k_debugfs_pdev_destroy(struct ath11k_base *ab);
 int ath11k_debugfs_register(struct ath11k *ar);
 void ath11k_debugfs_unregister(struct ath11k *ar);
-void ath11k_debugfs_fw_stats_process(struct ath11k_base *ab, struct sk_buff *skb);
+void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats *stats);
 
 void ath11k_debugfs_fw_stats_init(struct ath11k *ar);
 int ath11k_debugfs_get_fw_stats(struct ath11k *ar, u32 pdev_id,
@@ -341,8 +341,8 @@ static inline void ath11k_debugfs_unregister(struct ath11k *ar)
 {
 }
 
-static inline void ath11k_debugfs_fw_stats_process(struct ath11k_base *ab,
-                                                  struct sk_buff *skb)
+static inline void ath11k_debugfs_fw_stats_process(struct ath11k *ar,
+                                                  struct ath11k_fw_stats *stats)
 {
 }
 

diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index ea6f3efd745c8198caae77d24104188ae87eedeb..99af4eb2c151938bc30ee0c5d49a5f1f04a6a08b 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -7444,7 +7444,53 @@ static void ath11k_peer_assoc_conf_event(struct ath11k_base *ab, struct sk_buff
 
 static void ath11k_update_stats_event(struct ath11k_base *ab, struct sk_buff *skb)
 {
-       ath11k_debugfs_fw_stats_process(ab, skb);
+       struct ath11k_fw_stats stats = {};
+       struct ath11k *ar;
+       int ret;
+
+       INIT_LIST_HEAD(&stats.pdevs);
+       INIT_LIST_HEAD(&stats.vdevs);
+       INIT_LIST_HEAD(&stats.bcn);
+
+       ret = ath11k_wmi_pull_fw_stats(ab, skb, &stats);
+       if (ret) {
+               ath11k_warn(ab, "failed to pull fw stats: %d\n", ret);
+               goto free;
+       }
+
+       rcu_read_lock();
+       ar = ath11k_mac_get_ar_by_pdev_id(ab, stats.pdev_id);
+       if (!ar) {
+               rcu_read_unlock();
+               ath11k_warn(ab, "failed to get ar for pdev_id %d: %d\n",
+                           stats.pdev_id, ret);
+               goto free;
+       }
+
+       spin_lock_bh(&ar->data_lock);
+
+       /* WMI_REQUEST_PDEV_STAT can be requested via .get_txpower mac ops or via
+        * debugfs fw stats. Therefore, processing it separately.
+        */
+       if (stats.stats_id == WMI_REQUEST_PDEV_STAT) {
+               list_splice_tail_init(&stats.pdevs, &ar->fw_stats.pdevs);
+               ar->fw_stats_done = true;
+               goto complete;
+       }
+
+       /* WMI_REQUEST_VDEV_STAT, WMI_REQUEST_BCN_STAT and WMI_REQUEST_RSSI_PER_CHAIN_STAT
+        * are currently requested only via debugfs fw stats. Hence, processing these
+        * in debugfs context
+        */
+       ath11k_debugfs_fw_stats_process(ar, &stats);
+
+complete:
+       complete(&ar->fw_stats_complete);
+       rcu_read_unlock();
+       spin_unlock_bh(&ar->data_lock);
+
+free:
+       ath11k_fw_stats_free(&stats);
 }
 
 /* PDEV_CTL_FAILSAFE_CHECK_EVENT is received from FW when the frequency scanned