From patchwork Wed May 18 04:09:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Schaa X-Patchwork-Id: 623381 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3r8gm01Sntz9t3n for ; Wed, 18 May 2016 14:13:04 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=googlemail.com header.i=@googlemail.com header.b=OVirbZ1y; dkim-atps=neutral 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 1b2spH-0000LZ-Ts; Wed, 18 May 2016 04:11:15 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b2spE-0000EU-RZ for lede-dev@lists.infradead.org; Wed, 18 May 2016 04:11:13 +0000 Received: by mail-wm0-x243.google.com with SMTP id r12so9548637wme.0 for ; Tue, 17 May 2016 21:10:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JdAWCWQAes/sM39bn+c7NM7tMOcBavkQaVb2aZ5dD2A=; b=OVirbZ1y9MBLX4JdvP95rBzyR2U0CfLgsBCWPwWuujIw+GuMuOlU7drZ0m9bB7Z2nS w29t4cE5d75cACGPI8rkUnBlLB6ZK0ooVGWkouThD/XfpX8fPTk30fYWyNyXhNKDsuNK ZXAbQ7JrPlh62MUWhsrTDCp/hk281NTJItYHvRCy6aSEj5w0y+VmK0i02KmIpOEI8Gvw tMr7bIB+i8fa3oEJ9UKGPe9ap7gSfuKzmsLP3bvx0bRJT3xDCcbNaYaljfg2QXR9+BwN vepUkkODuIoyEfzS9UhF6OQj3R04kUN5g0qyXSSDHP/gCd7LVE7sTXhk1R74j8n98HQd KZHw== 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=JdAWCWQAes/sM39bn+c7NM7tMOcBavkQaVb2aZ5dD2A=; b=SqZQO165swkmdGx/ide8lHJDiKquY+RBPt2/8gix11AWhfPocwXF+qS+yUzgEhQGot qZzvPWOwOwd3UTe5dA8JNrEIQv1OtSDGdXgKAaXNgX1VDl3G67neGNGS2TeZu/pPjhn0 ZqJXQtaoSL5IJ6SU08zw5S3Em1Eiob90BsuNW07V3BEY0K/vbtCFECLOw1tQ9t/c0bGS r9WTOYcAq6hw246bYSqIUFcpyE9ZpXmqcC5099lz6xl+XGW618kX6i7H0PzAEZ31ZvR3 TAv1vLxqb1B/ZmhV+0D3VoyBhqfVHitr3M6Laxlhw2wRSNWoxUjqD3z1Cu/4Oovfc27r hZMw== X-Gm-Message-State: AOPr4FWTgvJ3bDNlyO3fUpTIngqosWqM5AtkVdJsbqR7gcQjF0V6K//epTPno4idjWseNg== X-Received: by 10.28.0.78 with SMTP id 75mr4621462wma.20.1463544651348; Tue, 17 May 2016 21:10:51 -0700 (PDT) Received: from hschaa-desktop.site ([5.158.136.57]) by smtp.gmail.com with ESMTPSA id k62sm27213790wmb.7.2016.05.17.21.10.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 May 2016 21:10:50 -0700 (PDT) From: Helmut Schaa To: lede-dev@lists.infradead.org Date: Wed, 18 May 2016 06:09:59 +0200 Message-Id: <1463544599-25569-2-git-send-email-helmut.schaa@googlemail.com> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1463544599-25569-1-git-send-email-helmut.schaa@googlemail.com> References: <1463544599-25569-1-git-send-email-helmut.schaa@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160517_211113_060988_8BB1D189 X-CRM114-Status: UNSURE ( 9.71 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:243 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (helmut.schaa[at]googlemail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH 2/2] ath9k: Fix TX99 support X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Helmut Schaa MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The patch 300-ath9k-force-rx_clear-when-disabling-rx.patch broke TX99 support in ath9k. Fix the patch by only applying rx_clear if TX99 mode is not used. Signed-off-by: Helmut Schaa --- .../patches/300-ath9k-force-rx_clear-when-disabling-rx.patch | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch b/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch index bddb15a..9aa9d8b 100644 --- a/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch +++ b/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch @@ -3,15 +3,16 @@ Date: Sun, 7 Jun 2015 13:53:35 +0200 Subject: [PATCH] ath9k: force rx_clear when disabling rx This makes stopping Rx more reliable and should reduce the frequency of -Rx related DMA stop warnings +Rx related DMA stop warnings. Don't use rx_clear in TX99 mode. Cc: stable@vger.kernel.org Signed-off-by: Felix Fietkau +Signed-off-by: Helmut Schaa --- --- a/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c -@@ -677,13 +677,15 @@ void ath9k_hw_startpcureceive(struct ath +@@ -677,13 +677,18 @@ void ath9k_hw_startpcureceive(struct ath ath9k_ani_reset(ah, is_scanning); @@ -24,8 +25,11 @@ Signed-off-by: Felix Fietkau void ath9k_hw_abortpcurecv(struct ath_hw *ah) { - REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_ABORT | AR_DIAG_RX_DIS); -+ REG_SET_BIT(ah, AR_DIAG_SW, -+ AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT | AR_DIAG_FORCE_RX_CLEAR); ++ u32 reg = AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT; ++ ++ if (!config_enabled(CPTCFG_ATH9K_TX99)) ++ reg |= AR_DIAG_FORCE_RX_CLEAR; ++ REG_SET_BIT(ah, AR_DIAG_SW, reg); ath9k_hw_disable_mib_counters(ah); }