ath9k: add DFS radar pulse processing (29942bc1) · Commits · 戴 / test

drivers/net/wireless/ath/ath9k/Kconfig

+22 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,9 @@ config ATH9K_HW
		tristate
		config ATH9K_COMMON
		tristate
		config ATH9K_DFS_DEBUGFS
		def_bool y
		depends on ATH9K_DEBUGFS && ATH9K_DFS_CERTIFIED

		config ATH9K
		tristate "Atheros 802.11n wireless cards support"
		@@ -51,6 +54,25 @@ config ATH9K_DEBUGFS

		Also required for changing debug message flags at run time.

		config ATH9K_DFS_CERTIFIED
		bool "Atheros DFS support for certified platforms"
		depends on ATH9K && EXPERT
		default n
		---help---
		This option enables DFS support for initiating radiation on
		ath9k. There is no way to dynamically detect if a card was DFS
		certified and as such this is left as a build time option. This
		option should only be enabled by system integrators that can
		guarantee that all the platforms that their kernel will run on
		have obtained appropriate regulatory body certification for a
		respective Atheros card by using ath9k on the target shipping
		platforms.

		This is currently only a placeholder for future DFS support,
		as DFS support requires more components that still need to be
		developed. At this point enabling this option won't do anything
		except increase code size.

		config ATH9K_RATE_CONTROL
		bool "Atheros ath9k rate control"
		depends on ATH9K

drivers/net/wireless/ath/ath9k/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,8 @@ ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o
		ath9k-$(CONFIG_ATH9K_PCI) += pci.o
		ath9k-$(CONFIG_ATH9K_AHB) += ahb.o
		ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o
		ath9k-$(CONFIG_ATH9K_DFS_DEBUGFS) += dfs_debug.o
		ath9k-$(CONFIG_ATH9K_DFS_CERTIFIED) += dfs.o

		obj-$(CONFIG_ATH9K) += ath9k.o

drivers/net/wireless/ath/ath9k/debug.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1630,6 +1630,9 @@ int ath9k_init_debug(struct ath_hw *ah)
		debugfs_create_file("debug", S_IRUSR \| S_IWUSR, sc->debug.debugfs_phy,
		sc, &fops_debug);
		#endif

		ath9k_dfs_init_debug(sc);

		debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
		&fops_dma);
		debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc,

drivers/net/wireless/ath/ath9k/debug.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@

		#include "hw.h"
		#include "rc.h"
		#include "dfs_debug.h"

		struct ath_txq;
		struct ath_buf;
		@@ -187,6 +188,7 @@ struct ath_stats {
		struct ath_interrupt_stats istats;
		struct ath_tx_stats txstats[ATH9K_NUM_TX_QUEUES];
		struct ath_rx_stats rxstats;
		struct ath_dfs_stats dfs_stats;
		u32 reset[__RESET_TYPE_MAX];
		};

drivers/net/wireless/ath/ath9k/dfs.c

0 → 100644

