From patchwork Fri Mar 23 14:07:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anilkumar Kolli X-Patchwork-Id: 10304761 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 4F8DC600F6 for ; Fri, 23 Mar 2018 14:06:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F58E28E38 for ; Fri, 23 Mar 2018 14:06:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 33E1528ED3; Fri, 23 Mar 2018 14:06:41 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C260228E38 for ; Fri, 23 Mar 2018 14:06:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=exwHoqFzzBqvMAl7Kz8iJLM7zk5sp2Hl2iwZxJ0PbdY=; b=OiY 1LodxIfL9UdQolx+Mq1QqaP9LzrgF6+om+YXqc8OppkJVeqEI8wJJXSaYNiHrlhFZFSIfKkoqOGpS KurDU7KZjxdC8CkJkcqBNRt2afhSplgVamz1WGtPTLuICR4E9smnxCdKnJzewLJ/s4rMEJXXQrZnu WgJYMsVOrLp9b7Njs88daPnh293SHvWpGSm75pqZ/7v7UuGw48DiJ6Gyw+eTICSARwc1t8TEQCIX3 OyLSvU8rowZOBzfpisxsQIXs2UR0mIdvbu8dpzu6GaufFFu8sCWAyRPjV2XtYRBIwou+MmhHGAzg9 PDu1qRmKl0FiUI7KaMXnOH1/VGmEB/g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ezNL1-0003zt-5f; Fri, 23 Mar 2018 14:06:35 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ezNKy-0003yT-H3 for ath10k@lists.infradead.org; Fri, 23 Mar 2018 14:06:34 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id F336560588; Fri, 23 Mar 2018 14:06:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521813982; bh=5gTsegar5osL1z1zg0fvytYCtAVvxv33rjKX33DF3ws=; h=From:To:Cc:Subject:Date:From; b=nD+Fy5WXfqaEf1JDeWBtMrcRekicL4auRTq8ftq/coZKjoo5qREtjZvbB0WMMhg1R nUIAtCtmAsxwfVFBR1XekZIwzLBBSbw3lCA0ozvsUJDjtVwwYZsdN6DvvbImLoAWni K54yXNaNJ4BiCG34mOPWtE4bJKte4inTDv94/EZk= 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 CB2AF6025C; Fri, 23 Mar 2018 14:06:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1521813981; bh=5gTsegar5osL1z1zg0fvytYCtAVvxv33rjKX33DF3ws=; h=From:To:Cc:Subject:Date:From; b=fTk/W+DIT+h8fYH67mZCKj2nN6ZL2NbjFIQWw4rvHAbvUergqyzHAYHYj4HxvP5Jt CVg1AcoajtDHqlJhySVPeY1TagLOJFZR/9+KWWhAR3xjG2SCmdiD+dbZQdouxbdQ92 WWCDqr9RVS3jqRRVJJR2xypJcWVK1i3dRUSNSh1I= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org CB2AF6025C 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 Subject: [PATCH v2] ath10k: Implement get_expected_throughput callback Date: Fri, 23 Mar 2018 19:37:14 +0530 Message-Id: <1521814034-17880-1-git-send-email-akolli@codeaurora.org> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180323_070632_725637_881E90E0 X-CRM114-Status: GOOD ( 10.52 ) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-wireless@vger.kernel.org MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Enable support for 'drv_get_expected_throughput' callback. Export expected throughput if available to cfg80211/nl80211. Signed-off-by: Anilkumar Kolli Signed-off-by: Tamizh chelvam --- v2: - update the avg for all the transmitted frames(Sven) - remove the unnecessary NL80211_STA_INFO_EXPECTED_THROUGHPUT update(Sven) drivers/net/wireless/ath/ath10k/core.h | 5 +++++ drivers/net/wireless/ath/ath10k/htt_rx.c | 4 ++++ drivers/net/wireless/ath/ath10k/mac.c | 9 +++++++++ 3 files changed, 18 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index fe6b30356d3b..8e10f7d83a79 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2005-2011 Atheros Communications Inc. * Copyright (c) 2011-2017 Qualcomm Atheros, Inc. + * Copyright (c) 2018, The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -37,6 +38,7 @@ #include "thermal.h" #include "wow.h" #include "swap.h" +#include #define MS(_v, _f) (((_v) & _f##_MASK) >> _f##_LSB) #define SM(_v, _f) (((_v) << _f##_LSB) & _f##_MASK) @@ -354,6 +356,8 @@ struct ath10k_txq { unsigned long num_push_allowed; }; +DECLARE_EWMA(sta_txrate, 4, 16) + struct ath10k_sta { struct ath10k_vif *arvif; @@ -367,6 +371,7 @@ struct ath10k_sta { struct work_struct update_wk; u64 rx_duration; + struct ewma_sta_txrate ave_sta_txrate; #ifdef CONFIG_MAC80211_DEBUGFS /* protected by conf_mutex */ diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c index 6d96f9560950..9fd8b22552c6 100644 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c @@ -2449,6 +2449,7 @@ static inline bool is_valid_legacy_rate(u8 rate) struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv; u8 rate = 0, sgi; struct rate_info txrate; + u32 tx_bitrate; lockdep_assert_held(&ar->data_lock); @@ -2500,6 +2501,9 @@ static inline bool is_valid_legacy_rate(u8 rate) arsta->txrate.nss = txrate.nss; arsta->txrate.bw = txrate.bw + RATE_INFO_BW_20; + + tx_bitrate = cfg80211_calculate_bitrate(&arsta->txrate); + ewma_sta_txrate_add(&arsta->ave_sta_txrate, tx_bitrate); } 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..33e790cf5c42 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -7688,6 +7688,14 @@ static void ath10k_sta_statistics(struct ieee80211_hw *hw, sinfo->filled |= 1ULL << NL80211_STA_INFO_TX_BITRATE; } +static u32 ath10k_get_expected_throughput(struct ieee80211_hw *hw, + struct ieee80211_sta *sta) +{ + struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv; + + return ewma_sta_txrate_read(&arsta->ave_sta_txrate); +} + static const struct ieee80211_ops ath10k_ops = { .tx = ath10k_mac_op_tx, .wake_tx_queue = ath10k_mac_op_wake_tx_queue, @@ -7730,6 +7738,7 @@ static void ath10k_sta_statistics(struct ieee80211_hw *hw, .switch_vif_chanctx = ath10k_mac_op_switch_vif_chanctx, .sta_pre_rcu_remove = ath10k_mac_op_sta_pre_rcu_remove, .sta_statistics = ath10k_sta_statistics, + .get_expected_throughput = ath10k_get_expected_throughput, CFG80211_TESTMODE_CMD(ath10k_tm_cmd)