From patchwork Wed Mar 18 18:01:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashok Raj Nagarajan X-Patchwork-Id: 6042451 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@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 146E19F318 for ; Wed, 18 Mar 2015 18:02:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EDCC82043C for ; Wed, 18 Mar 2015 18:02:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A3E12044C for ; Wed, 18 Mar 2015 18:02:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756479AbbCRSCT (ORCPT ); Wed, 18 Mar 2015 14:02:19 -0400 Received: from sabertooth02.qualcomm.com ([65.197.215.38]:61884 "EHLO sabertooth02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756162AbbCRSCS (ORCPT ); Wed, 18 Mar 2015 14:02:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qti.qualcomm.com; i=@qti.qualcomm.com; q=dns/txt; s=qcdkim; t=1426701738; x=1458237738; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=RXXeX+OFOKWSKcXO994kCXjfddMmoC06d89/WSAhpMY=; b=Ajs5wNcSRAuzZZCrZ0Rq41LHDL6wKlJrmc4/+JBiEvF3d+uIkHOIDHm/ pp5fgVRgf0sSCe1M5j0TNxLiHW0yoJcl9i5fxU+huQkwYmGOPa0DMUYop cjVS7Nm9aGOCeA3hY5DKeIkdS0Ko9OCOtzXNtZadVd7BRKRQuIuvL2SQy 4=; X-IronPort-AV: E=McAfee;i="5600,1067,7743"; a="86149157" Received: from ironmsg04-r.qualcomm.com ([172.30.46.18]) by sabertooth02.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 18 Mar 2015 11:02:17 -0700 X-IronPort-AV: E=Sophos;i="5.11,423,1422950400"; d="scan'208";a="928282100" Received: from nasanexm02g.na.qualcomm.com ([10.85.0.88]) by Ironmsg04-R.qualcomm.com with ESMTP/TLS/RC4-SHA; 18 Mar 2015 11:02:17 -0700 Received: from aphydexm01f.ap.qualcomm.com (10.252.127.15) by nasanexm02g.na.qualcomm.com (10.85.0.88) with Microsoft SMTP Server (TLS) id 15.0.995.29; Wed, 18 Mar 2015 11:02:16 -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.995.29; Wed, 18 Mar 2015 11:02:08 -0700 Received: by qcmail1.qualcomm.com (sSMTP sendmail emulation); Wed, 18 Mar 2015 23:32:00 +0530 From: Ashok Raj Nagarajan To: CC: , Ashok Raj Nagarajan Subject: [PATCH 2/2] ath10k: allow user to toggle ani_enable via debugfs Date: Wed, 18 Mar 2015 23:31:40 +0530 Message-ID: <1426701700-21974-2-git-send-email-arnagara@qti.qualcomm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426701700-21974-1-git-send-email-arnagara@qti.qualcomm.com> References: <1426701700-21974-1-git-send-email-arnagara@qti.qualcomm.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01F.na.qualcomm.com (10.85.0.32) To aphydexm01f.ap.qualcomm.com (10.252.127.15) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable 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 Now that ANI is enabled by default, allow user to disable or enable ANI feature from debugfs Signed-off-by: Ashok Raj Nagarajan --- drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/debug.c | 58 +++++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath10k/mac.c | 1 + 3 files changed, 60 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 7cba781..1359d2c 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -510,6 +510,7 @@ struct ath10k { u32 ht_cap_info; u32 vht_cap_info; u32 num_rf_chains; + bool ani_enabled; DECLARE_BITMAP(fw_features, ATH10K_FW_FEATURE_COUNT); diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c index 301081d..95f2a29 100644 --- a/drivers/net/wireless/ath/ath10k/debug.c +++ b/drivers/net/wireless/ath/ath10k/debug.c @@ -1708,6 +1708,61 @@ static int ath10k_debug_cal_data_release(struct inode *inode, return 0; } +static ssize_t ath10k_write_ani_enable(struct file *file, + const char __user *user_buf, + size_t count, loff_t *ppos) +{ + struct ath10k *ar = file->private_data; + int ret; + u8 enable; + + if (kstrtou8_from_user(user_buf, count, 0, &enable)) + return -EINVAL; + + if (ar->ani_enabled == enable) + return count; + + mutex_lock(&ar->conf_mutex); + + ret = ath10k_wmi_pdev_set_param(ar, ar->wmi.pdev_param->ani_enable, + enable); + if (ret) { + ath10k_warn(ar, "ani_enable failed from debugfs: %d\n", ret); + goto exit; + } + ar->ani_enabled = enable; + + ret = count; + + ath10k_dbg(ar, ATH10K_DBG_WMI, "ANI is %s\n", + enable ? "enabled" : "disabled"); +exit: + mutex_unlock(&ar->conf_mutex); + + return ret; +} + +static ssize_t ath10k_read_ani_enable(struct file *file, char __user *user_buf, + size_t count, loff_t *ppos) +{ + struct ath10k *ar = file->private_data; + int len = 0; + char buf[32]; + + len = scnprintf(buf, sizeof(buf) - len, "%d\n", + ar->ani_enabled); + + return simple_read_from_buffer(user_buf, count, ppos, buf, len); +} + +static const struct file_operations fops_ani_enable = { + .read = ath10k_read_ani_enable, + .write = ath10k_write_ani_enable, + .open = simple_open, + .owner = THIS_MODULE, + .llseek = default_llseek, +}; + static const struct file_operations fops_cal_data = { .open = ath10k_debug_cal_data_open, .read = ath10k_debug_cal_data_read, @@ -2068,6 +2123,9 @@ int ath10k_debug_register(struct ath10k *ar) debugfs_create_file("cal_data", S_IRUSR, ar->debug.debugfs_phy, ar, &fops_cal_data); + debugfs_create_file("ani_enable", S_IRUSR | S_IWUSR, + ar->debug.debugfs_phy, ar, &fops_ani_enable); + debugfs_create_file("nf_cal_period", S_IRUSR | S_IWUSR, ar->debug.debugfs_phy, ar, &fops_nf_cal_period); diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 380d4b1..456aa3c 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -2903,6 +2903,7 @@ static int ath10k_start(struct ieee80211_hw *hw) ret); goto err_core_stop; } + ar->ani_enabled = 1; ar->num_started_vdevs = 0; ath10k_regd_update(ar);