+215 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2008-2011 Atheros Communications Inc.
		* Copyright (c) 2011 Neratec Solutions AG
		*
		* Permission to use, copy, modify, and/or distribute this software for any
		* purpose with or without fee is hereby granted, provided that the above
		* copyright notice and this permission notice appear in all copies.
		*
		* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
		* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
		* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
		* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
		* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
		* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
		* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
		*/

		#include "hw.h"
		#include "hw-ops.h"
		#include "ath9k.h"
		#include "dfs.h"
		#include "dfs_debug.h"

		/*
		* TODO: move into or synchronize this with generic header
		* as soon as IF is defined
		*/
		struct dfs_radar_pulse {
		u16 freq;
		u64 ts;
		u32 width;
		u8 rssi;
		};

		/* internal struct to pass radar data */
		struct ath_radar_data {
		u8 pulse_bw_info;
		u8 rssi;
		u8 ext_rssi;
		u8 pulse_length_ext;
		u8 pulse_length_pri;
		};

		/* convert pulse duration to usecs, considering clock mode */
		static u32 dur_to_usecs(struct ath_hw *ah, u32 dur)
		{
		const u32 AR93X_NSECS_PER_DUR = 800;
		const u32 AR93X_NSECS_PER_DUR_FAST = (8000 / 11);
		u32 nsecs;

		if (IS_CHAN_A_FAST_CLOCK(ah, ah->curchan))
		nsecs = dur * AR93X_NSECS_PER_DUR_FAST;
		else
		nsecs = dur * AR93X_NSECS_PER_DUR;

		return (nsecs + 500) / 1000;
		}

		#define PRI_CH_RADAR_FOUND 0x01
		#define EXT_CH_RADAR_FOUND 0x02
		static bool
		ath9k_postprocess_radar_event(struct ath_softc *sc,
		struct ath_radar_data *are,
		struct dfs_radar_pulse *drp)
		{
		u8 rssi;
		u16 dur;

		ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_DFS,
		"pulse_bw_info=0x%x, pri,ext len/rssi=(%u/%u, %u/%u)\n",
		are->pulse_bw_info,
		are->pulse_length_pri, are->rssi,
		are->pulse_length_ext, are->ext_rssi);

		/*
		* Only the last 2 bits of the BW info are relevant, they indicate
		* which channel the radar was detected in.
		*/
		are->pulse_bw_info &= 0x03;

		switch (are->pulse_bw_info) {
		case PRI_CH_RADAR_FOUND:
		/* radar in ctrl channel */
		dur = are->pulse_length_pri;
		DFS_STAT_INC(sc, pri_phy_errors);
		/*
		* cannot use ctrl channel RSSI
		* if extension channel is stronger
		*/
		rssi = (are->ext_rssi >= (are->rssi + 3)) ? 0 : are->rssi;
		break;
		case EXT_CH_RADAR_FOUND:
		/* radar in extension channel */
		dur = are->pulse_length_ext;
		DFS_STAT_INC(sc, ext_phy_errors);
		/*
		* cannot use extension channel RSSI
		* if control channel is stronger
		*/
		rssi = (are->rssi >= (are->ext_rssi + 12)) ? 0 : are->ext_rssi;
		break;
		case (PRI_CH_RADAR_FOUND \| EXT_CH_RADAR_FOUND):
		/*
		* Conducted testing, when pulse is on DC, both pri and ext
		* durations are reported to be same
		*
		* Radiated testing, when pulse is on DC, different pri and
		* ext durations are reported, so take the larger of the two
		*/
		if (are->pulse_length_ext >= are->pulse_length_pri)
		dur = are->pulse_length_ext;
		else
		dur = are->pulse_length_pri;
		DFS_STAT_INC(sc, dc_phy_errors);

		/* when both are present use stronger one */
		rssi = (are->rssi < are->ext_rssi) ? are->ext_rssi : are->rssi;
		break;
		default:
		/*
		* Bogus bandwidth info was received in descriptor,
		* so ignore this PHY error
		*/
		DFS_STAT_INC(sc, bwinfo_discards);
		return false;
		}

		if (rssi == 0) {
		DFS_STAT_INC(sc, rssi_discards);
		return false;
		}

		/*
		* TODO: check chirping pulses
		* checks for chirping are dependent on the DFS regulatory domain
		* used, which is yet TBD
		*/

		/* convert duration to usecs */
		drp->width = dur_to_usecs(sc->sc_ah, dur);
		drp->rssi = rssi;

		DFS_STAT_INC(sc, pulses_detected);
		return true;
		}
		#undef PRI_CH_RADAR_FOUND
		#undef EXT_CH_RADAR_FOUND

		/*
		* DFS: check PHY-error for radar pulse and feed the detector
		*/
		void ath9k_dfs_process_phyerr(struct ath_softc sc, void data,
		struct ath_rx_status *rs, u64 mactime)
		{
		struct ath_radar_data ard;
		u16 datalen;
		char *vdata_end;
		struct dfs_radar_pulse drp;
		struct ath_hw *ah = sc->sc_ah;
		struct ath_common *common = ath9k_hw_common(ah);

		if ((!(rs->rs_phyerr != ATH9K_PHYERR_RADAR)) &&
		(!(rs->rs_phyerr != ATH9K_PHYERR_FALSE_RADAR_EXT))) {
		ath_dbg(common, ATH_DBG_DFS,
		"Error: rs_phyer=0x%x not a radar error\n",
		rs->rs_phyerr);
		return;
		}

		datalen = rs->rs_datalen;
		if (datalen == 0) {
		DFS_STAT_INC(sc, datalen_discards);
		return;
		}

		ard.rssi = rs->rs_rssi_ctl0;
		ard.ext_rssi = rs->rs_rssi_ext0;

		/*
		* hardware stores this as 8 bit signed value.
		* we will cap it at 0 if it is a negative number
		*/
		if (ard.rssi & 0x80)
		ard.rssi = 0;
		if (ard.ext_rssi & 0x80)
		ard.ext_rssi = 0;

		vdata_end = (char *)data + datalen;
		ard.pulse_bw_info = vdata_end[-1];
		ard.pulse_length_ext = vdata_end[-2];
		ard.pulse_length_pri = vdata_end[-3];

		ath_dbg(common, ATH_DBG_DFS,
		"bw_info=%d, length_pri=%d, length_ext=%d, "
		"rssi_pri=%d, rssi_ext=%d\n",
		ard.pulse_bw_info, ard.pulse_length_pri, ard.pulse_length_ext,
		ard.rssi, ard.ext_rssi);

		drp.freq = ah->curchan->channel;
		drp.ts = mactime;
		if (ath9k_postprocess_radar_event(sc, &ard, &drp)) {
		static u64 last_ts;
		ath_dbg(common, ATH_DBG_DFS,
		"ath9k_dfs_process_phyerr: channel=%d, ts=%llu, "
		"width=%d, rssi=%d, delta_ts=%llu\n",
		drp.freq, drp.ts, drp.width, drp.rssi, drp.ts-last_ts);
		last_ts = drp.ts;
		/*
		* TODO: forward pulse to pattern detector
		*
		* ieee80211_add_radar_pulse(drp.freq, drp.ts,
		* drp.width, drp.rssi);
		*/
		}
		}

Admin message