From patchwork Tue Oct 29 12:06:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Puzyniak X-Patchwork-Id: 3107741 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 727DCBF924 for ; Tue, 29 Oct 2013 12:07:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4D899201F4 for ; Tue, 29 Oct 2013 12:07:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9A8FF20204 for ; Tue, 29 Oct 2013 12:06:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754120Ab3J2MG6 (ORCPT ); Tue, 29 Oct 2013 08:06:58 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:36276 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751804Ab3J2MG5 (ORCPT ); Tue, 29 Oct 2013 08:06:57 -0400 Received: by mail-ee0-f46.google.com with SMTP id c1so4062700eek.19 for ; Tue, 29 Oct 2013 05:06:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aEvVaEFG83sY2688Wv8TYEl6jKZETqBGJIcnAYW1u6I=; b=dHxmC31P7+xPr1nbiNsrYU0kBLGcqXyf7BmFMptB3KhzP8N3Be94c9fW7NhELuNUSc JPakuLEFJ51ntLbDGoaZVlStjl1ecp7qnauAhqDVb/kQ0V1fa4qC9bg5fp7+kl6Hkz42 0nsTIinREP5/rVEExefHf9sx++U7hZsdQQgRg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aEvVaEFG83sY2688Wv8TYEl6jKZETqBGJIcnAYW1u6I=; b=UKQ3HDTmnDGFsqF7m59lfFNk8wsUVkm5i4UARQb7m04Cc4CGXxD7foJXWuhsGmtC4N rmje4b/9rKumvk4NH1V0FaMPjHlWF9BoXUV1kPMKYrgI5jYpGZ5VRI61XfAJsU/v8YcW Rv0eJZ4sqolWmDM1Q12stji9K9TgA5zQ2uIL1GLotF5eJajtbMo6ykN37OZ3QsQis3av McOGXucipp3tFEG7GXuGZYpZxtwrGoVKsr7YxVfqN/sx7GzCbTgbcXj7AWRWmMC/jlMT 6Rg3/wwgXBZ0xdInNdsarifipLMMKY4dndcDihI88W2Lg8N12zKwHzvbDyL9HjjH4IyG xwtw== X-Gm-Message-State: ALoCoQmjPDA1KDrHQMZhqt+KKRNsVkG50rXs81+Cgb4Hq9IGxJ8BCxwOxSKtvurzBS45yvX7k3J432Ogz4tbzPkoxG3pdfHupOe5q+Dl994fQW2CBQw5ovk= X-Received: by 10.14.119.73 with SMTP id m49mr14559eeh.146.1383048416085; Tue, 29 Oct 2013 05:06:56 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id a6sm69551630eei.10.2013.10.29.05.06.55 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Oct 2013 05:06:55 -0700 (PDT) From: Marek Puzyniak To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Marek Puzyniak , Michal Kazior Subject: [PATCH 3/3] ath10k: add debugfs file to control radar events blocking Date: Tue, 29 Oct 2013 13:06:34 +0100 Message-Id: <1383048394-15256-3-git-send-email-marek.puzyniak@tieto.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1383048394-15256-1-git-send-email-marek.puzyniak@tieto.com> References: <1383048394-15256-1-git-send-email-marek.puzyniak@tieto.com> X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 Sometimes for DFS testing is required to stay on current channel even after radar detected. This patch allows to enable/disable radar detected event to be passed to mac80211. By default radar detected event in not blocked. To block it: echo 1 > /sys/kernel/debug/ieee80211/phyX/ath10k/dfs_block_radar_events To unblock again: echo 0 > /sys/kernel/debug/ieee80211/phyX/ath10k/dfs_block_radar_events Inform about blocking radar detected event even when logs are disabled for throughput/performance reasons. Signed-off-by: Marek Puzyniak Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/debug.c | 4 ++++ drivers/net/wireless/ath/ath10k/wmi.c | 8 ++++++++ 3 files changed, 13 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index d5fd74b..cdedcbf 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -409,6 +409,7 @@ struct ath10k { bool monitor_present; unsigned int filter_flags; unsigned long dev_flags; + u32 dfs_block_radar_events; struct wmi_pdev_set_wmm_params_arg wmm_params; struct completion install_key_done; diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c index d4d0cdd..2cfe96b 100644 --- a/drivers/net/wireless/ath/ath10k/debug.c +++ b/drivers/net/wireless/ath/ath10k/debug.c @@ -749,6 +749,10 @@ int ath10k_debug_create(struct ath10k *ar) ar->debug.debugfs_phy, ar, &fops_simulate_radar); + debugfs_create_bool("dfs_block_radar_events", S_IWUSR, + ar->debug.debugfs_phy, + &ar->dfs_block_radar_events); + debugfs_create_file("dfs_stats", S_IRUSR, ar->debug.debugfs_phy, ar, &fops_dfs_stats); diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 8a7ebcc..8600465 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -1456,6 +1456,14 @@ static void ath10k_dfs_radar_report(struct ath10k *ar, ath10k_dbg(ATH10K_DBG_REGULATORY, "dfs radar detected\n"); ATH10K_DFS_STAT_INC(ar, radar_detected); + + /* Control radar events reporting in debugfs file + dfs_block_radar_events */ + if (ar->dfs_block_radar_events) { + ath10k_info("DFS Radar detected, but ignored as requested\n"); + return; + } + ieee80211_radar_detected(ar->hw); }