From patchwork Thu Jan 29 12:40:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 5741991 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 05C9E9F36E for ; Thu, 29 Jan 2015 12:40:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3D1F82022D for ; Thu, 29 Jan 2015 12:40:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55E7320222 for ; Thu, 29 Jan 2015 12:40:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752331AbbA2Mkc (ORCPT ); Thu, 29 Jan 2015 07:40:32 -0500 Received: from wolverine02.qualcomm.com ([199.106.114.251]:26904 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751700AbbA2Mka (ORCPT ); Thu, 29 Jan 2015 07:40:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1422535230; x=1454071230; h=from:to:cc:subject:references:date:in-reply-to: message-id:mime-version; bh=mbDms99461E1yj49nbGE9MT6oYm6q2TQ2ToZ3ZVUL2c=; b=AF+ZZ/8ByKmAo/CSrygr0CZUYFUCkG1xjKHjvfucX3jUjwHVaddo6+uZ BmlZdtLJdZg54IcpfORtCj2pWSzuFK9mogi5M8S8jNkyOp0esS9PiRBq1 yWWl055UOCeS6v0O+PcPyugpVZjaPNkgFdX/z37orJJCSgKUlxNeP93DR M=; X-IronPort-AV: E=McAfee;i="5600,1067,7695"; a="192713980" Received: from ironmsg02-lv.qualcomm.com ([10.47.202.183]) by wolverine02.qualcomm.com with ESMTP; 29 Jan 2015 04:40:29 -0800 X-IronPort-AV: E=Sophos;i="5.09,485,1418112000"; d="scan'208";a="31613760" Received: from nalasexr01g.na.qualcomm.com ([10.49.56.53]) by ironmsg02-lv.qualcomm.com with ESMTP/TLS/RC4-SHA; 29 Jan 2015 04:40:29 -0800 Received: from potku.adurom.net (10.80.80.8) by NALASEXR01G.na.qualcomm.com (10.49.56.53) with Microsoft SMTP Server (TLS) id 15.0.995.29; Thu, 29 Jan 2015 04:40:27 -0800 From: Kalle Valo To: SenthilKumar Jegadeesan CC: , Subject: Re: [PATCH-RESEND] ath10k: add log level configuration for fw_dbglog References: <1422522412-10441-1-git-send-email-sjegadee@qti.qualcomm.com> Date: Thu, 29 Jan 2015 14:40:18 +0200 In-Reply-To: <1422522412-10441-1-git-send-email-sjegadee@qti.qualcomm.com> (SenthilKumar Jegadeesan's message of "Thu, 29 Jan 2015 14:36:52 +0530") Message-ID: <87vbjp2219.fsf@kamboji.qca.qualcomm.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01B.na.qualcomm.com (10.85.0.82) To NALASEXR01G.na.qualcomm.com (10.49.56.53) 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 SenthilKumar Jegadeesan writes: > Introduce optional log level configuration for > existing debugfs fw_dbglog. > > It allow users to configure desired log level > for firmware debugs. > > To configure log level as WARN > > echo 0xffffffff 2 > /sys/kernel/debug/ieee80211/phy0/ath10k/fw_dbglog > > Loglevel Value > VERBOSE 0 > INFO 1 > WARN 2 > ERR 3 > > Signed-off-by: SenthilKumar Jegadeesan I did cosmetic changes to the log in the pending branch. > @@ -1331,19 +1331,30 @@ static ssize_t ath10k_write_fw_dbglog(struct file *file, > size_t count, loff_t *ppos) > { > struct ath10k *ar = file->private_data; > - unsigned long mask; > int ret; > + char buf[64]; > + unsigned int log_level, mask; > > - ret = kstrtoul_from_user(user_buf, count, 0, &mask); > - if (ret) > - return ret; > + simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count); > + > + /* make sure that buf is null terminated */ > + buf[sizeof(buf) - 1] = 0; > + > + ret = sscanf(buf, "%x %u", &mask, &log_level); > + > + if (!ret) > + return -EINVAL; > > mutex_lock(&ar->conf_mutex); > > ar->debug.fw_dbglog_mask = mask; > + ar->debug.fw_dbglog_level = (ret == 1) ? ATH10K_DBGLOG_LEVEL_WARN : > + log_level; And I simplified this a bit, please review. Full patch in pending branch. --- a/drivers/net/wireless/ath/ath10k/debug.c +++ b/drivers/net/wireless/ath/ath10k/debug.c @@ -1345,12 +1345,14 @@ static ssize_t ath10k_write_fw_dbglog(struct file *file, if (!ret) return -EINVAL; + if (ret == 1) + /* default if user did not specify */ + log_level = ATH10K_DBGLOG_LEVEL_WARN; + mutex_lock(&ar->conf_mutex); ar->debug.fw_dbglog_mask = mask; - ar->debug.fw_dbglog_level = (ret == 1) ? ATH10K_DBGLOG_LEVEL_WARN : - log_level; - + ar->debug.fw_dbglog_level = log_level; if (ar->state == ATH10K_STATE_ON) { ret = ath10k_wmi_dbglog_cfg(ar, ar->debug.fw_dbglog_mask,