On 11/12/19 3:45 AM, Yu Wang wrote:
When working in station mode, after connected to a legacy
AP, 11g only, for example, the tx bitrate is incorrect in
output of command 'iw wlan0 link'.
That's because the legacy tx bitrate value reported by
firmware is not well handled:
For QCA6174, the value represents rate index, but treated
as a real rate;
For QCA9888, the value is real rate, with unit 'Mbps', but
treated as '100kbps'.
To fix this issue:
1. Translate the rate index to real rate for QCA6174;
2. Translate the rate from 'Mbps' to 'kbps' for QCA9888.
Tested with:
QCA6174 PCIe with firmware WLAN.RM.4.4.1.c3-00031.
QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00029.
QCA9888 PCIe with firmware 10.4-3.9.0.2-00040.
Signed-off-by: Yu Wang <yyuwang@xxxxxxxxxxxxxx>
---
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -3454,10 +3440,12 @@ ath10k_update_per_peer_tx_stats(struct ath10k *ar,
{
struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv;
struct ieee80211_chanctx_conf *conf = NULL;
- u8 rate = 0, sgi;
- s8 rate_idx = 0;
+ u8 sgi;
+ s8 rate_idx = -1;
bool skip_auto_rate;
struct rate_info txrate;
+ enum nl80211_band band;
+ struct ieee80211_supported_band *sband;
lockdep_assert_held(&ar->data_lock);
@@ -3475,7 +3463,7 @@ ath10k_update_per_peer_tx_stats(struct ath10k *ar,
return;
if (txrate.flags == WMI_RATE_PREAMBLE_VHT && txrate.mcs > 9) {
- ath10k_warn(ar, "Invalid VHT mcs %hhd peer stats", txrate.mcs);
+ ath10k_warn(ar, "Invalid VHT mcs %hhd peer stats", txrate.mcs);
return;
}
@@ -3490,14 +3478,19 @@ ath10k_update_per_peer_tx_stats(struct ath10k *ar,
memset(&arsta->tx_info.status, 0, sizeof(arsta->tx_info.status));
if (txrate.flags == WMI_RATE_PREAMBLE_CCK ||
txrate.flags == WMI_RATE_PREAMBLE_OFDM) {
- rate = ATH10K_HW_LEGACY_RATE(peer_stats->ratecode);
- /* This is hacky, FW sends CCK rate 5.5Mbps as 6 */
- if (rate == 6 && txrate.flags == WMI_RATE_PREAMBLE_CCK)
- rate = 5;
- rate_idx = ath10k_get_legacy_rate_idx(ar, rate);
- if (rate_idx < 0)
+ if (!arsta->arvif || !arsta->arvif->vif)
+ return;
+
+ conf = rcu_dereference(arsta->arvif->vif->chanctx_conf);
+ if (!conf)
+ return;
+
+ band = conf->def.chan->band;
+ sband = &ar->mac.sbands[band];
+ if (ath10k_wmi_get_legacy_rate(ar, sband, peer_stats->ratecode,
+ &arsta->txrate.legacy,
+ &rate_idx))
Using wmi ops to parse rate info breaks ath10k driver architecture,
since the rate info comes from htt layer and nothing related to wmi.
Thanks,
Peter
