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

Commit cc61a1bb authored by Mohammed Shafi Shajakhan's avatar Mohammed Shafi Shajakhan Committed by Kalle Valo
Browse files

ath10k: enable debugfs provision to enable Peer Stats feature 



Provide a debugfs entry to enable/ disable Peer Stats feature.
Peer Stats feature is for developers/users who are more interested
in studying in Rx/Tx stats with multiple clients connected, hence
disable this by default. Enabling this feature by default results
in unneccessary processing of Peer Stats event for every 500ms
and updating peer_stats list (allocating memory) and cleaning it up
ifexceeds the higher limit and this can be an unnecessary overhead
during long run stress testing.

Signed-off-by: default avatarMohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 3d9195ea

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1586,7 +1586,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
	case ATH10K_FW_WMI_OP_VERSION_10_1:

	case ATH10K_FW_WMI_OP_VERSION_10_1:

	case ATH10K_FW_WMI_OP_VERSION_10_2:

	case ATH10K_FW_WMI_OP_VERSION_10_2:

	case ATH10K_FW_WMI_OP_VERSION_10_2_4:

	case ATH10K_FW_WMI_OP_VERSION_10_2_4:

		if (test_bit(WMI_SERVICE_PEER_STATS, ar->wmi.svc_map)) {

		if (ath10k_peer_stats_enabled(ar)) {

			ar->max_num_peers = TARGET_10X_TX_STATS_NUM_PEERS;

			ar->max_num_peers = TARGET_10X_TX_STATS_NUM_PEERS;

			ar->max_num_stations = TARGET_10X_TX_STATS_NUM_STATIONS;

			ar->max_num_stations = TARGET_10X_TX_STATS_NUM_STATIONS;

		} else {

		} else {

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

+12 −0
Original line number Original line Diff line number Diff line
@@ -561,6 +561,9 @@ enum ath10k_dev_flags { 




	/* Bluetooth coexistance enabled */

	/* Bluetooth coexistance enabled */

	ATH10K_FLAG_BTCOEX,

	ATH10K_FLAG_BTCOEX,



	/* Per Station statistics service */

	ATH10K_FLAG_PEER_STATS,

};

};





enum ath10k_cal_mode {

enum ath10k_cal_mode {
@@ -903,6 +906,15 @@ struct ath10k { 
	u8 drv_priv[0] __aligned(sizeof(void *));

	u8 drv_priv[0] __aligned(sizeof(void *));

};

};





static inline bool ath10k_peer_stats_enabled(struct ath10k *ar)

{

	if (test_bit(ATH10K_FLAG_PEER_STATS, &ar->dev_flags) &&

	    test_bit(WMI_SERVICE_PEER_STATS, ar->wmi.svc_map))

		return true;



	return false;

}



struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,

struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,

				  enum ath10k_bus bus,

				  enum ath10k_bus bus,

				  enum ath10k_hw_rev hw_rev,

				  enum ath10k_hw_rev hw_rev,

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

+75 −5
Original line number Original line Diff line number Diff line
@@ -323,7 +323,7 @@ static void ath10k_debug_fw_stats_reset(struct ath10k *ar) 
void ath10k_debug_fw_stats_process(struct ath10k *ar, struct sk_buff *skb)

void ath10k_debug_fw_stats_process(struct ath10k *ar, struct sk_buff *skb)

{

{

	struct ath10k_fw_stats stats = {};

	struct ath10k_fw_stats stats = {};

	bool is_start, is_started, is_end, peer_stats_svc;

	bool is_start, is_started, is_end;

	size_t num_peers;

	size_t num_peers;

	size_t num_vdevs;

	size_t num_vdevs;

	int ret;

	int ret;
@@ -350,13 +350,11 @@ void ath10k_debug_fw_stats_process(struct ath10k *ar, struct sk_buff *skb) 
	 *  b) consume stat update events until another one with pdev stats is

	 *  b) consume stat update events until another one with pdev stats is

	 *     delivered which is treated as end-of-data and is itself discarded

	 *     delivered which is treated as end-of-data and is itself discarded

	 */

	 */



	if (ath10k_peer_stats_enabled(ar))

	peer_stats_svc = test_bit(WMI_SERVICE_PEER_STATS, ar->wmi.svc_map);

	if (peer_stats_svc)

		ath10k_sta_update_rx_duration(ar, &stats.peers);

		ath10k_sta_update_rx_duration(ar, &stats.peers);





	if (ar->debug.fw_stats_done) {

	if (ar->debug.fw_stats_done) {

		if (!peer_stats_svc)

		if (!ath10k_peer_stats_enabled(ar))

			ath10k_warn(ar, "received unsolicited stats update event\n");

			ath10k_warn(ar, "received unsolicited stats update event\n");





		goto free;

		goto free;
@@ -2184,6 +2182,73 @@ static const struct file_operations fops_btcoex = { 
	.open = simple_open

	.open = simple_open

};

};





static ssize_t ath10k_write_peer_stats(struct file *file,

				       const char __user *ubuf,

				       size_t count, loff_t *ppos)

{

	struct ath10k *ar = file->private_data;

	char buf[32];

	size_t buf_size;

	int ret = 0;

	bool val;



	buf_size = min(count, (sizeof(buf) - 1));

	if (copy_from_user(buf, ubuf, buf_size))

		return -EFAULT;



	buf[buf_size] = '\0';



	if (strtobool(buf, &val) != 0)

		return -EINVAL;



	mutex_lock(&ar->conf_mutex);



	if (ar->state != ATH10K_STATE_ON &&

	    ar->state != ATH10K_STATE_RESTARTED) {

		ret = -ENETDOWN;

		goto exit;

	}



	if (!(test_bit(ATH10K_FLAG_PEER_STATS, &ar->dev_flags) ^ val))

		goto exit;



	if (val)

		set_bit(ATH10K_FLAG_PEER_STATS, &ar->dev_flags);

	else

		clear_bit(ATH10K_FLAG_PEER_STATS, &ar->dev_flags);



	ath10k_info(ar, "restarting firmware due to Peer stats change");



	queue_work(ar->workqueue, &ar->restart_work);

	ret = count;



exit:

	mutex_unlock(&ar->conf_mutex);

	return ret;

}



static ssize_t ath10k_read_peer_stats(struct file *file, char __user *ubuf,

				      size_t count, loff_t *ppos)



{

	char buf[32];

	struct ath10k *ar = file->private_data;

	int len = 0;



	mutex_lock(&ar->conf_mutex);

	len = scnprintf(buf, sizeof(buf) - len, "%d\n",

			test_bit(ATH10K_FLAG_PEER_STATS, &ar->dev_flags));

	mutex_unlock(&ar->conf_mutex);



	return simple_read_from_buffer(ubuf, count, ppos, buf, len);

}



static const struct file_operations fops_peer_stats = {

	.read = ath10k_read_peer_stats,

	.write = ath10k_write_peer_stats,

	.open = simple_open

};



static ssize_t ath10k_debug_fw_checksums_read(struct file *file,

static ssize_t ath10k_debug_fw_checksums_read(struct file *file,

					      char __user *user_buf,

					      char __user *user_buf,

					      size_t count, loff_t *ppos)

					      size_t count, loff_t *ppos)
@@ -2347,6 +2412,11 @@ int ath10k_debug_register(struct ath10k *ar) 
		debugfs_create_file("btcoex", S_IRUGO | S_IWUSR,

		debugfs_create_file("btcoex", S_IRUGO | S_IWUSR,

				    ar->debug.debugfs_phy, ar, &fops_btcoex);

				    ar->debug.debugfs_phy, ar, &fops_btcoex);





	if (test_bit(WMI_SERVICE_PEER_STATS, ar->wmi.svc_map))

		debugfs_create_file("peer_stats", S_IRUGO | S_IWUSR,

				    ar->debug.debugfs_phy, ar,

				    &fops_peer_stats);



	debugfs_create_file("fw_checksums", S_IRUSR,

	debugfs_create_file("fw_checksums", S_IRUSR,

			    ar->debug.debugfs_phy, ar, &fops_fw_checksums);

			    ar->debug.debugfs_phy, ar, &fops_fw_checksums);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -4435,7 +4435,7 @@ static int ath10k_start(struct ieee80211_hw *hw) 




	ar->ani_enabled = true;

	ar->ani_enabled = true;





	if (test_bit(WMI_SERVICE_PEER_STATS, ar->wmi.svc_map)) {

	if (ath10k_peer_stats_enabled(ar)) {

		param = ar->wmi.pdev_param->peer_stats_update_period;

		param = ar->wmi.pdev_param->peer_stats_update_period;

		ret = ath10k_wmi_pdev_set_param(ar, param,

		ret = ath10k_wmi_pdev_set_param(ar, param,

						PEER_DEFAULT_STATS_UPDATE_PERIOD);

						PEER_DEFAULT_STATS_UPDATE_PERIOD);

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

+5 −7
Original line number Original line Diff line number Diff line
@@ -2856,11 +2856,8 @@ static int ath10k_wmi_10_2_4_op_pull_fw_stats(struct ath10k *ar, 
		const struct wmi_10_2_4_ext_peer_stats *src;

		const struct wmi_10_2_4_ext_peer_stats *src;

		struct ath10k_fw_stats_peer *dst;

		struct ath10k_fw_stats_peer *dst;

		int stats_len;

		int stats_len;

		bool ext_peer_stats_support;





		ext_peer_stats_support = test_bit(WMI_SERVICE_PEER_STATS,

		if (test_bit(WMI_SERVICE_PEER_STATS, ar->wmi.svc_map))

						  ar->wmi.svc_map);

		if (ext_peer_stats_support)

			stats_len = sizeof(struct wmi_10_2_4_ext_peer_stats);

			stats_len = sizeof(struct wmi_10_2_4_ext_peer_stats);

		else

		else

			stats_len = sizeof(struct wmi_10_2_4_peer_stats);

			stats_len = sizeof(struct wmi_10_2_4_peer_stats);
@@ -2877,7 +2874,7 @@ static int ath10k_wmi_10_2_4_op_pull_fw_stats(struct ath10k *ar, 




		dst->peer_rx_rate = __le32_to_cpu(src->common.peer_rx_rate);

		dst->peer_rx_rate = __le32_to_cpu(src->common.peer_rx_rate);





		if (ext_peer_stats_support)

		if (ath10k_peer_stats_enabled(ar))

			dst->rx_duration = __le32_to_cpu(src->rx_duration);

			dst->rx_duration = __le32_to_cpu(src->rx_duration);

		/* FIXME: expose 10.2 specific values */

		/* FIXME: expose 10.2 specific values */
@@ -5514,7 +5511,8 @@ static struct sk_buff *ath10k_wmi_10_2_op_gen_init(struct ath10k *ar) 




	config.num_vdevs = __cpu_to_le32(TARGET_10X_NUM_VDEVS);

	config.num_vdevs = __cpu_to_le32(TARGET_10X_NUM_VDEVS);

	config.num_peer_keys = __cpu_to_le32(TARGET_10X_NUM_PEER_KEYS);

	config.num_peer_keys = __cpu_to_le32(TARGET_10X_NUM_PEER_KEYS);

	if (test_bit(WMI_SERVICE_PEER_STATS, ar->wmi.svc_map)) {



	if (ath10k_peer_stats_enabled(ar)) {

		config.num_peers = __cpu_to_le32(TARGET_10X_TX_STATS_NUM_PEERS);

		config.num_peers = __cpu_to_le32(TARGET_10X_TX_STATS_NUM_PEERS);

		config.num_tids = __cpu_to_le32(TARGET_10X_TX_STATS_NUM_TIDS);

		config.num_tids = __cpu_to_le32(TARGET_10X_TX_STATS_NUM_TIDS);

	} else {

	} else {
@@ -5576,7 +5574,7 @@ static struct sk_buff *ath10k_wmi_10_2_op_gen_init(struct ath10k *ar) 
	    test_bit(WMI_SERVICE_COEX_GPIO, ar->wmi.svc_map))

	    test_bit(WMI_SERVICE_COEX_GPIO, ar->wmi.svc_map))

		features |= WMI_10_2_COEX_GPIO;

		features |= WMI_10_2_COEX_GPIO;





	if (test_bit(WMI_SERVICE_PEER_STATS, ar->wmi.svc_map))

	if (ath10k_peer_stats_enabled(ar))

		features |= WMI_10_2_PEER_STATS;

		features |= WMI_10_2_PEER_STATS;





	cmd->resource_config.feature_mask = __cpu_to_le32(features);

	cmd->resource_config.feature_mask = __cpu_to_le32(features);