ath10k: rx_duration update for fw_stats debugfs entry

Currently instant rx_duration always fetching as zero
in fw_stats debugfs entry if extended peer stats event
supports.

This patch updates instant rx_duration in fw_stats entry
based on extended peer stats and maintaining backward
compatibility for 10.2/10.x.

Tested HW: QCA9984.
Tested FW: 10.4-3.6.0.1-00004.

Signed-off-by: Balaji Pothunoori <bpothuno@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index cbb9ff4d1707f26921e879a138e0598b17bc9c05..24981d94bbcdeba363ca640b7a25eba7e620f9af 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -196,7 +196,7 @@ struct ath10k_fw_extd_stats_peer {
        struct list_head list;
 
        u8 peer_macaddr[ETH_ALEN];
-       u32 rx_duration;
+       u64 rx_duration;
 };
 
 struct ath10k_fw_stats_vdev {

diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c
index f828fd81027048d7a026fed2ebec43c68f88d313..740781fe80f8b9b74587e50282e56395c3a03c01 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/debug.c
+++ b/drivers/net/wireless/ath/ath10k/debug.c
@@ -305,6 +305,9 @@ void ath10k_debug_fw_stats_process(struct ath10k *ar, struct sk_buff *skb)
        if (is_end)
                ar->debug.fw_stats_done = true;
 
+       if (stats.extended)
+               ar->debug.fw_stats.extended = true;
+
        is_started = !list_empty(&ar->debug.fw_stats.pdevs);
 
        if (is_started && !is_end) {

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 98a90e49d666ccd54d1b087cfb31827bc0b43e6c..4f707c6394bbaa2f45fe14caf4768db4d593e0f4 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -8309,7 +8309,7 @@ ath10k_wmi_fw_vdev_stats_fill(const struct ath10k_fw_stats_vdev *vdev,
 
 static void
 ath10k_wmi_fw_peer_stats_fill(const struct ath10k_fw_stats_peer *peer,
-                             char *buf, u32 *length)
+                             char *buf, u32 *length, bool extended_peer)
 {
        u32 len = *length;
        u32 buf_len = ATH10K_FW_STATS_BUF_SIZE;
@@ -8322,13 +8322,27 @@ ath10k_wmi_fw_peer_stats_fill(const struct ath10k_fw_stats_peer *peer,
                        "Peer TX rate", peer->peer_tx_rate);
        len += scnprintf(buf + len, buf_len - len, "%30s %u\n",
                        "Peer RX rate", peer->peer_rx_rate);
-       len += scnprintf(buf + len, buf_len - len, "%30s %llu\n",
-                       "Peer RX duration", peer->rx_duration);
+       if (!extended_peer)
+               len += scnprintf(buf + len, buf_len - len, "%30s %llu\n",
+                               "Peer RX duration", peer->rx_duration);
 
        len += scnprintf(buf + len, buf_len - len, "\n");
        *length = len;
 }
 
+static void
+ath10k_wmi_fw_extd_peer_stats_fill(const struct ath10k_fw_extd_stats_peer *peer,
+                                  char *buf, u32 *length)
+{
+       u32 len = *length;
+       u32 buf_len = ATH10K_FW_STATS_BUF_SIZE;
+
+       len += scnprintf(buf + len, buf_len - len, "%30s %pM\n",
+                       "Peer MAC address", peer->peer_macaddr);
+       len += scnprintf(buf + len, buf_len - len, "%30s %llu\n",
+                       "Peer RX duration", peer->rx_duration);
+}
+
 void ath10k_wmi_main_op_fw_stats_fill(struct ath10k *ar,
                                      struct ath10k_fw_stats *fw_stats,
                                      char *buf)
@@ -8374,7 +8388,8 @@ void ath10k_wmi_main_op_fw_stats_fill(struct ath10k *ar,
                                 "=================");
 
        list_for_each_entry(peer, &fw_stats->peers, list) {
-               ath10k_wmi_fw_peer_stats_fill(peer, buf, &len);
+               ath10k_wmi_fw_peer_stats_fill(peer, buf, &len,
+                                             fw_stats->extended);
        }
 
 unlock:
@@ -8432,7 +8447,8 @@ void ath10k_wmi_10x_op_fw_stats_fill(struct ath10k *ar,
                                 "=================");
 
        list_for_each_entry(peer, &fw_stats->peers, list) {
-               ath10k_wmi_fw_peer_stats_fill(peer, buf, &len);
+               ath10k_wmi_fw_peer_stats_fill(peer, buf, &len,
+                                             fw_stats->extended);
        }
 
 unlock:
@@ -8541,6 +8557,7 @@ void ath10k_wmi_10_4_op_fw_stats_fill(struct ath10k *ar,
        const struct ath10k_fw_stats_pdev *pdev;
        const struct ath10k_fw_stats_vdev_extd *vdev;
        const struct ath10k_fw_stats_peer *peer;
+       const struct ath10k_fw_extd_stats_peer *extd_peer;
        size_t num_peers;
        size_t num_vdevs;
 
@@ -8603,7 +8620,15 @@ void ath10k_wmi_10_4_op_fw_stats_fill(struct ath10k *ar,
                                "=================");
 
        list_for_each_entry(peer, &fw_stats->peers, list) {
-               ath10k_wmi_fw_peer_stats_fill(peer, buf, &len);
+               ath10k_wmi_fw_peer_stats_fill(peer, buf, &len,
+                                             fw_stats->extended);
+       }
+
+       if (fw_stats->extended) {
+               list_for_each_entry(extd_peer, &fw_stats->peers_extd, list) {
+                       ath10k_wmi_fw_extd_peer_stats_fill(extd_peer, buf,
+                                                          &len);
+               }
        }
 
 unlock: