From patchwork Tue Mar 1 10:32:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 8463991 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 986F5C0553 for ; Tue, 1 Mar 2016 10:32:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A797B2012D for ; Tue, 1 Mar 2016 10:32:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DA29D202B8 for ; Tue, 1 Mar 2016 10:32:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753148AbcCAKca (ORCPT ); Tue, 1 Mar 2016 05:32:30 -0500 Received: from mail-lf0-f43.google.com ([209.85.215.43]:32842 "EHLO mail-lf0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753086AbcCAKcX (ORCPT ); Tue, 1 Mar 2016 05:32:23 -0500 Received: by mail-lf0-f43.google.com with SMTP id v124so17124580lff.0 for ; Tue, 01 Mar 2016 02:32:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2U03irJLNg1F3PY6iiibuOF/Bs3ccN0nnpRxR8GfYzE=; b=Sq7+UZdz+nRSPWlQs0to10qs3nh75iP8dMsvvafDr4helPaZGVGR67nDTO7ntE7ajT AfJ3eiVKmMjIL+QI1F1cIO31poLYTig3aV+DTmcH7keppIB15FUS/niVagWsNxyQsjcY XDJjraDTPpcLAgnSZHA1ECIxHwhUWdFG9sU64= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2U03irJLNg1F3PY6iiibuOF/Bs3ccN0nnpRxR8GfYzE=; b=PYZuBQiKz2/lHrubj0yueunSnKNoiX30Mt5q9Pn9CzeEXw4GbFMANXF7luZ+KcYe9t YXZ9poyX3M3BbrYBJHWm7+AxJwBe8ou6MJkvzADOeAlfuHQ2u4p4NMXCqTFl2CgFm7dz ykWVE4ypQ0SpXBnjlo3FHrAwHQ7G1S/VcSgGySVG4fJ9chjOXaJEoFxqQT9iQojfuFTI p/Gja9ea3ykdZTIhRduIFSbCp1jEPW7HAJQHng9e6F5+YG0NP8rOCmJgXwnSSqt8bvu1 hKpEpTfwzLvr1yLFISBGOX0hF1APA75ZPXvhP4M+jT2meyVbcYfhsEIeumD/2EnBlPfA fJpw== X-Gm-Message-State: AD7BkJLUD4EZo/Wah9M9tS2hQ4cuq5zTlpSSR88VrgdPEQlds0mYK3L3yObd7ewhRmopzJpQeF6VLRYtvFtOyDEX6Yf/+jVq2D3AapIXrulJpse1Z2vC7p+PY+16zIzyrEB6ybVE+eaPBQ== X-Received: by 10.25.168.67 with SMTP id r64mr6031998lfe.104.1456828342160; Tue, 01 Mar 2016 02:32:22 -0800 (PST) Received: from localhost.localdomain ([91.198.246.10]) by smtp.gmail.com with ESMTPSA id i2sm4644857lfd.43.2016.03.01.02.32.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Mar 2016 02:32:21 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH v2 10/11] ath10k: keep track of queue depth per txq Date: Tue, 1 Mar 2016 11:32:55 +0100 Message-Id: <1456828376-2795-11-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1456828376-2795-1-git-send-email-michal.kazior@tieto.com> References: <1453384006-31907-1-git-send-email-michal.kazior@tieto.com> <1456828376-2795-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This will be necessary for later. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/mac.c | 5 +++++ drivers/net/wireless/ath/ath10k/txrx.c | 7 +++++++ 3 files changed, 13 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 89f789f3e5b4..926ecb2244a5 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -311,6 +311,7 @@ struct ath10k_peer { struct ath10k_txq { struct list_head list; + unsigned long num_fw_queued; }; struct ath10k_sta { diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 8d02d53fdc2c..5bf614f1f75a 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -3669,6 +3669,7 @@ static int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw, const bool is_presp = false; struct ath10k *ar = hw->priv; struct ath10k_htt *htt = &ar->htt; + struct ath10k_txq *artxq = (void *)txq->drv_priv; struct ieee80211_vif *vif = txq->vif; struct ieee80211_sta *sta = txq->sta; enum ath10k_hw_txrx_mode txmode; @@ -3708,6 +3709,10 @@ static int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw, return ret; } + spin_lock_bh(&ar->htt.tx_lock); + artxq->num_fw_queued++; + spin_unlock_bh(&ar->htt.tx_lock); + return 0; } diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c index 202e5192235b..ea4d3000c8c3 100644 --- a/drivers/net/wireless/ath/ath10k/txrx.c +++ b/drivers/net/wireless/ath/ath10k/txrx.c @@ -55,7 +55,9 @@ void ath10k_txrx_tx_unref(struct ath10k_htt *htt, struct ath10k *ar = htt->ar; struct device *dev = ar->dev; struct ieee80211_tx_info *info; + struct ieee80211_txq *txq; struct ath10k_skb_cb *skb_cb; + struct ath10k_txq *artxq; struct sk_buff *msdu; bool limit_mgmt_desc = false; @@ -80,11 +82,16 @@ void ath10k_txrx_tx_unref(struct ath10k_htt *htt, } skb_cb = ATH10K_SKB_CB(msdu); + txq = skb_cb->txq; + artxq = (void *)txq->drv_priv; if (unlikely(skb_cb->flags & ATH10K_SKB_F_MGMT) && ar->hw_params.max_probe_resp_desc_thres) limit_mgmt_desc = true; + if (txq) + artxq->num_fw_queued--; + ath10k_htt_tx_free_msdu_id(htt, tx_done->msdu_id); ath10k_htt_tx_dec_pending(htt, limit_mgmt_desc); if (htt->num_pending_tx == 0)