When QCA6174/QCA9377 working in station mode, after connected
to AP, tx bitrate is always '1.0 MBit/s' in output of command
'iw wlan0 link'.
That's because the parameters to calculate the tx bitrate are
not well updated for QCA6174/QCA9377.
To fix this issue:
1. Add processing for HTT_T2H_MSG_TYPE_PPDU_STATS_IND which includes
the peer tx stats;
2. Map WMI_TLV_SERVICE_PEER_STATS_INFO to WMI_SERVICE_PEER_STATS to
enable the feature.
Tested with QCA6174 PCIe with firmware WLAN.RM.4.4.1.c3-00031.
Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00029.
Signed-off-by: Yu Wang <yyuwang@xxxxxxxxxxxxxx>
---
drivers/net/wireless/ath/ath10k/htt.c | 2 +
drivers/net/wireless/ath/ath10k/htt.h | 30 ++++++++++++++
drivers/net/wireless/ath/ath10k/htt_rx.c | 65 +++++++++++++++++++++++++++++++
drivers/net/wireless/ath/ath10k/wmi-tlv.c | 4 ++
drivers/net/wireless/ath/ath10k/wmi-tlv.h | 3 ++
5 files changed, 104 insertions(+)
diff --git a/drivers/net/wireless/ath/ath10k/htt.c b/drivers/net/wireless/ath/ath10k/htt.c
index 7b75200..c32ab07 100644
--- a/drivers/net/wireless/ath/ath10k/htt.c
+++ b/drivers/net/wireless/ath/ath10k/htt.c
@@ -89,6 +89,8 @@ static const enum htt_t2h_msg_type htt_tlv_t2h_msg_types[] = {
[HTT_TLV_T2H_MSG_TYPE_RX_OFLD_PKT_ERR] =
HTT_T2H_MSG_TYPE_RX_OFLD_PKT_ERR,
[HTT_TLV_T2H_MSG_TYPE_TEST] = HTT_T2H_MSG_TYPE_TEST,
+ [HTT_TLV_T2H_MSG_TYPE_PPDU_STATS_IND] =
+ HTT_T2H_MSG_TYPE_PPDU_STATS_IND,
};
static const enum htt_t2h_msg_type htt_10_4_t2h_msg_types[] = {
diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h
index 30c0800..e2aae263 100644
--- a/drivers/net/wireless/ath/ath10k/htt.h
+++ b/drivers/net/wireless/ath/ath10k/htt.h
@@ -450,6 +450,13 @@ enum htt_tlv_t2h_msg_type {
HTT_TLV_T2H_MSG_TYPE_WDI_IPA_OP_RESPONSE = 0x14,
HTT_TLV_T2H_MSG_TYPE_CHAN_CHANGE = 0x15,
HTT_TLV_T2H_MSG_TYPE_RX_OFLD_PKT_ERR = 0x16,
+ HTT_TLV_T2H_MSG_TYPE_RATE_REPORT = 0x17,
+ HTT_TLV_T2H_MSG_TYPE_FLOW_POOL_MAP = 0x18,
+ HTT_TLV_T2H_MSG_TYPE_FLOW_POOL_UNMAP = 0x19,
+ HTT_TLV_T2H_MSG_TYPE_SRING_SETUP_DONE = 0x1a,
+ HTT_TLV_T2H_MSG_TYPE_MAP_FLOW_INFO = 0x1b,
+ HTT_TLV_T2H_MSG_TYPE_EXT_STATS_CONF = 0x1c,
+ HTT_TLV_T2H_MSG_TYPE_PPDU_STATS_IND = 0x1d,
HTT_TLV_T2H_MSG_TYPE_TEST,
/* keep this last */
HTT_TLV_T2H_NUM_MSGS
@@ -519,6 +526,7 @@ enum htt_t2h_msg_type {
HTT_T2H_MSG_TYPE_TX_FETCH_CONFIRM,
HTT_T2H_MSG_TYPE_TX_MODE_SWITCH_IND,
HTT_T2H_MSG_TYPE_PEER_STATS,
+ HTT_T2H_MSG_TYPE_PPDU_STATS_IND,
/* keep this last */
HTT_T2H_NUM_MSGS
};
@@ -1750,6 +1758,27 @@ struct htt_peer_tx_stats {
u8 payload[0];
} __packed;
+struct htt_tx_ppdu_stats_info {
+ __le32 tlv_hdr;
+ __le32 tx_success_bytes;
+ __le32 tx_retry_bytes;
+ __le32 tx_failed_bytes;
+ u8 tx_ratecode;
+ u8 flags;
+ __le16 peer_id;
+ __le16 tx_success_msdus;
+ __le16 tx_retry_msdus;
+ __le16 tx_failed_msdus;
+ __le16 tx_duration;
+} __packed;
+
+struct htt_ppdu_stats {
+ u8 pad[3];
+ __le32 tlv_hdr;
+ __le32 num_ppdu;
+ struct htt_tx_ppdu_stats_info tx_ppdu_stats[0];
+} __packed;
+
#define ATH10K_10_2_TX_STATS_OFFSET 136
#define PEER_STATS_FOR_NO_OF_PPDUS 4
@@ -1823,6 +1852,7 @@ struct htt_resp {
struct htt_tx_mode_switch_ind tx_mode_switch_ind;
struct htt_channel_change chan_change;
struct htt_peer_tx_stats peer_tx_stats;
+ struct htt_ppdu_stats ppdu_stats;
};
} __packed;
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index d95b63f..cde2d9b 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -3723,6 +3723,68 @@ static void ath10k_htt_rx_sec_ind_handler(struct ath10k *ar,
spin_unlock_bh(&ar->data_lock);
}
+static void
+ath10k_htt_process_ppdu_stats(struct ath10k *ar, struct sk_buff *skb)
+{
+ struct htt_resp *resp = (struct htt_resp *)skb->data;
+ struct ath10k_per_peer_tx_stats *p_tx_stats = &ar->peer_tx_stats;
+ struct htt_tx_ppdu_stats_info *tx_stats;
+ struct ieee80211_sta *sta;
+ struct ath10k_sta *arsta;
+ struct ath10k_peer *peer;
+ u32 peer_id, i;
+ u8 num_ppdu;
+
+ num_ppdu = resp->ppdu_stats.num_ppdu;
+ tx_stats = &resp->ppdu_stats.tx_ppdu_stats[0];
+ peer_id = __le16_to_cpu(tx_stats->peer_id);
+
+ rcu_read_lock();
+ spin_lock_bh(&ar->data_lock);
+
+ peer = ath10k_peer_find_by_id(ar, peer_id);
+ if (!peer)
+ goto err;
+
+ sta = peer->sta;
+ if (!sta)
+ goto err;
+
+ for (i = 0; i < num_ppdu; i++) {
+ tx_stats = &resp->ppdu_stats.tx_ppdu_stats[i];
+ arsta = (struct ath10k_sta *)sta->drv_priv;
+
+ p_tx_stats->succ_bytes =
+ __le32_to_cpu(tx_stats->tx_success_bytes);
+ p_tx_stats->retry_bytes =
+ __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->flags = tx_stats->flags;
+ p_tx_stats->succ_pkts =
+ __le16_to_cpu(tx_stats->tx_success_msdus);
+ p_tx_stats->retry_pkts =
+ __le16_to_cpu(tx_stats->tx_retry_msdus);
+ p_tx_stats->failed_pkts =
+ __le16_to_cpu(tx_stats->tx_failed_msdus);
+ p_tx_stats->duration =
+ __le16_to_cpu(tx_stats->tx_duration);
+
+ ath10k_update_per_peer_tx_stats(ar, sta, p_tx_stats);
+ }
+
+ spin_unlock_bh(&ar->data_lock);
+ rcu_read_unlock();
+
+ return;
+
+err:
+ spin_unlock_bh(&ar->data_lock);
+ rcu_read_unlock();
+ ath10k_warn(ar, "invalid ppdu stats received\n");
+}
+
bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)
{
struct ath10k_htt *htt = &ar->htt;
@@ -3910,6 +3972,9 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)
case HTT_T2H_MSG_TYPE_PEER_STATS:
ath10k_htt_fetch_peer_stats(ar, skb);
break;
+ case HTT_T2H_MSG_TYPE_PPDU_STATS_IND:
+ ath10k_htt_process_ppdu_stats(ar, skb);
+ break;
case HTT_T2H_MSG_TYPE_EN_STATS:
default:
ath10k_warn(ar, "htt event (%d) not handled\n",
diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.c b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
index 69a1ec5..ae12a58 100644
--- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c
+++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
@@ -1849,6 +1849,10 @@ static struct sk_buff *ath10k_wmi_tlv_op_gen_init(struct ath10k *ar)
if (test_bit(WMI_SERVICE_TX_DATA_ACK_RSSI, ar->wmi.svc_map))
cfg->host_capab |= __cpu_to_le32(WMI_RSRC_CFG_FLAG_TX_ACK_RSSI);
+ if (ath10k_peer_stats_enabled(ar))
+ cfg->host_capab |=
+ __cpu_to_le32(WMI_RSRC_CFG_FLAG_TX_PPDU_STATS);
+
ath10k_wmi_tlv_put_host_mem_chunks(ar, chunks);
ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv init\n");
diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.h b/drivers/net/wireless/ath/ath10k/wmi-tlv.h
index 4972dc1..6635d96 100644
--- a/drivers/net/wireless/ath/ath10k/wmi-tlv.h
+++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.h
@@ -16,6 +16,7 @@
#define WMI_TLV_VDEV_PARAM_UNSUPPORTED 0
#define WMI_TLV_MGMT_TX_FRAME_MAX_LEN 64
+#define WMI_RSRC_CFG_FLAG_TX_PPDU_STATS BIT(11)
#define WMI_RSRC_CFG_FLAG_TX_ACK_RSSI BIT(18)
enum wmi_tlv_grp_id {
@@ -1600,6 +1601,8 @@ wmi_tlv_svc_map(const __le32 *in, unsigned long *out, size_t len)
WMI_SERVICE_MESH_11S, len);
SVCMAP(WMI_TLV_SERVICE_SYNC_DELETE_CMDS,
WMI_SERVICE_SYNC_DELETE_CMDS, len);
+ SVCMAP(WMI_TLV_SERVICE_PEER_STATS_INFO,
+ WMI_SERVICE_PEER_STATS, len);
}
static inline void
--
2.7.4
