From patchwork Thu Nov 30 12:58:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akolli@qti.qualcomm.com X-Patchwork-Id: 10084823 Return-Path: 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 CDFF860234 for ; Thu, 30 Nov 2017 12:59:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB7F529F89 for ; Thu, 30 Nov 2017 12:59:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AFD6D29F8B; Thu, 30 Nov 2017 12:59:47 +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.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 42A4F29F89 for ; Thu, 30 Nov 2017 12:59:46 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=3ncIQo++47GyFhXHR0vmDDlIU6pqafuWjhfCZsCcCSo=; b=X7tpSMi6JqkXTM Ta2wuA7GzPl6GWxgBLHueew4LUAkw8tXtWw2xcXBus820e3L11/bWewyB27k7cPBtKqdxgdaxCs3i YxQ6UQ1+DlLg2IgZZruZznfYPeRbVREYxaDd2N1ArxJhW5+V2ItHcp+uEyoY/54LYwVCQj9YiGPXL e/O11VqK82aMtaFFJZDRi8DITGWnHjuVdylcUAvp+EEzAcjR4QSHvwOCRwIOhcAZgd4J3aQSxpnjP dRPEQOLXfrx/wrA5b1GigpCNxRSzhEX+TsVi6yV/njGqFGXU4ATygTKX0OWCBFKHGOHIlQPLEg3kj Iq1J6feiaUeoq19W4TRw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eKORF-0006eU-59; Thu, 30 Nov 2017 12:59:37 +0000 Received: from alexa-out.qualcomm.com ([129.46.98.28]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eKOQ9-0005YJ-7m for ath10k@lists.infradead.org; Thu, 30 Nov 2017 12:59:14 +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=1512046709; x=1543582709; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=cmJTYFLptqYPzBwz0FnnLDwhaQxoGXFa8x1y9q7vrLg=; b=B2HE5KYiJOsQsOlm71bdjC2Ypw5rP6rlwKRomLegARcozuodKT93wnUW +od7pzrFECD7WDFz1VZuFq7OO4nZqRWgyGbu4PQFw1a1t6fQJlB5iSzFu WctP0D6CEpuWN3GRdGSaCtoQ92JrjAhxgODLlYIvwjy9yz+ee26i8e/Gb 8=; Received: from ironmsg04-r-new.qualcomm.com (HELO Ironmsg04-R.qualcomm.com) ([10.53.140.108]) by alexa-out.qualcomm.com with ESMTP; 30 Nov 2017 04:58:08 -0800 X-IronPort-AV: E=McAfee;i="5900,7806,8730"; a="1542882771" X-MGA-submission: =?us-ascii?q?MDESNElSngiW61h5VdkEelsEBBSP7nVuXH7TOG?= =?us-ascii?q?wl9N/XExAi1MT3/iG0N/9nzmPFpDV00bSsBur9Pq3PyrfO+exsbE0//x?= =?us-ascii?q?/Y2PaUixo4nwndcJnwBHSax2K67eXUaNuTp8FvH+UYc26H48uud5Lqih?= =?us-ascii?q?di?= Received: from nasanexm03e.na.qualcomm.com ([10.85.0.48]) by Ironmsg04-R.qualcomm.com with ESMTP/TLS/AES256-SHA; 30 Nov 2017 04:58:07 -0800 Received: from aphydexm01f.ap.qualcomm.com (10.252.127.15) by nasanexm03e.na.qualcomm.com (10.85.0.48) with Microsoft SMTP Server (TLS) id 15.0.1293.2; Thu, 30 Nov 2017 04:58:06 -0800 Received: from localhost (10.80.80.8) by aphydexm01f.ap.qualcomm.com (10.252.127.15) with Microsoft SMTP Server (TLS) id 15.0.1293.2; Thu, 30 Nov 2017 18:27:59 +0530 From: To: Subject: [PATCH 1/2] ath10k: move pktlog_filter out of ath10k_debug Date: Thu, 30 Nov 2017 18:28:20 +0530 Message-ID: <1512046701-14435-2-git-send-email-akolli@qti.qualcomm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1512046701-14435-1-git-send-email-akolli@qti.qualcomm.com> References: <1512046701-14435-1-git-send-email-akolli@qti.qualcomm.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01G.na.qualcomm.com (10.85.0.33) 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-20171130_045830_192660_1789F447 X-CRM114-Status: GOOD ( 10.19 ) 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: Anilkumar Kolli , akolli@codeaurora.org, linux-wireless@vger.kernel.org Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Anilkumar Kolli Move pktlog_filter from struct ath10k_debug to struct ath10k so that pktlog can be enabled even when debugfs is not enabled, needed to enable peer tx stats for 10.2.4. No changes in functionality. Signed-off-by: Anilkumar Kolli --- drivers/net/wireless/ath/ath10k/core.h | 2 +- drivers/net/wireless/ath/ath10k/debug.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 643041ef3271..75dbfffe677a 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -488,7 +488,6 @@ struct ath10k_debug { /* protected by conf_mutex */ u64 fw_dbglog_mask; u32 fw_dbglog_level; - u32 pktlog_filter; u32 reg_addr; u32 nf_cal_period; void *cal_data; @@ -963,6 +962,7 @@ struct ath10k { } spectral; #endif + u32 pktlog_filter; struct { /* protected by conf_mutex */ struct ath10k_fw_components utf_mode_fw; diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c index df514507d3f1..e278300b4f14 100644 --- a/drivers/net/wireless/ath/ath10k/debug.c +++ b/drivers/net/wireless/ath/ath10k/debug.c @@ -1950,14 +1950,14 @@ int ath10k_debug_start(struct ath10k *ar) ret); } - if (ar->debug.pktlog_filter) { + if (ar->pktlog_filter) { ret = ath10k_wmi_pdev_pktlog_enable(ar, - ar->debug.pktlog_filter); + ar->pktlog_filter); if (ret) /* not serious */ ath10k_warn(ar, "failed to enable pktlog filter %x: %d\n", - ar->debug.pktlog_filter, ret); + ar->pktlog_filter, ret); } else { ret = ath10k_wmi_pdev_pktlog_disable(ar); if (ret) @@ -2097,12 +2097,12 @@ static ssize_t ath10k_write_pktlog_filter(struct file *file, mutex_lock(&ar->conf_mutex); if (ar->state != ATH10K_STATE_ON) { - ar->debug.pktlog_filter = filter; + ar->pktlog_filter = filter; ret = count; goto out; } - if (filter == ar->debug.pktlog_filter) { + if (filter == ar->pktlog_filter) { ret = count; goto out; } @@ -2111,7 +2111,7 @@ static ssize_t ath10k_write_pktlog_filter(struct file *file, ret = ath10k_wmi_pdev_pktlog_enable(ar, filter); if (ret) { ath10k_warn(ar, "failed to enable pktlog filter %x: %d\n", - ar->debug.pktlog_filter, ret); + ar->pktlog_filter, ret); goto out; } } else { @@ -2122,7 +2122,7 @@ static ssize_t ath10k_write_pktlog_filter(struct file *file, } } - ar->debug.pktlog_filter = filter; + ar->pktlog_filter = filter; ret = count; out: @@ -2139,7 +2139,7 @@ static ssize_t ath10k_read_pktlog_filter(struct file *file, char __user *ubuf, mutex_lock(&ar->conf_mutex); len = scnprintf(buf, sizeof(buf) - len, "%08x\n", - ar->debug.pktlog_filter); + ar->pktlog_filter); mutex_unlock(&ar->conf_mutex); return simple_read_from_buffer(ubuf, count, ppos, buf, len);