Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c51875c authored by Balaji Pothunoori's avatar Balaji Pothunoori Committed by Kalle Valo
Browse files

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: default avatarBalaji Pothunoori <bpothuno@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 9e0b341a

drivers/net/wireless/ath/ath10k/core.h

+1 −1
Original line number Diff line number Diff line
@@ -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 {

drivers/net/wireless/ath/ath10k/debug.c

+3 −0
Original line number Diff line number Diff line
@@ -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) {

drivers/net/wireless/ath/ath10k/wmi.c

+31 −6
Original line number Diff line number Diff line
@@ -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,6 +8322,7 @@ 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);

	if (!extended_peer)

		len += scnprintf(buf + len, buf_len - len, "%30s %llu\n",

				"Peer RX duration", peer->rx_duration);
@@ -8329,6 +8330,19 @@ ath10k_wmi_fw_peer_stats_fill(const struct ath10k_fw_stats_peer *peer, 
	*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: