From patchwork Tue Feb 26 09:27:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Surabhi Vishnoi X-Patchwork-Id: 10829777 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 710851399 for ; Tue, 26 Feb 2019 09:28:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58D912B3AE for ; Tue, 26 Feb 2019 09:28:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D4082B3B1; Tue, 26 Feb 2019 09:28:29 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E0FCB2B3AE for ; Tue, 26 Feb 2019 09:28:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=AsLWtQkIEm1hufUPGI5dTChQcudAsF43D9cob1oINQg=; b=b8SPyBrAiFGCjrvNsXeOrTExtL UaMyBtfJZ80rMuylsgyrChZjgngDnVcNKyLb1tys53fa4IOPtrByCOD7usF6909GpbhWWljuTKTZ5 GE28XkCELgwuGV45hLfxDc6zoP64K7UyLO+1f4OwJCoIYI4bme0eJsBSOqYoCGkZ5Owx4HE9R0qEX yt/u5m6xv4Puwg5FVA266faGNKkBIGS0JjJ3HZBjM8F+ZD3iunSkfviCesRRFg4WTjo7B4L2wRZ+5 3J7vZHbPwDpbueWDC2cP1yAfJB3LeAZ0LbVs/dg+1Ghjim6w0i1CPtvzxiT3CLp5AAKZkJ0DqOfHp WvY58UDg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gyZ2J-0001eO-49; Tue, 26 Feb 2019 09:28:27 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gyZ2E-0001U8-Cy for ath10k@lists.infradead.org; Tue, 26 Feb 2019 09:28:25 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 1C4A360208; Tue, 26 Feb 2019 09:28:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1551173302; bh=nhfSGt53PoSUjTSlgnj135k6pqYFOY0ku36KxQsUAfM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QCvpaFVeWKtHiYPA+VuFA7oeWSA4y82cPoL11id2mtuW+CTRLhicjeTlatlqcyu6F lYWu9HV6pJ+wBASwlc1fx7qU+KiejdeQK1U9QgLuTbflsTy0EVbXwkV6jVDfQfKO7J cUeJKK+qNEBKSe3yttbYiPUB9eUti2OZ6630o4Ys= Received: from svishnoi-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: svishnoi@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 3346160F3E; Tue, 26 Feb 2019 09:28:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1551173299; bh=nhfSGt53PoSUjTSlgnj135k6pqYFOY0ku36KxQsUAfM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XThtv9zRgYUnbuXrLV3kLdg1INyFQpoRkqhnAP/grMV0hqOI8dbIt9MKDTPv0Nm7D TZ90yJ5IPRmAL06CyZoqXcDxHd1P+4v9ruu15F68tzu6TsMvJ1JaZJuXqdQ3nIbjF1 lmE9G+AIb08T1o8xgJFt6trOxdg79Gt8Sz2YD/tM= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 3346160F3E Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=svishnoi@codeaurora.org From: Surabhi Vishnoi To: ath10k@lists.infradead.org Subject: [PATCH v2 3/4] ath10k: Fix the wrong updation of SGI in tx_stats debugfs Date: Tue, 26 Feb 2019 14:57:57 +0530 Message-Id: <1551173278-20926-4-git-send-email-svishnoi@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1551173278-20926-1-git-send-email-svishnoi@codeaurora.org> References: <1551173278-20926-1-git-send-email-svishnoi@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190226_012822_629707_88B02886 X-CRM114-Status: GOOD ( 11.41 ) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-wireless@vger.kernel.org, Surabhi Vishnoi MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The SGI is updated wrongly in tx stats table in debugfs per sta entry. To know whether the packets/bytes are sent with SHORT GI, test whether the SGI bit(ATH10K_RATE_INFO_FLAGS_SGI_BIT) is set or not in the txrate flags. Tested HW: WCN3990 Tested FW: WLAN.HL.3.1-00784-QCAHLSWMTPLZ-1 Fixes: a904417fc876 ("ath10k: add extended per sta tx statistics support") Signed-off-by: Surabhi Vishnoi --- drivers/net/wireless/ath/ath10k/htt_rx.c | 4 +++- drivers/net/wireless/ath/ath10k/wmi.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c index 941ae20..2394a47 100644 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c @@ -2913,12 +2913,14 @@ static inline s8 ath10k_get_legacy_rate_idx(struct ath10k *ar, u8 rate) struct rate_info *txrate = &arsta->txrate; struct ath10k_htt_tx_stats *tx_stats; int idx, ht_idx, gi, mcs, bw, nss; + unsigned long flags; if (!arsta->tx_stats) return; tx_stats = arsta->tx_stats; - gi = (arsta->txrate.flags & RATE_INFO_FLAGS_SHORT_GI); + flags = txrate->flags; + gi = test_bit(ATH10K_RATE_INFO_FLAGS_SGI_BIT, &flags); ht_idx = txrate->mcs + txrate->nss * 8; mcs = txrate->mcs; bw = txrate->bw; diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h index d915942..6df9a59 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.h +++ b/drivers/net/wireless/ath/ath10k/wmi.h @@ -5051,6 +5051,7 @@ enum wmi_rate_preamble { #define ATH10K_GI_NUM 2 #define ATH10K_HT_MCS_NUM 32 #define ATH10K_RATE_TABLE_NUM 320 +#define ATH10K_RATE_INFO_FLAGS_SGI_BIT 2 /* Value to disable fixed rate setting */ #define WMI_FIXED_RATE_NONE (0xff)