ath10k: Fix failure to send NULL func frame for 10.4

Message ID	1476257342-3241-1-git-send-email-mohammed@qca.qualcomm.com (mailing list archive)
State	Accepted
Commit	fcf7cf1551cae54e747a771f5808240f2a37708f
Delegated to:	Kalle Valo
Headers	show Return-Path: <ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org> From: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com> To: <ath10k@lists.infradead.org> Subject: [PATCH] ath10k: Fix failure to send NULL func frame for 10.4 Date: Wed, 12 Oct 2016 12:59:02 +0530 Message-ID: <1476257342-3241-1-git-send-email-mohammed@qca.qualcomm.com> MIME-Version: 1.0 Precedence: list Cc: mohammed@codeaurora.org, linux-wireless@vger.kernel.org, Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ath10k" <ath10k-bounces@lists.infradead.org> Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org

Message ID

1476257342-3241-1-git-send-email-mohammed@qca.qualcomm.com (mailing list archive)

State

Accepted

Commit

fcf7cf1551cae54e747a771f5808240f2a37708f

Delegated to:

Kalle Valo

Headers

show

Return-Path: <ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org>
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
	3071160839 for <patchwork-ath10k@patchwork.kernel.org>;
	Wed, 12 Oct 2016 07:29:51 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 233C429C90
	for <patchwork-ath10k@patchwork.kernel.org>;
	Wed, 12 Oct 2016 07:29:51 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 17CA129CD8; Wed, 12 Oct 2016 07:29:51 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1
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.wl.linuxfoundation.org (Postfix) with ESMTPS id B79B329C90
	for <patchwork-ath10k@patchwork.kernel.org>;
	Wed, 12 Oct 2016 07:29:50 +0000 (UTC)
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
	by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux))
	id 1buDyx-0002nU-7M; Wed, 12 Oct 2016 07:29:43 +0000
Received: from wolverine02.qualcomm.com ([199.106.114.251])
	by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat
	Linux)) id 1buDyu-0002lJ-RM
	for ath10k@lists.infradead.org; Wed, 12 Oct 2016 07:29:41 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple;
	d=qti.qualcomm.com; i=@qti.qualcomm.com; q=dns/txt;
	s=qcdkim; t=1476257380; x=1507793380;
	h=from:to:cc:subject:date:message-id:mime-version;
	bh=SFeQIMuaMTugQqO7+OICi1bqYdEnAodhdf9G1X/0OvA=;
	b=Z+wpMOA22vR8fHPhc/5hVyosg+ATtzsEAWcjUdsXOr3CIRiRfYMW/Xa9
	lgyacBrbcUtHx2ApWZ1o1sPGZfsero8Su0djVevX78LqrIC8kEXyCtCPz
	Q7nEPW+lrBYYy6xeeeMwTIecB5/Ep11okNLPXG6L6ouPUTaDVpLyjtK5g k=;
X-IronPort-AV: E=Sophos;i="5.31,333,1473145200"; d="scan'208";a="326314334"
Received: from unknown (HELO Ironmsg03-L.qualcomm.com) ([10.53.140.110])
	by wolverine02.qualcomm.com with ESMTP; 12 Oct 2016 00:29:20 -0700
From: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
X-IronPort-AV: E=McAfee;i="5700,7163,8315"; a="1240703009"
Received: from nasanexm02d.na.qualcomm.com ([10.85.0.44])
	by Ironmsg03-L.qualcomm.com with ESMTP/TLS/RC4-SHA;
	12 Oct 2016 00:29:19 -0700
Received: from aphydexm01f.ap.qualcomm.com (10.252.127.15) by
	NASANEXM02D.na.qualcomm.com (10.85.0.44) with Microsoft SMTP Server
	(TLS) id 15.0.1178.4; Wed, 12 Oct 2016 00:29:18 -0700
Received: from qcmail1.qualcomm.com (10.80.80.8) by
	aphydexm01f.ap.qualcomm.com (10.252.127.15) with Microsoft SMTP
	Server (TLS) id 15.0.1178.4; Wed, 12 Oct 2016 12:59:10 +0530
Received: by qcmail1.qualcomm.com (sSMTP sendmail emulation);
	Wed, 12 Oct 2016 12:59:03 +0530
