From patchwork Thu Mar 17 09:51:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 8608981 Return-Path: X-Original-To: patchwork-ath10k@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B437E9F6E1 for ; Thu, 17 Mar 2016 09:49:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E273320304 for ; Thu, 17 Mar 2016 09:49:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D1D4A201CD for ; Thu, 17 Mar 2016 09:49:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1agUYY-0003Z3-7a; Thu, 17 Mar 2016 09:49:26 +0000 Received: from mail-lf0-x22b.google.com ([2a00:1450:4010:c07::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1agUYU-0003NM-84 for ath10k@lists.infradead.org; Thu, 17 Mar 2016 09:49:23 +0000 Received: by mail-lf0-x22b.google.com with SMTP id e138so37059107lfe.1 for ; Thu, 17 Mar 2016 02:49:01 -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:in-reply-to:references; bh=urpKmWU7d6+td1t5yKMfuVDDEVnEEk26MAFSZxV0944=; b=ohFscvP43Ja+sGvucFiGqNEdZ5eLBdJ0w8HjSrzJtWvHhJkZdHJpKpSbTQ8ChCTuPX NKgn1728OQw9brDg/wS1f/ZTwoAPWDSA5z6Zb0LEqrccBGpQ98RS4vipW1SpMZbhl9gJ +9eyAc2NkW/UfV/95OKwi0jbFLdQA6/LNbQR0= 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=urpKmWU7d6+td1t5yKMfuVDDEVnEEk26MAFSZxV0944=; b=MKk6mZEVSZDNXawGW+Z0R9WcYEql3W9FVwWjL0RnJ1h0hffFaEPYubtiV+y4obj1Us UEUletf9FFpLfH9nkBDclt+RrkC2E97JjTwiMS7MSc9sTrdOOvi5+OGh7BTUFfLRdJ7Q mZY85CiRgwIORugoLCMiDQukSY5geJI3gSqM9+aCbq1CWXlIMC2nMHLJgq+3cbio9/X7 lZiDXD5VpRsMpSTA4Aj/YYw66qkTtDtHBF9XvunQIS0Tn8GszY7gZ2XS04QzazFjQmJi lX4DsxYuJZ6dfU0rIH5yMR/ZvvroT11MNHnN0n9cqyFsErpwS/NO5djFXjIvf7GT8Tqy DNFw== X-Gm-Message-State: AD7BkJKTw5u9+96xkZAOAFlRzOCnI21KSbpvLSFOYpdf/vuXNYbseEYSdeOHcOkWyb+Ve85YD5laZEVZ/j0Xl3/e7BCgt0ls2mFJZ+KyOKNWE4ILx0LcoeqRI9FsFwAbIwtQJQL67PEku8ndeNI6hRhbsnur/8n2EQEqiE3jeBtZwclNehIi1kcjBz7ePXD0vA== X-Received: by 10.25.85.145 with SMTP id j139mr3243847lfb.131.1458208139560; Thu, 17 Mar 2016 02:48:59 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.10]) by smtp.gmail.com with ESMTPSA id m64sm1213020lfd.36.2016.03.17.02.48.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Mar 2016 02:48:58 -0700 (PDT) From: Michal Kazior To: ath10k@lists.infradead.org Subject: [PATCH 1/2] ath10k: fix tx hang Date: Thu, 17 Mar 2016 10:51:04 +0100 Message-Id: <1458208265-16715-2-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458208265-16715-1-git-send-email-michal.kazior@tieto.com> References: <1458208265-16715-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160317_024922_589678_320BE6B3 X-CRM114-Status: GOOD ( 10.17 ) X-Spam-Score: -2.7 (--) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-wireless@vger.kernel.org, Michal Kazior MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,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 The wake_tx_queue/push_pending logic had a bug which could stop queues indefinitely effectivelly breaking traffic. Fixes: 299468782d94 ("ath10k: implement wake_tx_queue") Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index ebff9c0a0784..74dd010a9188 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -3779,13 +3779,13 @@ void ath10k_mac_tx_push_pending(struct ath10k *ar) } list_del_init(&artxq->list); + if (ret != -ENOENT) + list_add_tail(&artxq->list, &ar->txqs); + ath10k_htt_tx_txq_update(hw, txq); - if (artxq == last || (ret < 0 && ret != -ENOENT)) { - if (ret != -ENOENT) - list_add_tail(&artxq->list, &ar->txqs); + if (artxq == last || (ret < 0 && ret != -ENOENT)) break; - } } rcu_read_unlock();