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

Commit 6274cd41 authored by Yanbo Li's avatar Yanbo Li Committed by Kalle Valo
Browse files

ath10k: change the fw stats access mask 



This fix the regerssion introduced after "ath10k_wmi_requests_stats()
call to use more stat bits", both the 10.2.X FW and community FW 10.1.X
will return time out when access the fw_stats with the STAT_VDEV and
STAT_PDEV. Add the condition to use different fw_stats mask for different
FW versions.

Fixes: 7777d8c7 ("ath10k: implement fw stats for wmi-tlv")
Signed-off-by: default avatarYanbo Li <yanbol@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 15677a7d

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

+5 −0
Original line number Diff line number Diff line
@@ -976,6 +976,8 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->max_num_stations = TARGET_NUM_STATIONS;

		ar->max_num_vdevs = TARGET_NUM_VDEVS;

		ar->htt.max_num_pending_tx = TARGET_NUM_MSDU_DESC;

		ar->fw_stats_req_mask = WMI_STAT_PDEV | WMI_STAT_VDEV |

			WMI_STAT_PEER;

		break;

	case ATH10K_FW_WMI_OP_VERSION_10_1:

	case ATH10K_FW_WMI_OP_VERSION_10_2:
@@ -984,6 +986,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->max_num_stations = TARGET_10X_NUM_STATIONS;

		ar->max_num_vdevs = TARGET_10X_NUM_VDEVS;

		ar->htt.max_num_pending_tx = TARGET_10X_NUM_MSDU_DESC;

		ar->fw_stats_req_mask = WMI_STAT_PEER;

		break;

	case ATH10K_FW_WMI_OP_VERSION_TLV:

		ar->max_num_peers = TARGET_TLV_NUM_PEERS;
@@ -992,6 +995,8 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->max_num_tdls_vdevs = TARGET_TLV_NUM_TDLS_VDEVS;

		ar->htt.max_num_pending_tx = TARGET_TLV_NUM_MSDU_DESC;

		ar->wow.max_num_patterns = TARGET_TLV_NUM_WOW_PATTERNS;

		ar->fw_stats_req_mask = WMI_STAT_PDEV | WMI_STAT_VDEV |

			WMI_STAT_PEER;

		break;

	case ATH10K_FW_WMI_OP_VERSION_UNSET:

	case ATH10K_FW_WMI_OP_VERSION_MAX:

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

+1 −0
Original line number Diff line number Diff line
@@ -535,6 +535,7 @@ struct ath10k { 
	u32 fw_version_minor;

	u16 fw_version_release;

	u16 fw_version_build;

	u32 fw_stats_req_mask;

	u32 phy_capability;

	u32 hw_min_tx_power;

	u32 hw_max_tx_power;

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

+1 −4
Original line number Diff line number Diff line
@@ -395,10 +395,7 @@ static int ath10k_debug_fw_stats_request(struct ath10k *ar) 


		reinit_completion(&ar->debug.fw_stats_complete);



		ret = ath10k_wmi_request_stats(ar,

					       WMI_STAT_PDEV |

					       WMI_STAT_VDEV |

					       WMI_STAT_PEER);

		ret = ath10k_wmi_request_stats(ar, ar->fw_stats_req_mask);

		if (ret) {

			ath10k_warn(ar, "could not request stats (%d)\n", ret);

			return ret;