From patchwork Thu Mar 26 11:22:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 6097661 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 307BFBF910 for ; Thu, 26 Mar 2015 11:25:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5948A203ED for ; Thu, 26 Mar 2015 11:25:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 68EA9203EC for ; Thu, 26 Mar 2015 11:25:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752483AbbCZLZC (ORCPT ); Thu, 26 Mar 2015 07:25:02 -0400 Received: from mail-lb0-f169.google.com ([209.85.217.169]:34942 "EHLO mail-lb0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752197AbbCZLY6 (ORCPT ); Thu, 26 Mar 2015 07:24:58 -0400 Received: by lbcgn8 with SMTP id gn8so38273753lbc.2 for ; Thu, 26 Mar 2015 04:24:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id; bh=VYal2s/wc6667+hht/gI6E6b/llgWVRf6EJ/USOzpIA=; b=N3zX8Lm4RLXUxyY44Vz2vcaSBz01UMbqyOFLKc8Zyj/Z/uMjKgn9jeaHoQ8a4mCeHp cotgKPRp7pmtvqmWs8G0rQUpMXstdYgoCQnE0VE0j78LRmcDxdfYsXtDGOjJqCYBd4ZU rPujAlAhX4cUGtYrnNCt3VpTHvqTSRr8WRSk0= 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; bh=VYal2s/wc6667+hht/gI6E6b/llgWVRf6EJ/USOzpIA=; b=l9CYkIN3/A4rO+KvkejwMNcyJPVfyjWt5YKJ2nqsst1dacxsz7ECbBTjiclrxyfliW HhUgnWBFj/7A8zIjShgmKK7XQ9U9q9Y1QJzVv/D/F4F4CR0HWXBYN+cjO2r9BvoI5Lae KfqOceBdZzvA2NQTO4sCNfYbJYiGiVNARJdNPokVi79J7vkqFv75Wldpksxr9u93DJIG ZwKIyTOdksiCnbxoqVc9J4l9uU9uLbeOxGqHRH9peYNodW+7scjyzoHfThH/C37hrOY4 ADWQZfAIqiOX36lGLqLpzpgsFpzVsjYLjPLmUjPcmV05Q4AcQAdy8mQDPGt/m0VwF2yw EFrQ== X-Gm-Message-State: ALoCoQkYXAEqthvc8h255E9msZKtEhO7etFfrBCHm/2iA/Z0uVwWnlfgLvRj4FSoqoMV66PMGSAGCG2JL2NyMH+1IlbwCUexBYvJfx60Q/hEEV54RIh+11Xi6nIzb4f2+3kzSsModlQU X-Received: by 10.152.5.194 with SMTP id u2mr12885014lau.88.1427369096770; Thu, 26 Mar 2015 04:24:56 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id dz1sm1184960lbc.47.2015.03.26.04.24.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Mar 2015 04:24:55 -0700 (PDT) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH] ath10k: replenish htc tx credits always Date: Thu, 26 Mar 2015 11:22:23 +0000 Message-Id: <1427368943-29526-1-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 2.1.4 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,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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 There's always at most 2 credits and it makes little sense to set the ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE flag conditionally. This seems to fix some random issues with tx credit starvation on WLAN.RM.2.0-00073 I've been seeing. Note: this isn't related to wmi mgmt tx. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/htc.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c index d33d5c4397f6..0eab8a2ffefe 100644 --- a/drivers/net/wireless/ath/ath10k/htc.c +++ b/drivers/net/wireless/ath/ath10k/htc.c @@ -86,21 +86,6 @@ static void ath10k_htc_notify_tx_completion(struct ath10k_htc_ep *ep, ep->ep_ops.ep_tx_complete(ep->htc->ar, skb); } -/* assumes tx_lock is held */ -static bool ath10k_htc_ep_need_credit_update(struct ath10k_htc_ep *ep) -{ - struct ath10k *ar = ep->htc->ar; - - if (!ep->tx_credit_flow_enabled) - return false; - if (ep->tx_credits >= ep->tx_credits_per_max_message) - return false; - - ath10k_dbg(ar, ATH10K_DBG_HTC, "HTC: endpoint %d needs credit update\n", - ep->eid); - return true; -} - static void ath10k_htc_prepare_tx_skb(struct ath10k_htc_ep *ep, struct sk_buff *skb) { @@ -111,13 +96,10 @@ static void ath10k_htc_prepare_tx_skb(struct ath10k_htc_ep *ep, hdr->eid = ep->eid; hdr->len = __cpu_to_le16(skb->len - sizeof(*hdr)); hdr->flags = 0; + hdr->flags |= ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE; spin_lock_bh(&ep->htc->tx_lock); hdr->seq_no = ep->seq_no++; - - if (ath10k_htc_ep_need_credit_update(ep)) - hdr->flags |= ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE; - spin_unlock_bh(&ep->htc->tx_lock); }