Commit 4cc02c7c authored by Wen Gong's avatar Wen Gong Committed by Kalle Valo
Browse files

ath10k: correct tx bitrate of iw for SDIO 



For legacy mode, tx bitrate not show correct sometimes, for example:
iw wlan0 link
Connected to 8c:21:0a:b3:5a:64 (on wlan0)
        SSID: tplinkgw
        freq: 2462
        RX: 19672 bytes (184 packets)
        TX: 9851 bytes (87 packets)
        signal: -51 dBm
        rx bitrate: 54.0 MBit/s
        tx bitrate: 2.8 MBit/s

This patch use the tx bitrate info from WMI_TLV_PEER_STATS_INFO_EVENTID
report from firmware, and tx bitrate show correct.

iw wlan0 link
Connected to 8c:21:0a:b3:5a:64 (on wlan0)
        SSID: tplinkgw
        freq: 2462
        RX: 13973 bytes (120 packets)
        TX: 6737 bytes (57 packets)
        signal: -52 dBm
        rx bitrate: 54.0 MBit/s
        tx bitrate: 54.0 MBit/s

This patch only effect SDIO chip, ath10k_mac_sta_get_peer_stats_info
has check for bitrate_statistics of hw_params, it is enabled only for
"qca6174 hw3.2 sdio".

Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00042.

Signed-off-by: default avatarWen Gong <wgong@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200427080416.8265-5-wgong@codeaurora.org
parent 3344b99d

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

+2 −0
Original line number Diff line number Diff line
@@ -526,6 +526,8 @@ struct ath10k_sta { 


	u32 rx_rate_code;

	u32 rx_bitrate_kbps;

	u32 tx_rate_code;

	u32 tx_bitrate_kbps;

	struct work_struct update_wk;

	u64 rx_duration;

	struct ath10k_htt_tx_stats *tx_stats;

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

+10 −0
Original line number Diff line number Diff line
@@ -8502,6 +8502,16 @@ static void ath10k_mac_sta_get_peer_stats_info(struct ath10k *ar, 
		arsta->rx_rate_code = 0;

		arsta->rx_bitrate_kbps = 0;

	}



	if (arsta->tx_rate_code != 0 && arsta->tx_bitrate_kbps != 0) {

		ath10k_mac_parse_bitrate(ar, arsta->tx_rate_code,

					 arsta->tx_bitrate_kbps,

					 &sinfo->txrate);



		sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);

		arsta->tx_rate_code = 0;

		arsta->tx_bitrate_kbps = 0;

	}

}



static void ath10k_sta_statistics(struct ieee80211_hw *hw,

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

+2 −0
Original line number Diff line number Diff line
@@ -249,6 +249,8 @@ static int ath10k_wmi_tlv_parse_peer_stats_info(struct ath10k *ar, u16 tag, u16 
	arsta = (struct ath10k_sta *)sta->drv_priv;

	arsta->rx_rate_code = __le32_to_cpu(stat->last_rx_rate_code);

	arsta->rx_bitrate_kbps = __le32_to_cpu(stat->last_rx_bitrate_kbps);

	arsta->tx_rate_code = __le32_to_cpu(stat->last_tx_rate_code);

	arsta->tx_bitrate_kbps = __le32_to_cpu(stat->last_tx_bitrate_kbps);



	return 0;

}