From: Yu Wang <yyuwang@codeaurora.org>
To: ath10k@lists.infradead.org
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH v2 2/2] ath10k: correct legacy rate in tx stats
Date: Tue, 19 Nov 2019 07:19:57 +0000 [thread overview]
Message-ID: <0101016e82883ded-63f88383-cd90-4cb0-b9bb-3dd6a1e9f4e9-000000@us-west-2.amazonses.com> (raw)
In-Reply-To: <1574147982-3956-1-git-send-email-yyuwang@codeaurora.org>
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@codeaurora.org>
---
drivers/net/wireless/ath/ath10k/htt_rx.c | 83 +++++++++++++++++++++++++++++++-
drivers/net/wireless/ath/ath10k/mac.c | 2 +-
drivers/net/wireless/ath/ath10k/mac.h | 1 +
3 files changed, 83 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index cde2d9b..796c8c0 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -3455,7 +3455,7 @@ 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;
+ s8 rate_idx = -1;
bool skip_auto_rate;
struct rate_info txrate;
@@ -3497,6 +3497,12 @@ ath10k_update_per_peer_tx_stats(struct ath10k *ar,
rate_idx = ath10k_get_legacy_rate_idx(ar, rate);
if (rate_idx < 0)
return;
+
+ /* from 1Mbps to 100Kbps */
+ rate = rate * 10;
+ if (rate == 50)
+ rate = 55;
+
arsta->txrate.legacy = rate;
} else if (txrate.flags == WMI_RATE_PREAMBLE_HT) {
arsta->txrate.flags = RATE_INFO_FLAGS_MCS;
@@ -3723,6 +3729,74 @@ static void ath10k_htt_rx_sec_ind_handler(struct ath10k *ar,
spin_unlock_bh(&ar->data_lock);
}
+static int
+ath10k_htt_update_ratecode(struct ath10k *ar, struct ath10k_sta *arsta,
+ u8 *ratecode)
+{
+ u8 hw_rate, preamble;
+ u16 bitrate;
+ int i;
+ const struct ieee80211_rate *bitrates;
+ bool cck;
+ struct ieee80211_chanctx_conf *conf = NULL;
+ enum nl80211_band band;
+ struct ieee80211_supported_band *sband;
+
+ if (!ratecode)
+ return -EINVAL;
+
+ /* only for legacy ratecode */
+ preamble = ATH10K_HW_PREAMBLE(*ratecode);
+ if (preamble != WMI_RATE_PREAMBLE_CCK &&
+ preamble != WMI_RATE_PREAMBLE_OFDM)
+ return 0;
+
+ if (!arsta->arvif || !arsta->arvif->vif)
+ return -EINVAL;
+
+ WARN_ON(!rcu_read_lock_held());
+ conf = rcu_dereference(arsta->arvif->vif->chanctx_conf);
+ if (!conf)
+ return -EINVAL;
+
+ band = conf->def.chan->band;
+ sband = &ar->mac.sbands[band];
+ if (!sband->bitrates)
+ return -EINVAL;
+
+ if (WARN_ON_ONCE(sband->n_bitrates > S8_MAX))
+ return -EINVAL;
+
+ cck = (preamble == WMI_RATE_PREAMBLE_CCK);
+ hw_rate = ATH10K_HW_LEGACY_RATE(*ratecode);
+ for (i = 0; i < sband->n_bitrates; i++) {
+ bitrates = &sband->bitrates[i];
+ if (ath10k_mac_bitrate_is_cck(bitrates->bitrate) != cck)
+ continue;
+
+ if (bitrates->hw_value == hw_rate ||
+ (bitrates->flags & IEEE80211_RATE_SHORT_PREAMBLE &&
+ bitrates->hw_value_short == hw_rate)) {
+ bitrate = bitrates->bitrate;
+
+ /* The bitrate will be recovered in
+ * ath10k_update_per_peer_tx_stats().
+ */
+ if (bitrate == 55)
+ bitrate = 60;
+
+ bitrate = bitrate / 10;
+
+ /* replace hw_value with bitrate in ratecode */
+ *ratecode = ATH10K_HW_RATECODE(bitrate, 0, preamble);
+ return 0;
+ }
+ }
+
+ ath10k_warn(ar, "Invalid legacy ratecode %hhd ppdu stats", *ratecode);
+ return -EINVAL;
+}
+
static void
ath10k_htt_process_ppdu_stats(struct ath10k *ar, struct sk_buff *skb)
{
@@ -3734,6 +3808,7 @@ ath10k_htt_process_ppdu_stats(struct ath10k *ar, struct sk_buff *skb)
struct ath10k_peer *peer;
u32 peer_id, i;
u8 num_ppdu;
+ u8 ratecode;
num_ppdu = resp->ppdu_stats.num_ppdu;
tx_stats = &resp->ppdu_stats.tx_ppdu_stats[0];
@@ -3753,6 +3828,10 @@ ath10k_htt_process_ppdu_stats(struct ath10k *ar, struct sk_buff *skb)
for (i = 0; i < num_ppdu; i++) {
tx_stats = &resp->ppdu_stats.tx_ppdu_stats[i];
arsta = (struct ath10k_sta *)sta->drv_priv;
+ ratecode = tx_stats->tx_ratecode;
+
+ if (ath10k_htt_update_ratecode(ar, arsta, &ratecode))
+ goto err;
p_tx_stats->succ_bytes =
__le32_to_cpu(tx_stats->tx_success_bytes);
@@ -3760,7 +3839,7 @@ ath10k_htt_process_ppdu_stats(struct ath10k *ar, struct sk_buff *skb)
__le32_to_cpu(tx_stats->tx_retry_bytes);
p_tx_stats->failed_bytes =
__le32_to_cpu(tx_stats->tx_failed_bytes);
- p_tx_stats->ratecode = tx_stats->tx_ratecode;
+ p_tx_stats->ratecode = ratecode;
p_tx_stats->flags = tx_stats->flags;
p_tx_stats->succ_pkts =
__le16_to_cpu(tx_stats->tx_success_msdus);
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 83cc877..95a5069 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -94,7 +94,7 @@ static struct ieee80211_rate ath10k_rates_rev2[] = {
#define ath10k_wmi_legacy_rates ath10k_rates
-static bool ath10k_mac_bitrate_is_cck(int bitrate)
+bool ath10k_mac_bitrate_is_cck(int bitrate)
{
switch (bitrate) {
case 10:
diff --git a/drivers/net/wireless/ath/ath10k/mac.h b/drivers/net/wireless/ath/ath10k/mac.h
index 98d83a2..cc245b1 100644
--- a/drivers/net/wireless/ath/ath10k/mac.h
+++ b/drivers/net/wireless/ath/ath10k/mac.h
@@ -28,6 +28,7 @@ struct rfc1042_hdr {
__be16 snap_type;
} __packed;
+bool ath10k_mac_bitrate_is_cck(int bitrate);
struct ath10k *ath10k_mac_create(size_t priv_size);
void ath10k_mac_destroy(struct ath10k *ar);
int ath10k_mac_register(struct ath10k *ar);
--
2.7.4
next prev parent reply other threads:[~2019-11-19 7:19 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1574147982-3956-1-git-send-email-yyuwang@codeaurora.org>
2019-11-19 7:19 ` [PATCH v2 2/2] ath10k: correct legacy rate in tx stats Yu Wang
2020-03-24 14:35 ` Kalle Valo
2020-03-24 14:35 ` Kalle Valo
2020-03-24 14:40 ` Kalle Valo
2020-03-24 14:40 ` Kalle Valo
2020-04-09 14:13 ` Kalle Valo
2020-04-09 14:13 ` Kalle Valo
2019-11-19 7:19 ` [PATCH v2 1/2] ath10k: add ppdu stats support for QCA6174/QCA9377 Yu Wang
2020-04-07 5:27 ` Kalle Valo
2020-04-07 5:27 ` Kalle Valo
2019-11-19 7:19 ` Yu Wang
2019-11-19 7:19 ` Yu Wang [this message]
2020-04-09 14:21 ` [PATCH v2 2/2] ath10k: correct legacy rate in tx stats Kalle Valo
2020-04-14 5:32 ` Yu Wang
2020-04-14 5:32 ` Yu Wang
2020-04-14 8:53 ` Tom Psyborg
2020-04-14 8:53 ` Tom Psyborg
2020-04-09 14:21 ` Kalle Valo
2019-11-19 0:20 [PATCH v2 0/2] ath10k: correct tx bitrate for QCA6174/QCA9377/QCA9888 root
2019-11-19 0:20 ` [PATCH v2 2/2] ath10k: correct legacy rate in tx stats root
2019-11-19 0:20 ` root
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0101016e82883ded-63f88383-cd90-4cb0-b9bb-3dd6a1e9f4e9-000000@us-west-2.amazonses.com \
--to=yyuwang@codeaurora.org \
--cc=ath10k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.