To: <ath10k@lists.infradead.org>
Subject: [PATCH] ath10k: Fix failure to send NULL func frame for 10.4
Date: Wed, 12 Oct 2016 12:59:02 +0530
Message-ID: <1476257342-3241-1-git-send-email-mohammed@qca.qualcomm.com>
X-Mailer: git-send-email 1.9.1
MIME-Version: 1.0
X-Originating-IP: [10.80.80.8]
X-ClientProxiedBy: nasanexm01a.na.qualcomm.com (10.85.0.81) To
	aphydexm01f.ap.qualcomm.com (10.252.127.15)
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
X-CRM114-CacheID: sfid-20161012_002941_007378_3E71974C 
X-CRM114-Status: UNSURE (   8.39  )
X-CRM114-Notice: Please train this message.
X-BeenThere: ath10k@lists.infradead.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: <ath10k.lists.infradead.org>
List-Unsubscribe: <http://lists.infradead.org/mailman/options/ath10k>,
	<mailto:ath10k-request@lists.infradead.org?subject=unsubscribe>
List-Archive: <http://lists.infradead.org/pipermail/ath10k/>
List-Post: <mailto:ath10k@lists.infradead.org>
List-Help: <mailto:ath10k-request@lists.infradead.org?subject=help>
List-Subscribe: <http://lists.infradead.org/mailman/listinfo/ath10k>,
	<mailto:ath10k-request@lists.infradead.org?subject=subscribe>
Cc: mohammed@codeaurora.org, linux-wireless@vger.kernel.org, Mohammed
	Shafi Shajakhan <mohammed@qti.qualcomm.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "ath10k" <ath10k-bounces@lists.infradead.org>
Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org
X-Virus-Scanned: ClamAV using ClamSMTP

Commit Message

Mohammed Shafi Shajakhan Oct. 12, 2016, 7:29 a.m. UTC

From: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>

This partially reverts 'commit 2cdce425aa33
("ath10k: Fix broken NULL func data frame status for 10.4")'
Unfortunately this breaks sending NULL func and the existing
issue of obtaining proper tx status for NULL function will be
fixed. Also update the comments for feature flag added to be
useless and not working

Fixes: 2cdce425aa33 "ath10k: Fix broken NULL func data frame status for
10.4"
Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/core.h | 6 ++----
 drivers/net/wireless/ath/ath10k/mac.c  | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

Comments

Kalle Valo Nov. 15, 2016, 3:04 p.m. UTC | #1

Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com> wrote:
> From: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
> 
> This partially reverts 'commit 2cdce425aa33
> ("ath10k: Fix broken NULL func data frame status for 10.4")'
> Unfortunately this breaks sending NULL func and the existing
> issue of obtaining proper tx status for NULL function will be
> fixed. Also update the comments for feature flag added to be
> useless and not working
> 
> Fixes: 2cdce425aa33 "ath10k: Fix broken NULL func data frame status for
> 10.4"
> Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>

Patch applied to ath-next branch of ath.git, thanks.

fcf7cf1551ca ath10k: fix failure to send NULL func frame for 10.4

diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index b367e9c..42c3f1b 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -552,10 +552,8 @@  enum ath10k_fw_features {
 	 */
 	ATH10K_FW_FEATURE_BTCOEX_PARAM = 14,
 
-	/* Older firmware with HTT delivers incorrect tx status for null func
-	 * frames to driver, but this fixed in 10.2 and 10.4 firmware versions.
-	 * Also this workaround results in reporting of incorrect null func
-	 * status for 10.4. This flag is used to skip the workaround.
+	/* Unused flag and proven to be not working, enable this if you want
+	 * to experiment sending NULL func data frames in HTT TX
 	 */
 	ATH10K_FW_FEATURE_SKIP_NULL_FUNC_WAR = 15,
 
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 4565321..86a6610 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -3255,8 +3255,6 @@  ath10k_mac_tx_h_get_txmode(struct ath10k *ar,
 	if (ar->htt.target_version_major < 3 &&
 	    (ieee80211_is_nullfunc(fc) || ieee80211_is_qos_nullfunc(fc)) &&
 	    !test_bit(ATH10K_FW_FEATURE_HAS_WMI_MGMT_TX,
-		      ar->running_fw->fw_file.fw_features) &&
-	    !test_bit(ATH10K_FW_FEATURE_SKIP_NULL_FUNC_WAR,
 		      ar->running_fw->fw_file.fw_features))
 		return ATH10K_HW_TXRX_MGMT;