From patchwork Sat Apr 21 06:23:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anilkumar Kolli X-Patchwork-Id: 10353959 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 54152600F6 for ; Sat, 21 Apr 2018 06:21:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4552E2881D for ; Sat, 21 Apr 2018 06:21:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3762C288F4; Sat, 21 Apr 2018 06:21:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 527B42881D for ; Sat, 21 Apr 2018 06:21:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751333AbeDUGV2 (ORCPT ); Sat, 21 Apr 2018 02:21:28 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:58640 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751131AbeDUGV1 (ORCPT ); Sat, 21 Apr 2018 02:21:27 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 00C5B60227; Sat, 21 Apr 2018 06:21:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1524291687; bh=XvLPFrm1Uthd/A27TXbRLewvNZCXaqEWGYjMTIoqnDQ=; h=From:To:Cc:Subject:Date:From; b=UN2oldtIbjzulBxJHOSBUIMiKh+OcGflwHm+VvHuCYvRLtiy1ARXKlPCPtNjiWzKz 1n8K8lTsjFHgfaQEHqotEExxEPoRiGuVblP0gWvn524fAkJlAlDeDyLKIM1cPEtuNW YhG4reM6GfkctkMS7OTpZqCuMBLRJCCy3wA2FQmM= Received: from localhost (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: akolli@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 54EEA60452; Sat, 21 Apr 2018 06:21:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1524291686; bh=XvLPFrm1Uthd/A27TXbRLewvNZCXaqEWGYjMTIoqnDQ=; h=From:To:Cc:Subject:Date:From; b=GHUYAO2KDZZOdxis7pblt1X+vTDmi1+6rq/d6pW/HvyvMXZtVTe9RUDnyhd1zkz5i /Ox5OU/V3w1Q8P8dVViql7Oy+EuO0z3rlSomEuuun1/KZkL0QQ6eO0jlKRC5I24352 Uyz0CCRfAOuqdgWj0yPT5rqRHhdQRdkFDsb2HAs0= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 54EEA60452 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=akolli@codeaurora.org From: Anilkumar Kolli To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org Subject: [RFC v2] ath10k: report tx rate using ieee80211_tx_status() Date: Sat, 21 Apr 2018 11:53:06 +0530 Message-Id: <1524291786-30850-1-git-send-email-akolli@codeaurora.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Mesh path metric needs txrate information from ieee80211_tx_status() call but in ath10k there is no mechanism to report tx rate information via ieee80211_tx_status(), the rate is only accessible via sta_statiscs() op. Per peer stats has tx rate info available, this patch stores per peer last tx rate and updates the tx rate info structures in tx completition. The rate updated in ieee80211_tx_status() is not exactly for the last transmitted frame instead the rate is from one of the previous frames. Per peer txrate information is updated through per peer statistics and is available for QCA9888/QCA9984/QCA4019/QCA998X only Tested on QCA9984 with firmware-5.bin_10.4-3.5.3-00053 Tested on QCA998X with firmware-5.bin_10.2.4-1.0-00036 Signed-off-by: Anilkumar Kolli --- V2: - Removed peer lookup to get the STA context. drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/htt_rx.c | 117 ++++++++++++++++++++---------- drivers/net/wireless/ath/ath10k/mac.c | 13 ---- drivers/net/wireless/ath/ath10k/txrx.c | 15 ++++ drivers/net/wireless/ath/ath10k/wmi.h | 1 + 5 files changed, 95 insertions(+), 52 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index fe6b30356d3b..d0ee02eaa04f 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -364,6 +364,7 @@ struct ath10k_sta { u32 smps; u16 peer_id; struct rate_info txrate; + struct ieee80211_tx_info tx_info; struct work_struct update_wk; u64 rx_duration; diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c index 6d96f9560950..bbe39c4ffbb6 100644 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c @@ -2427,7 +2427,7 @@ void ath10k_htt_htc_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb) dev_kfree_skb_any(skb); } -static inline bool is_valid_legacy_rate(u8 rate) +static inline int get_ath10k_rate_idx(u8 rate) { static const u8 legacy_rates[] = {1, 2, 5, 11, 6, 9, 12, 18, 24, 36, 48, 54}; @@ -2435,10 +2435,10 @@ static inline bool is_valid_legacy_rate(u8 rate) for (i = 0; i < ARRAY_SIZE(legacy_rates); i++) { if (rate == legacy_rates[i]) - return true; + return i; } - return false; + return -EINVAL; } static void @@ -2447,59 +2447,98 @@ static inline bool is_valid_legacy_rate(u8 rate) struct ath10k_per_peer_tx_stats *peer_stats) { struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv; + struct ieee80211_chanctx_conf *conf = NULL; u8 rate = 0, sgi; - struct rate_info txrate; + struct rate_info *txrate = &arsta->txrate; + bool skip_auto_rate; lockdep_assert_held(&ar->data_lock); - txrate.flags = ATH10K_HW_PREAMBLE(peer_stats->ratecode); - txrate.bw = ATH10K_HW_BW(peer_stats->flags); - txrate.nss = ATH10K_HW_NSS(peer_stats->ratecode); - txrate.mcs = ATH10K_HW_MCS_RATE(peer_stats->ratecode); + txrate->flags = ATH10K_HW_PREAMBLE(peer_stats->ratecode); + txrate->bw = ATH10K_HW_BW(peer_stats->flags); + txrate->nss = ATH10K_HW_NSS(peer_stats->ratecode); + txrate->mcs = ATH10K_HW_MCS_RATE(peer_stats->ratecode); sgi = ATH10K_HW_GI(peer_stats->flags); + skip_auto_rate = ATH10K_FW_SKIPPED_RATE_CTRL(peer_stats->flags); - if (txrate.flags == WMI_RATE_PREAMBLE_VHT && txrate.mcs > 9) { - ath10k_warn(ar, "Invalid VHT mcs %hhd peer stats", txrate.mcs); + /* Firmware's rate control skips broadcast/managment frames, if host has + * configure fixed rates and in some other special cases. + */ + if (skip_auto_rate) + return; + + if (txrate->flags == WMI_RATE_PREAMBLE_VHT && txrate->mcs > 9) { + ath10k_warn(ar, "Invalid VHT mcs %hhd peer stats", txrate->mcs); return; } - if (txrate.flags == WMI_RATE_PREAMBLE_HT && - (txrate.mcs > 7 || txrate.nss < 1)) { + if (txrate->flags == WMI_RATE_PREAMBLE_HT && + (txrate->mcs > 7 || txrate->nss < 1)) { ath10k_warn(ar, "Invalid HT mcs %hhd nss %hhd peer stats", - txrate.mcs, txrate.nss); + txrate->mcs, txrate->nss); return; } - memset(&arsta->txrate, 0, sizeof(arsta->txrate)); + memset(&arsta->tx_info.status, 0, sizeof(arsta->tx_info.status)); - if (txrate.flags == WMI_RATE_PREAMBLE_CCK || - txrate.flags == WMI_RATE_PREAMBLE_OFDM) { + if (txrate->flags == WMI_RATE_PREAMBLE_CCK || + txrate->flags == WMI_RATE_PREAMBLE_OFDM) { rate = ATH10K_HW_LEGACY_RATE(peer_stats->ratecode); - - if (!is_valid_legacy_rate(rate)) { - ath10k_warn(ar, "Invalid legacy rate %hhd peer stats", - rate); - return; - } - /* This is hacky, FW sends CCK rate 5.5Mbps as 6 */ - rate *= 10; - if (rate == 60 && txrate.flags == WMI_RATE_PREAMBLE_CCK) - rate = rate - 5; - arsta->txrate.legacy = rate; - } else if (txrate.flags == WMI_RATE_PREAMBLE_HT) { - arsta->txrate.flags = RATE_INFO_FLAGS_MCS; - arsta->txrate.mcs = txrate.mcs + 8 * (txrate.nss - 1); - } else { - arsta->txrate.flags = RATE_INFO_FLAGS_VHT_MCS; - arsta->txrate.mcs = txrate.mcs; + if (rate == 6 && txrate.flags == WMI_RATE_PREAMBLE_CCK) + rate = 5; + txrate->legacy = get_ath10k_rate_idx(rate); + } + txrate->bw = txrate->bw + RATE_INFO_BW_20; + arsta->tx_info.status.rates[0].count = 1; + + switch (txrate->flags) { + case WMI_RATE_PREAMBLE_OFDM: + if (arsta->arvif && arsta->arvif->vif) + conf = rcu_dereference(arsta->arvif->vif->chanctx_conf); + if (conf && conf->def.chan->band == NL80211_BAND_5GHZ) + arsta->tx_info.status.rates[0].idx = txrate->legacy - 4; + break; + case WMI_RATE_PREAMBLE_CCK: + arsta->tx_info.status.rates[0].idx = txrate->legacy; + if (sgi) + arsta->tx_info.status.rates[0].flags |= + (IEEE80211_TX_RC_USE_SHORT_PREAMBLE | + IEEE80211_TX_RC_SHORT_GI); + break; + case WMI_RATE_PREAMBLE_HT: + arsta->tx_info.status.rates[0].idx = + txrate->mcs + ((txrate->nss - 1) * 8); + if (sgi) + arsta->tx_info.status.rates[0].flags |= + IEEE80211_TX_RC_SHORT_GI; + arsta->tx_info.status.rates[0].flags |= IEEE80211_TX_RC_MCS; + break; + case WMI_RATE_PREAMBLE_VHT: + ieee80211_rate_set_vht(&arsta->tx_info.status.rates[0], + txrate->mcs, txrate->nss); + if (sgi) + arsta->tx_info.status.rates[0].flags |= + IEEE80211_TX_RC_SHORT_GI; + arsta->tx_info.status.rates[0].flags |= IEEE80211_TX_RC_VHT_MCS; + break; + } + + switch (txrate->bw) { + case RATE_INFO_BW_40: + arsta->tx_info.status.rates[0].flags |= + IEEE80211_TX_RC_40_MHZ_WIDTH; + break; + case RATE_INFO_BW_80: + arsta->tx_info.status.rates[0].flags |= + IEEE80211_TX_RC_80_MHZ_WIDTH; + break; + default: + break; } - - if (sgi) - arsta->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI; - - arsta->txrate.nss = txrate.nss; - arsta->txrate.bw = txrate.bw + RATE_INFO_BW_20; + + if (peer_stats->succ_pkts) + arsta->tx_info.flags = IEEE80211_TX_STAT_ACK; } static void ath10k_htt_fetch_peer_stats(struct ath10k *ar, diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 7e02ca02b28e..a8f7df0ae97d 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -7673,19 +7673,6 @@ static void ath10k_sta_statistics(struct ieee80211_hw *hw, sinfo->rx_duration = arsta->rx_duration; sinfo->filled |= 1ULL << NL80211_STA_INFO_RX_DURATION; - - if (!arsta->txrate.legacy && !arsta->txrate.nss) - return; - - if (arsta->txrate.legacy) { - sinfo->txrate.legacy = arsta->txrate.legacy; - } else { - sinfo->txrate.mcs = arsta->txrate.mcs; - sinfo->txrate.nss = arsta->txrate.nss; - sinfo->txrate.bw = arsta->txrate.bw; - } - sinfo->txrate.flags = arsta->txrate.flags; - sinfo->filled |= 1ULL << NL80211_STA_INFO_TX_BITRATE; } static const struct ieee80211_ops ath10k_ops = { diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c index 70e23bbf7171..04ed7987d5bc 100644 --- a/drivers/net/wireless/ath/ath10k/txrx.c +++ b/drivers/net/wireless/ath/ath10k/txrx.c @@ -60,6 +60,8 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt, struct ath10k_skb_cb *skb_cb; struct ath10k_txq *artxq; struct sk_buff *msdu; + struct ath10k_sta *arsta; + struct ieee80211_sta *sta = NULL; ath10k_dbg(ar, ATH10K_DBG_HTT, "htt tx completion msdu_id %u status %d\n", @@ -86,6 +88,7 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt, if (txq) { artxq = (void *)txq->drv_priv; artxq->num_fw_queued--; + sta = txq->sta; } ath10k_htt_tx_free_msdu_id(htt, tx_done->msdu_id); @@ -119,6 +122,18 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt, info->flags &= ~IEEE80211_TX_STAT_ACK; } + if (sta) { + spin_lock_bh(&ar->data_lock); + arsta = (struct ath10k_sta *)sta->drv_priv; + info->status.rates[0].idx = + arsta->tx_info.status.rates[0].idx; + info->status.rates[0].count = + arsta->tx_info.status.rates[0].count; + info->status.rates[0].flags = + arsta->tx_info.status.rates[0].flags; + spin_unlock_bh(&ar->data_lock); + } + ieee80211_tx_status(htt->ar->hw, msdu); /* we do not own the msdu anymore */ diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h index c7b30ed9015d..1bea1a2c3157 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.h +++ b/drivers/net/wireless/ath/ath10k/wmi.h @@ -4819,6 +4819,7 @@ enum wmi_rate_preamble { #define ATH10K_HW_GI(flags) (((flags) >> 5) & 0x1) #define ATH10K_HW_RATECODE(rate, nss, preamble) \ (((preamble) << 6) | ((nss) << 4) | (rate)) +#define ATH10K_FW_SKIPPED_RATE_CTRL(flags) (((flags) >> 6) & 0x1) #define VHT_MCS_NUM 10 #define VHT_BW_NUM 4