* [ath9k-devel] [RFC v2 0/2] ath9k: DFS radar detection @ 2011-11-03 13:55 ` Zefir Kurtisi 0 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 13:55 UTC (permalink / raw) To: ath9k-devel This patch series proposes DFS radar pulse detection for ath9k. Updates * use DFS HW capability flag instead of #ifdefs * disable feature by default * moved DFS debugfs into own file * reverted BIT() debug flags to hex * limited DFS support to AR_SREV_9280_20_OR_LATER (TBC) * minor changes considering feedback Zefir Kurtisi (2): ath9k: add DFS radar pulse processing ath9k: integrate initial DFS module drivers/net/wireless/ath/ath.h | 2 + drivers/net/wireless/ath/ath9k/Makefile | 2 + drivers/net/wireless/ath/ath9k/debug.c | 3 + drivers/net/wireless/ath/ath9k/debug.h | 2 + drivers/net/wireless/ath/ath9k/dfs.c | 192 ++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath9k/dfs.h | 24 ++++ drivers/net/wireless/ath/ath9k/dfs_debug.c | 89 +++++++++++++ drivers/net/wireless/ath/ath9k/dfs_debug.h | 59 +++++++++ drivers/net/wireless/ath/ath9k/hw.c | 12 ++ drivers/net/wireless/ath/ath9k/hw.h | 1 + drivers/net/wireless/ath/ath9k/main.c | 17 +++ drivers/net/wireless/ath/ath9k/recv.c | 18 ++- 12 files changed, 416 insertions(+), 5 deletions(-) create mode 100644 drivers/net/wireless/ath/ath9k/dfs.c create mode 100644 drivers/net/wireless/ath/ath9k/dfs.h create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.c create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.h -- 1.7.4.1 ^ permalink raw reply [flat|nested] 38+ messages in thread
* [RFC v2 0/2] ath9k: DFS radar detection @ 2011-11-03 13:55 ` Zefir Kurtisi 0 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 13:55 UTC (permalink / raw) To: linux-wireless, ath9k-devel; +Cc: rodrigue, nbd, Zefir Kurtisi This patch series proposes DFS radar pulse detection for ath9k. Updates * use DFS HW capability flag instead of #ifdefs * disable feature by default * moved DFS debugfs into own file * reverted BIT() debug flags to hex * limited DFS support to AR_SREV_9280_20_OR_LATER (TBC) * minor changes considering feedback Zefir Kurtisi (2): ath9k: add DFS radar pulse processing ath9k: integrate initial DFS module drivers/net/wireless/ath/ath.h | 2 + drivers/net/wireless/ath/ath9k/Makefile | 2 + drivers/net/wireless/ath/ath9k/debug.c | 3 + drivers/net/wireless/ath/ath9k/debug.h | 2 + drivers/net/wireless/ath/ath9k/dfs.c | 192 ++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath9k/dfs.h | 24 ++++ drivers/net/wireless/ath/ath9k/dfs_debug.c | 89 +++++++++++++ drivers/net/wireless/ath/ath9k/dfs_debug.h | 59 +++++++++ drivers/net/wireless/ath/ath9k/hw.c | 12 ++ drivers/net/wireless/ath/ath9k/hw.h | 1 + drivers/net/wireless/ath/ath9k/main.c | 17 +++ drivers/net/wireless/ath/ath9k/recv.c | 18 ++- 12 files changed, 416 insertions(+), 5 deletions(-) create mode 100644 drivers/net/wireless/ath/ath9k/dfs.c create mode 100644 drivers/net/wireless/ath/ath9k/dfs.h create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.c create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.h -- 1.7.4.1 ^ permalink raw reply [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 1/2] ath9k: add DFS radar pulse processing 2011-11-03 13:55 ` Zefir Kurtisi @ 2011-11-03 13:55 ` Zefir Kurtisi -1 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 13:55 UTC (permalink / raw) To: ath9k-devel This initial DFS module provides basic functionality to deal with radar pulses reported by the DFS HW pattern detector. The reported data is evaluated and basic plausibility checks are performed to filter false pulses. Passing radar pulses are forwarded to pattern detectors (not part of this patch). The patch also includes * new debug level ATH_DBG_DFS * debugfs DFS radar statistics Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com> --- drivers/net/wireless/ath/ath.h | 2 + drivers/net/wireless/ath/ath9k/dfs.c | 192 ++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath9k/dfs.h | 24 ++++ drivers/net/wireless/ath/ath9k/dfs_debug.c | 89 +++++++++++++ drivers/net/wireless/ath/ath9k/dfs_debug.h | 59 +++++++++ 5 files changed, 366 insertions(+), 0 deletions(-) create mode 100644 drivers/net/wireless/ath/ath9k/dfs.c create mode 100644 drivers/net/wireless/ath/ath9k/dfs.h create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.c create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.h diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h index 46d6926..e38fcad 100644 --- a/drivers/net/wireless/ath/ath.h +++ b/drivers/net/wireless/ath/ath.h @@ -215,6 +215,7 @@ do { \ * @ATH_DBG_HWTIMER: hardware timer handling * @ATH_DBG_BTCOEX: bluetooth coexistance * @ATH_DBG_BSTUCK: stuck beacons + * @ATH_DBG_DFS: radar datection * @ATH_DBG_ANY: enable all debugging * * The debug level is used to control the amount and type of debugging output @@ -240,6 +241,7 @@ enum ATH_DEBUG { ATH_DBG_BTCOEX = 0x00002000, ATH_DBG_WMI = 0x00004000, ATH_DBG_BSTUCK = 0x00008000, + ATH_DBG_DFS = 0x00010000, ATH_DBG_ANY = 0xffffffff }; diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/ath/ath9k/dfs.c new file mode 100644 index 0000000..9d3c8b9 --- /dev/null +++ b/drivers/net/wireless/ath/ath9k/dfs.c @@ -0,0 +1,192 @@ +/* + * 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" + +/* pulse duration reported is scaled with 1000/800 us */ +#define AR93X_NSECS_PER_DUR 800 +static u32 dur_to_usecs(u32 dur) +{ + return (dur * AR93X_NSECS_PER_DUR + 500) / 1000; +} + +/* 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; +}; + +/* 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; +}; + +#define PRI_CH_RADAR_FOUND 0x01 +#define EXT_CH_RADAR_FOUND 0x02 +static bool 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 0: + /* Bogus bandwidth info received in descriptor, + so ignore this PHY error */ + DFS_STAT_INC(sc, bwinfo_discards); + return false; + 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; + } + + if (rssi == 0) { + DFS_STAT_INC(sc, rssi_discards); + return false; + } + + /* + * TODO: check chirping pulses + */ + + /* convert duration to usecs */ + drp->width = dur_to_usecs(dur); + drp->rssi = rssi; + + DFS_STAT_INC(sc, pulses_detected); + return true; +} + + +/* + * 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 (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); + */ + } +} +EXPORT_SYMBOL(ath9k_dfs_process_phyerr); diff --git a/drivers/net/wireless/ath/ath9k/dfs.h b/drivers/net/wireless/ath/ath9k/dfs.h new file mode 100644 index 0000000..4d95cad --- /dev/null +++ b/drivers/net/wireless/ath/ath9k/dfs.h @@ -0,0 +1,24 @@ +/* + * 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. + */ + +#ifndef ATH9K_DFS_H +#define ATH9K_DFS_H + +void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data, + struct ath_rx_status *rs, u64 mactime); + +#endif /* ATH9K_DFS_H */ diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.c b/drivers/net/wireless/ath/ath9k/dfs_debug.c new file mode 100644 index 0000000..3c03552 --- /dev/null +++ b/drivers/net/wireless/ath/ath9k/dfs_debug.c @@ -0,0 +1,89 @@ +/* + * 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 <linux/debugfs.h> + +#include "ath9k.h" +#include "dfs_debug.h" + + +#if defined(CONFIG_ATH9K_DEBUGFS) + +#define ATH9K_DFS_STAT(s, p) \ + len += snprintf(buf + len, size - len, "%28s : %10u\n", s, \ + sc->debug.stats.dfs_stats.p); + +static ssize_t read_file_dfs(struct file *file, char __user *user_buf, + size_t count, loff_t *ppos) +{ + struct ath_softc *sc = file->private_data; + struct ath9k_hw_version *hw_ver = &sc->sc_ah->hw_version; + char *buf; + unsigned int len = 0, size = 8000; + ssize_t retval = 0; + + buf = kzalloc(size, GFP_KERNEL); + if (buf == NULL) + return -ENOMEM; + + len += snprintf(buf + len, size - len, "DFS support for " + "macVersion = 0x%x, macRev = 0x%x: %s\n", + hw_ver->macVersion, hw_ver->macRev, + (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_DFS) ? + "enabled" : "disabled"); + ATH9K_DFS_STAT("DFS pulses detected ", pulses_detected); + ATH9K_DFS_STAT("Datalen discards ", datalen_discards); + ATH9K_DFS_STAT("RSSI discards ", rssi_discards); + ATH9K_DFS_STAT("BW info discards ", bwinfo_discards); + ATH9K_DFS_STAT("Primary channel pulses ", pri_phy_errors); + ATH9K_DFS_STAT("Secondary channel pulses", ext_phy_errors); + ATH9K_DFS_STAT("Dual channel pulses ", dc_phy_errors); + + if (len > size) + len = size; + + retval = simple_read_from_buffer(user_buf, count, ppos, buf, len); + kfree(buf); + + return retval; +} + +static int ath9k_dfs_debugfs_open(struct inode *inode, struct file *file) +{ + file->private_data = inode->i_private; + return 0; +} + + +static const struct file_operations fops_dfs_stats = { + .read = read_file_dfs, + .open = ath9k_dfs_debugfs_open, + .owner = THIS_MODULE, + .llseek = default_llseek, +}; + + +void ath9k_dfs_init_debug(struct ath_softc *sc) +{ + debugfs_create_file("dfs_stats", S_IRUSR, + sc->debug.debugfs_phy, sc, &fops_dfs_stats); +} +EXPORT_SYMBOL(ath9k_dfs_init_debug); + +#endif /* CONFIG_ATH9K_DEBUGFS */ + diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.h b/drivers/net/wireless/ath/ath9k/dfs_debug.h new file mode 100644 index 0000000..079cf53 --- /dev/null +++ b/drivers/net/wireless/ath/ath9k/dfs_debug.h @@ -0,0 +1,59 @@ +/* + * 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. + */ + + +#ifndef DFS_DEBUG_H +#define DFS_DEBUG_H + +#include "hw.h" + +/** + * struct ath_dfs_stats - DFS Statistics + * + * @pulses_detected: No. of pulses detected so far + * @datalen_discards: No. of pulses discarded due to invalid datalen + * @rssi_discards: No. of pulses discarded due to invalid RSSI + * @bwinfo_discards: No. of pulses discarded due to invalid BW info + * @pri_phy_errors: No. of pulses reported for primary channel + * @ext_phy_errors: No. of pulses reported for extension channel + * @dc_phy_errors: No. of pulses reported for primary + extension channel + */ +struct ath_dfs_stats { + u32 pulses_detected; + u32 datalen_discards; + u32 rssi_discards; + u32 bwinfo_discards; + u32 pri_phy_errors; + u32 ext_phy_errors; + u32 dc_phy_errors; +}; + + +#if defined(CONFIG_ATH9K_DEBUGFS) + +#define DFS_STAT_INC(sc, c) (sc->debug.stats.dfs_stats.c++) +void ath9k_dfs_init_debug(struct ath_softc *sc); + +#else + +#define DFS_STAT_INC(sc, c) do { } while (0) +static inline void ath9k_dfs_init_debug(struct ath_softc *sc) { } + +#endif + + +#endif /* DFS_DEBUG_H */ -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 38+ messages in thread
* [RFC v2 1/2] ath9k: add DFS radar pulse processing @ 2011-11-03 13:55 ` Zefir Kurtisi 0 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 13:55 UTC (permalink / raw) To: linux-wireless, ath9k-devel; +Cc: rodrigue, nbd, Zefir Kurtisi This initial DFS module provides basic functionality to deal with radar pulses reported by the DFS HW pattern detector. The reported data is evaluated and basic plausibility checks are performed to filter false pulses. Passing radar pulses are forwarded to pattern detectors (not part of this patch). The patch also includes * new debug level ATH_DBG_DFS * debugfs DFS radar statistics Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com> --- drivers/net/wireless/ath/ath.h | 2 + drivers/net/wireless/ath/ath9k/dfs.c | 192 ++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath9k/dfs.h | 24 ++++ drivers/net/wireless/ath/ath9k/dfs_debug.c | 89 +++++++++++++ drivers/net/wireless/ath/ath9k/dfs_debug.h | 59 +++++++++ 5 files changed, 366 insertions(+), 0 deletions(-) create mode 100644 drivers/net/wireless/ath/ath9k/dfs.c create mode 100644 drivers/net/wireless/ath/ath9k/dfs.h create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.c create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.h diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h index 46d6926..e38fcad 100644 --- a/drivers/net/wireless/ath/ath.h +++ b/drivers/net/wireless/ath/ath.h @@ -215,6 +215,7 @@ do { \ * @ATH_DBG_HWTIMER: hardware timer handling * @ATH_DBG_BTCOEX: bluetooth coexistance * @ATH_DBG_BSTUCK: stuck beacons + * @ATH_DBG_DFS: radar datection * @ATH_DBG_ANY: enable all debugging * * The debug level is used to control the amount and type of debugging output @@ -240,6 +241,7 @@ enum ATH_DEBUG { ATH_DBG_BTCOEX = 0x00002000, ATH_DBG_WMI = 0x00004000, ATH_DBG_BSTUCK = 0x00008000, + ATH_DBG_DFS = 0x00010000, ATH_DBG_ANY = 0xffffffff }; diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/ath/ath9k/dfs.c new file mode 100644 index 0000000..9d3c8b9 --- /dev/null +++ b/drivers/net/wireless/ath/ath9k/dfs.c @@ -0,0 +1,192 @@ +/* + * 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" + +/* pulse duration reported is scaled with 1000/800 us */ +#define AR93X_NSECS_PER_DUR 800 +static u32 dur_to_usecs(u32 dur) +{ + return (dur * AR93X_NSECS_PER_DUR + 500) / 1000; +} + +/* 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; +}; + +/* 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; +}; + +#define PRI_CH_RADAR_FOUND 0x01 +#define EXT_CH_RADAR_FOUND 0x02 +static bool 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 0: + /* Bogus bandwidth info received in descriptor, + so ignore this PHY error */ + DFS_STAT_INC(sc, bwinfo_discards); + return false; + 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; + } + + if (rssi == 0) { + DFS_STAT_INC(sc, rssi_discards); + return false; + } + + /* + * TODO: check chirping pulses + */ + + /* convert duration to usecs */ + drp->width = dur_to_usecs(dur); + drp->rssi = rssi; + + DFS_STAT_INC(sc, pulses_detected); + return true; +} + + +/* + * 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 (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); + */ + } +} +EXPORT_SYMBOL(ath9k_dfs_process_phyerr); diff --git a/drivers/net/wireless/ath/ath9k/dfs.h b/drivers/net/wireless/ath/ath9k/dfs.h new file mode 100644 index 0000000..4d95cad --- /dev/null +++ b/drivers/net/wireless/ath/ath9k/dfs.h @@ -0,0 +1,24 @@ +/* + * 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. + */ + +#ifndef ATH9K_DFS_H +#define ATH9K_DFS_H + +void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data, + struct ath_rx_status *rs, u64 mactime); + +#endif /* ATH9K_DFS_H */ diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.c b/drivers/net/wireless/ath/ath9k/dfs_debug.c new file mode 100644 index 0000000..3c03552 --- /dev/null +++ b/drivers/net/wireless/ath/ath9k/dfs_debug.c @@ -0,0 +1,89 @@ +/* + * 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 <linux/debugfs.h> + +#include "ath9k.h" +#include "dfs_debug.h" + + +#if defined(CONFIG_ATH9K_DEBUGFS) + +#define ATH9K_DFS_STAT(s, p) \ + len += snprintf(buf + len, size - len, "%28s : %10u\n", s, \ + sc->debug.stats.dfs_stats.p); + +static ssize_t read_file_dfs(struct file *file, char __user *user_buf, + size_t count, loff_t *ppos) +{ + struct ath_softc *sc = file->private_data; + struct ath9k_hw_version *hw_ver = &sc->sc_ah->hw_version; + char *buf; + unsigned int len = 0, size = 8000; + ssize_t retval = 0; + + buf = kzalloc(size, GFP_KERNEL); + if (buf == NULL) + return -ENOMEM; + + len += snprintf(buf + len, size - len, "DFS support for " + "macVersion = 0x%x, macRev = 0x%x: %s\n", + hw_ver->macVersion, hw_ver->macRev, + (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_DFS) ? + "enabled" : "disabled"); + ATH9K_DFS_STAT("DFS pulses detected ", pulses_detected); + ATH9K_DFS_STAT("Datalen discards ", datalen_discards); + ATH9K_DFS_STAT("RSSI discards ", rssi_discards); + ATH9K_DFS_STAT("BW info discards ", bwinfo_discards); + ATH9K_DFS_STAT("Primary channel pulses ", pri_phy_errors); + ATH9K_DFS_STAT("Secondary channel pulses", ext_phy_errors); + ATH9K_DFS_STAT("Dual channel pulses ", dc_phy_errors); + + if (len > size) + len = size; + + retval = simple_read_from_buffer(user_buf, count, ppos, buf, len); + kfree(buf); + + return retval; +} + +static int ath9k_dfs_debugfs_open(struct inode *inode, struct file *file) +{ + file->private_data = inode->i_private; + return 0; +} + + +static const struct file_operations fops_dfs_stats = { + .read = read_file_dfs, + .open = ath9k_dfs_debugfs_open, + .owner = THIS_MODULE, + .llseek = default_llseek, +}; + + +void ath9k_dfs_init_debug(struct ath_softc *sc) +{ + debugfs_create_file("dfs_stats", S_IRUSR, + sc->debug.debugfs_phy, sc, &fops_dfs_stats); +} +EXPORT_SYMBOL(ath9k_dfs_init_debug); + +#endif /* CONFIG_ATH9K_DEBUGFS */ + diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.h b/drivers/net/wireless/ath/ath9k/dfs_debug.h new file mode 100644 index 0000000..079cf53 --- /dev/null +++ b/drivers/net/wireless/ath/ath9k/dfs_debug.h @@ -0,0 +1,59 @@ +/* + * 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. + */ + + +#ifndef DFS_DEBUG_H +#define DFS_DEBUG_H + +#include "hw.h" + +/** + * struct ath_dfs_stats - DFS Statistics + * + * @pulses_detected: No. of pulses detected so far + * @datalen_discards: No. of pulses discarded due to invalid datalen + * @rssi_discards: No. of pulses discarded due to invalid RSSI + * @bwinfo_discards: No. of pulses discarded due to invalid BW info + * @pri_phy_errors: No. of pulses reported for primary channel + * @ext_phy_errors: No. of pulses reported for extension channel + * @dc_phy_errors: No. of pulses reported for primary + extension channel + */ +struct ath_dfs_stats { + u32 pulses_detected; + u32 datalen_discards; + u32 rssi_discards; + u32 bwinfo_discards; + u32 pri_phy_errors; + u32 ext_phy_errors; + u32 dc_phy_errors; +}; + + +#if defined(CONFIG_ATH9K_DEBUGFS) + +#define DFS_STAT_INC(sc, c) (sc->debug.stats.dfs_stats.c++) +void ath9k_dfs_init_debug(struct ath_softc *sc); + +#else + +#define DFS_STAT_INC(sc, c) do { } while (0) +static inline void ath9k_dfs_init_debug(struct ath_softc *sc) { } + +#endif + + +#endif /* DFS_DEBUG_H */ -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 1/2] ath9k: add DFS radar pulse processing 2011-11-03 13:55 ` Zefir Kurtisi @ 2011-11-03 15:54 ` Mohammed Shafi -1 siblings, 0 replies; 38+ messages in thread From: Mohammed Shafi @ 2011-11-03 15:54 UTC (permalink / raw) To: ath9k-devel On Thu, Nov 3, 2011 at 7:25 PM, Zefir Kurtisi <zefir.kurtisi@neratec.com> wrote: > This initial DFS module provides basic functionality to deal with > radar pulses reported by the DFS HW pattern detector. > > The reported data is evaluated and basic plausibility checks are > performed to filter false pulses. Passing radar pulses are > forwarded to pattern detectors (not part of this patch). > > The patch also includes > ?* new debug level ATH_DBG_DFS > ?* debugfs DFS radar statistics > > Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com> > --- > ?drivers/net/wireless/ath/ath.h ? ? ? ? ? ? | ? ?2 + > ?drivers/net/wireless/ath/ath9k/dfs.c ? ? ? | ?192 ++++++++++++++++++++++++++++ > ?drivers/net/wireless/ath/ath9k/dfs.h ? ? ? | ? 24 ++++ > ?drivers/net/wireless/ath/ath9k/dfs_debug.c | ? 89 +++++++++++++ > ?drivers/net/wireless/ath/ath9k/dfs_debug.h | ? 59 +++++++++ > ?5 files changed, 366 insertions(+), 0 deletions(-) > ?create mode 100644 drivers/net/wireless/ath/ath9k/dfs.c > ?create mode 100644 drivers/net/wireless/ath/ath9k/dfs.h > ?create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.c > ?create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.h > > diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h > index 46d6926..e38fcad 100644 > --- a/drivers/net/wireless/ath/ath.h > +++ b/drivers/net/wireless/ath/ath.h > @@ -215,6 +215,7 @@ do { ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?\ > ?* @ATH_DBG_HWTIMER: hardware timer handling > ?* @ATH_DBG_BTCOEX: bluetooth coexistance > ?* @ATH_DBG_BSTUCK: stuck beacons > + * @ATH_DBG_DFS: radar datection > ?* @ATH_DBG_ANY: enable all debugging > ?* > ?* The debug level is used to control the amount and type of debugging output > @@ -240,6 +241,7 @@ enum ATH_DEBUG { > ? ? ? ?ATH_DBG_BTCOEX ? ? ? ? ?= 0x00002000, > ? ? ? ?ATH_DBG_WMI ? ? ? ? ? ? = 0x00004000, > ? ? ? ?ATH_DBG_BSTUCK ? ? ? ? ?= 0x00008000, > + ? ? ? ATH_DBG_DFS ? ? ? ? ? ? = 0x00010000, > ? ? ? ?ATH_DBG_ANY ? ? ? ? ? ? = 0xffffffff > ?}; > > diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/ath/ath9k/dfs.c > new file mode 100644 > index 0000000..9d3c8b9 > --- /dev/null > +++ b/drivers/net/wireless/ath/ath9k/dfs.c > @@ -0,0 +1,192 @@ > +/* > + * 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" > + > +/* pulse duration reported is scaled with 1000/800 us */ > +#define AR93X_NSECS_PER_DUR 800 > +static u32 dur_to_usecs(u32 dur) > +{ > + ? ? ? return (dur * AR93X_NSECS_PER_DUR + 500) / 1000; > +} > + > +/* 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; > +}; > + > +/* 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; > +}; > + > +#define PRI_CH_RADAR_FOUND 0x01 > +#define EXT_CH_RADAR_FOUND 0x02 > +static bool postprocess_radar_event(struct ath_softc *sc, > + ? ? ? ? ? ? ? struct ath_radar_data *are, struct dfs_radar_pulse *drp) ath9k_postprocess_radar_event would be better? > +{ > + ? ? ? 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 0: > + ? ? ? ? ? ? ? /* Bogus bandwidth info received in descriptor, > + ? ? ? ? ? ? ? ?so ignore this PHY error */ > + ? ? ? ? ? ? ? DFS_STAT_INC(sc, bwinfo_discards); > + ? ? ? ? ? ? ? return false; > + ? ? ? 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; > + ? ? ? } > + > + ? ? ? if (rssi == 0) { > + ? ? ? ? ? ? ? DFS_STAT_INC(sc, rssi_discards); > + ? ? ? ? ? ? ? return false; > + ? ? ? } > + > + ? ? ? /* > + ? ? ? ?* TODO: check chirping pulses > + ? ? ? ?*/ > + > + ? ? ? /* convert duration to usecs */ > + ? ? ? drp->width = dur_to_usecs(dur); > + ? ? ? drp->rssi = rssi; > + > + ? ? ? DFS_STAT_INC(sc, pulses_detected); > + ? ? ? return true; > +} > + > + > +/* > + * 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 (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); > + ? ? ? ? ? ? ? ?*/ > + ? ? ? } > +} > +EXPORT_SYMBOL(ath9k_dfs_process_phyerr); > diff --git a/drivers/net/wireless/ath/ath9k/dfs.h b/drivers/net/wireless/ath/ath9k/dfs.h > new file mode 100644 > index 0000000..4d95cad > --- /dev/null > +++ b/drivers/net/wireless/ath/ath9k/dfs.h > @@ -0,0 +1,24 @@ > +/* > + * 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. > + */ > + > +#ifndef ATH9K_DFS_H > +#define ATH9K_DFS_H > + > +void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data, > + ? ? ? ? ? ? ? struct ath_rx_status *rs, u64 mactime); > + > +#endif /* ATH9K_DFS_H */ > diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.c b/drivers/net/wireless/ath/ath9k/dfs_debug.c > new file mode 100644 > index 0000000..3c03552 > --- /dev/null > +++ b/drivers/net/wireless/ath/ath9k/dfs_debug.c > @@ -0,0 +1,89 @@ > +/* > + * 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 <linux/debugfs.h> > + > +#include "ath9k.h" > +#include "dfs_debug.h" > + > + > +#if defined(CONFIG_ATH9K_DEBUGFS) > + > +#define ATH9K_DFS_STAT(s, p) \ > + ? ? ? len += snprintf(buf + len, size - len, "%28s : %10u\n", s, \ > + ? ? ? ? ? ? ? ? ? ? ? sc->debug.stats.dfs_stats.p); > + > +static ssize_t read_file_dfs(struct file *file, char __user *user_buf, > + ? ? ? ? ? ? ? ? ? ? ? ? ? ?size_t count, loff_t *ppos) > +{ > + ? ? ? struct ath_softc *sc = file->private_data; > + ? ? ? struct ath9k_hw_version *hw_ver = &sc->sc_ah->hw_version; > + ? ? ? char *buf; > + ? ? ? unsigned int len = 0, size = 8000; > + ? ? ? ssize_t retval = 0; > + > + ? ? ? buf = kzalloc(size, GFP_KERNEL); > + ? ? ? if (buf == NULL) > + ? ? ? ? ? ? ? return -ENOMEM; > + > + ? ? ? len += snprintf(buf + len, size - len, "DFS support for " > + ? ? ? ? ? ? ? ? ? ? ? "macVersion = 0x%x, macRev = 0x%x: %s\n", > + ? ? ? ? ? ? ? ? ? ? ? hw_ver->macVersion, hw_ver->macRev, > + ? ? ? ? ? ? ? ? ? ? ? (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_DFS) ? > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? "enabled" : "disabled"); > + ? ? ? ATH9K_DFS_STAT("DFS pulses detected ? ? ", pulses_detected); > + ? ? ? ATH9K_DFS_STAT("Datalen discards ? ? ? ?", datalen_discards); > + ? ? ? ATH9K_DFS_STAT("RSSI discards ? ? ? ? ? ", rssi_discards); > + ? ? ? ATH9K_DFS_STAT("BW info discards ? ? ? ?", bwinfo_discards); > + ? ? ? ATH9K_DFS_STAT("Primary channel pulses ?", pri_phy_errors); > + ? ? ? ATH9K_DFS_STAT("Secondary channel pulses", ext_phy_errors); > + ? ? ? ATH9K_DFS_STAT("Dual channel pulses ? ? ", dc_phy_errors); > + > + ? ? ? if (len > size) > + ? ? ? ? ? ? ? len = size; > + > + ? ? ? retval = simple_read_from_buffer(user_buf, count, ppos, buf, len); > + ? ? ? kfree(buf); > + > + ? ? ? return retval; > +} > + > +static int ath9k_dfs_debugfs_open(struct inode *inode, struct file *file) > +{ > + ? ? ? file->private_data = inode->i_private; > + ? ? ? return 0; > +} > + > + > +static const struct file_operations fops_dfs_stats = { > + ? ? ? .read = read_file_dfs, > + ? ? ? .open = ath9k_dfs_debugfs_open, > + ? ? ? .owner = THIS_MODULE, > + ? ? ? .llseek = default_llseek, > +}; > + > + > +void ath9k_dfs_init_debug(struct ath_softc *sc) > +{ > + ? ? ? debugfs_create_file("dfs_stats", S_IRUSR, > + ? ? ? ? ? ? ? ? ? ? ? sc->debug.debugfs_phy, sc, &fops_dfs_stats); > +} > +EXPORT_SYMBOL(ath9k_dfs_init_debug); > + > +#endif /* CONFIG_ATH9K_DEBUGFS */ > + > diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.h b/drivers/net/wireless/ath/ath9k/dfs_debug.h > new file mode 100644 > index 0000000..079cf53 > --- /dev/null > +++ b/drivers/net/wireless/ath/ath9k/dfs_debug.h > @@ -0,0 +1,59 @@ > +/* > + * 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. > + */ > + > + > +#ifndef DFS_DEBUG_H > +#define DFS_DEBUG_H > + > +#include "hw.h" > + > +/** > + * struct ath_dfs_stats - DFS Statistics > + * > + * @pulses_detected: ?No. of pulses detected so far > + * @datalen_discards: No. of pulses discarded due to invalid datalen > + * @rssi_discards: ? ?No. of pulses discarded due to invalid RSSI > + * @bwinfo_discards: ?No. of pulses discarded due to invalid BW info > + * @pri_phy_errors: ? No. of pulses reported for primary channel > + * @ext_phy_errors: ? No. of pulses reported for extension channel > + * @dc_phy_errors: ? ?No. of pulses reported for primary + extension channel > + */ > +struct ath_dfs_stats { > + ? ? ? u32 pulses_detected; > + ? ? ? u32 datalen_discards; > + ? ? ? u32 rssi_discards; > + ? ? ? u32 bwinfo_discards; > + ? ? ? u32 pri_phy_errors; > + ? ? ? u32 ext_phy_errors; > + ? ? ? u32 dc_phy_errors; > +}; > + > + > +#if defined(CONFIG_ATH9K_DEBUGFS) > + > +#define DFS_STAT_INC(sc, c) (sc->debug.stats.dfs_stats.c++) > +void ath9k_dfs_init_debug(struct ath_softc *sc); > + > +#else > + > +#define DFS_STAT_INC(sc, c) do { } while (0) > +static inline void ath9k_dfs_init_debug(struct ath_softc *sc) { } > + > +#endif > + > + > +#endif /* DFS_DEBUG_H */ > -- > 1.7.4.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at ?http://vger.kernel.org/majordomo-info.html > -- shafi ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [RFC v2 1/2] ath9k: add DFS radar pulse processing @ 2011-11-03 15:54 ` Mohammed Shafi 0 siblings, 0 replies; 38+ messages in thread From: Mohammed Shafi @ 2011-11-03 15:54 UTC (permalink / raw) To: Zefir Kurtisi; +Cc: linux-wireless, ath9k-devel, rodrigue, nbd On Thu, Nov 3, 2011 at 7:25 PM, Zefir Kurtisi <zefir.kurtisi@neratec.com> wrote: > This initial DFS module provides basic functionality to deal with > radar pulses reported by the DFS HW pattern detector. > > The reported data is evaluated and basic plausibility checks are > performed to filter false pulses. Passing radar pulses are > forwarded to pattern detectors (not part of this patch). > > The patch also includes > * new debug level ATH_DBG_DFS > * debugfs DFS radar statistics > > Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com> > --- > drivers/net/wireless/ath/ath.h | 2 + > drivers/net/wireless/ath/ath9k/dfs.c | 192 ++++++++++++++++++++++++++++ > drivers/net/wireless/ath/ath9k/dfs.h | 24 ++++ > drivers/net/wireless/ath/ath9k/dfs_debug.c | 89 +++++++++++++ > drivers/net/wireless/ath/ath9k/dfs_debug.h | 59 +++++++++ > 5 files changed, 366 insertions(+), 0 deletions(-) > create mode 100644 drivers/net/wireless/ath/ath9k/dfs.c > create mode 100644 drivers/net/wireless/ath/ath9k/dfs.h > create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.c > create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.h > > diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h > index 46d6926..e38fcad 100644 > --- a/drivers/net/wireless/ath/ath.h > +++ b/drivers/net/wireless/ath/ath.h > @@ -215,6 +215,7 @@ do { \ > * @ATH_DBG_HWTIMER: hardware timer handling > * @ATH_DBG_BTCOEX: bluetooth coexistance > * @ATH_DBG_BSTUCK: stuck beacons > + * @ATH_DBG_DFS: radar datection > * @ATH_DBG_ANY: enable all debugging > * > * The debug level is used to control the amount and type of debugging output > @@ -240,6 +241,7 @@ enum ATH_DEBUG { > ATH_DBG_BTCOEX = 0x00002000, > ATH_DBG_WMI = 0x00004000, > ATH_DBG_BSTUCK = 0x00008000, > + ATH_DBG_DFS = 0x00010000, > ATH_DBG_ANY = 0xffffffff > }; > > diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/ath/ath9k/dfs.c > new file mode 100644 > index 0000000..9d3c8b9 > --- /dev/null > +++ b/drivers/net/wireless/ath/ath9k/dfs.c > @@ -0,0 +1,192 @@ > +/* > + * 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" > + > +/* pulse duration reported is scaled with 1000/800 us */ > +#define AR93X_NSECS_PER_DUR 800 > +static u32 dur_to_usecs(u32 dur) > +{ > + return (dur * AR93X_NSECS_PER_DUR + 500) / 1000; > +} > + > +/* 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; > +}; > + > +/* 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; > +}; > + > +#define PRI_CH_RADAR_FOUND 0x01 > +#define EXT_CH_RADAR_FOUND 0x02 > +static bool postprocess_radar_event(struct ath_softc *sc, > + struct ath_radar_data *are, struct dfs_radar_pulse *drp) ath9k_postprocess_radar_event would be better? > +{ > + 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 0: > + /* Bogus bandwidth info received in descriptor, > + so ignore this PHY error */ > + DFS_STAT_INC(sc, bwinfo_discards); > + return false; > + 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; > + } > + > + if (rssi == 0) { > + DFS_STAT_INC(sc, rssi_discards); > + return false; > + } > + > + /* > + * TODO: check chirping pulses > + */ > + > + /* convert duration to usecs */ > + drp->width = dur_to_usecs(dur); > + drp->rssi = rssi; > + > + DFS_STAT_INC(sc, pulses_detected); > + return true; > +} > + > + > +/* > + * 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 (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); > + */ > + } > +} > +EXPORT_SYMBOL(ath9k_dfs_process_phyerr); > diff --git a/drivers/net/wireless/ath/ath9k/dfs.h b/drivers/net/wireless/ath/ath9k/dfs.h > new file mode 100644 > index 0000000..4d95cad > --- /dev/null > +++ b/drivers/net/wireless/ath/ath9k/dfs.h > @@ -0,0 +1,24 @@ > +/* > + * 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. > + */ > + > +#ifndef ATH9K_DFS_H > +#define ATH9K_DFS_H > + > +void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data, > + struct ath_rx_status *rs, u64 mactime); > + > +#endif /* ATH9K_DFS_H */ > diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.c b/drivers/net/wireless/ath/ath9k/dfs_debug.c > new file mode 100644 > index 0000000..3c03552 > --- /dev/null > +++ b/drivers/net/wireless/ath/ath9k/dfs_debug.c > @@ -0,0 +1,89 @@ > +/* > + * 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 <linux/debugfs.h> > + > +#include "ath9k.h" > +#include "dfs_debug.h" > + > + > +#if defined(CONFIG_ATH9K_DEBUGFS) > + > +#define ATH9K_DFS_STAT(s, p) \ > + len += snprintf(buf + len, size - len, "%28s : %10u\n", s, \ > + sc->debug.stats.dfs_stats.p); > + > +static ssize_t read_file_dfs(struct file *file, char __user *user_buf, > + size_t count, loff_t *ppos) > +{ > + struct ath_softc *sc = file->private_data; > + struct ath9k_hw_version *hw_ver = &sc->sc_ah->hw_version; > + char *buf; > + unsigned int len = 0, size = 8000; > + ssize_t retval = 0; > + > + buf = kzalloc(size, GFP_KERNEL); > + if (buf == NULL) > + return -ENOMEM; > + > + len += snprintf(buf + len, size - len, "DFS support for " > + "macVersion = 0x%x, macRev = 0x%x: %s\n", > + hw_ver->macVersion, hw_ver->macRev, > + (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_DFS) ? > + "enabled" : "disabled"); > + ATH9K_DFS_STAT("DFS pulses detected ", pulses_detected); > + ATH9K_DFS_STAT("Datalen discards ", datalen_discards); > + ATH9K_DFS_STAT("RSSI discards ", rssi_discards); > + ATH9K_DFS_STAT("BW info discards ", bwinfo_discards); > + ATH9K_DFS_STAT("Primary channel pulses ", pri_phy_errors); > + ATH9K_DFS_STAT("Secondary channel pulses", ext_phy_errors); > + ATH9K_DFS_STAT("Dual channel pulses ", dc_phy_errors); > + > + if (len > size) > + len = size; > + > + retval = simple_read_from_buffer(user_buf, count, ppos, buf, len); > + kfree(buf); > + > + return retval; > +} > + > +static int ath9k_dfs_debugfs_open(struct inode *inode, struct file *file) > +{ > + file->private_data = inode->i_private; > + return 0; > +} > + > + > +static const struct file_operations fops_dfs_stats = { > + .read = read_file_dfs, > + .open = ath9k_dfs_debugfs_open, > + .owner = THIS_MODULE, > + .llseek = default_llseek, > +}; > + > + > +void ath9k_dfs_init_debug(struct ath_softc *sc) > +{ > + debugfs_create_file("dfs_stats", S_IRUSR, > + sc->debug.debugfs_phy, sc, &fops_dfs_stats); > +} > +EXPORT_SYMBOL(ath9k_dfs_init_debug); > + > +#endif /* CONFIG_ATH9K_DEBUGFS */ > + > diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.h b/drivers/net/wireless/ath/ath9k/dfs_debug.h > new file mode 100644 > index 0000000..079cf53 > --- /dev/null > +++ b/drivers/net/wireless/ath/ath9k/dfs_debug.h > @@ -0,0 +1,59 @@ > +/* > + * 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. > + */ > + > + > +#ifndef DFS_DEBUG_H > +#define DFS_DEBUG_H > + > +#include "hw.h" > + > +/** > + * struct ath_dfs_stats - DFS Statistics > + * > + * @pulses_detected: No. of pulses detected so far > + * @datalen_discards: No. of pulses discarded due to invalid datalen > + * @rssi_discards: No. of pulses discarded due to invalid RSSI > + * @bwinfo_discards: No. of pulses discarded due to invalid BW info > + * @pri_phy_errors: No. of pulses reported for primary channel > + * @ext_phy_errors: No. of pulses reported for extension channel > + * @dc_phy_errors: No. of pulses reported for primary + extension channel > + */ > +struct ath_dfs_stats { > + u32 pulses_detected; > + u32 datalen_discards; > + u32 rssi_discards; > + u32 bwinfo_discards; > + u32 pri_phy_errors; > + u32 ext_phy_errors; > + u32 dc_phy_errors; > +}; > + > + > +#if defined(CONFIG_ATH9K_DEBUGFS) > + > +#define DFS_STAT_INC(sc, c) (sc->debug.stats.dfs_stats.c++) > +void ath9k_dfs_init_debug(struct ath_softc *sc); > + > +#else > + > +#define DFS_STAT_INC(sc, c) do { } while (0) > +static inline void ath9k_dfs_init_debug(struct ath_softc *sc) { } > + > +#endif > + > + > +#endif /* DFS_DEBUG_H */ > -- > 1.7.4.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- shafi ^ permalink raw reply [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 1/2] ath9k: add DFS radar pulse processing 2011-11-03 15:54 ` Mohammed Shafi @ 2011-11-03 16:25 ` Zefir Kurtisi -1 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 16:25 UTC (permalink / raw) To: ath9k-devel On 11/03/2011 04:54 PM, Mohammed Shafi wrote: > On Thu, Nov 3, 2011 at 7:25 PM, Zefir Kurtisi <zefir.kurtisi@neratec.com> wrote: >> [...] >> +static bool postprocess_radar_event(struct ath_softc *sc, >> + struct ath_radar_data *are, struct dfs_radar_pulse *drp) > > ath9k_postprocess_radar_event would be better? > Ok (I don't mind, as it's static anyhow.). ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [RFC v2 1/2] ath9k: add DFS radar pulse processing @ 2011-11-03 16:25 ` Zefir Kurtisi 0 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 16:25 UTC (permalink / raw) To: Mohammed Shafi; +Cc: linux-wireless, ath9k-devel, rodrigue, nbd On 11/03/2011 04:54 PM, Mohammed Shafi wrote: > On Thu, Nov 3, 2011 at 7:25 PM, Zefir Kurtisi <zefir.kurtisi@neratec.com> wrote: >> [...] >> +static bool postprocess_radar_event(struct ath_softc *sc, >> + struct ath_radar_data *are, struct dfs_radar_pulse *drp) > > ath9k_postprocess_radar_event would be better? > Ok (I don't mind, as it's static anyhow.). ^ permalink raw reply [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 1/2] ath9k: add DFS radar pulse processing 2011-11-03 13:55 ` Zefir Kurtisi @ 2011-11-03 15:56 ` Mohammed Shafi -1 siblings, 0 replies; 38+ messages in thread From: Mohammed Shafi @ 2011-11-03 15:56 UTC (permalink / raw) To: ath9k-devel On Thu, Nov 3, 2011 at 7:25 PM, Zefir Kurtisi <zefir.kurtisi@neratec.com> wrote: > This initial DFS module provides basic functionality to deal with > radar pulses reported by the DFS HW pattern detector. > > The reported data is evaluated and basic plausibility checks are > performed to filter false pulses. Passing radar pulses are > forwarded to pattern detectors (not part of this patch). > > The patch also includes > ?* new debug level ATH_DBG_DFS > ?* debugfs DFS radar statistics > > Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com> > --- > ?drivers/net/wireless/ath/ath.h ? ? ? ? ? ? | ? ?2 + > ?drivers/net/wireless/ath/ath9k/dfs.c ? ? ? | ?192 ++++++++++++++++++++++++++++ > ?drivers/net/wireless/ath/ath9k/dfs.h ? ? ? | ? 24 ++++ > ?drivers/net/wireless/ath/ath9k/dfs_debug.c | ? 89 +++++++++++++ > ?drivers/net/wireless/ath/ath9k/dfs_debug.h | ? 59 +++++++++ > ?5 files changed, 366 insertions(+), 0 deletions(-) > ?create mode 100644 drivers/net/wireless/ath/ath9k/dfs.c > ?create mode 100644 drivers/net/wireless/ath/ath9k/dfs.h > ?create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.c > ?create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.h > > diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h > index 46d6926..e38fcad 100644 > --- a/drivers/net/wireless/ath/ath.h > +++ b/drivers/net/wireless/ath/ath.h > @@ -215,6 +215,7 @@ do { ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?\ > ?* @ATH_DBG_HWTIMER: hardware timer handling > ?* @ATH_DBG_BTCOEX: bluetooth coexistance > ?* @ATH_DBG_BSTUCK: stuck beacons > + * @ATH_DBG_DFS: radar datection > ?* @ATH_DBG_ANY: enable all debugging > ?* > ?* The debug level is used to control the amount and type of debugging output > @@ -240,6 +241,7 @@ enum ATH_DEBUG { > ? ? ? ?ATH_DBG_BTCOEX ? ? ? ? ?= 0x00002000, > ? ? ? ?ATH_DBG_WMI ? ? ? ? ? ? = 0x00004000, > ? ? ? ?ATH_DBG_BSTUCK ? ? ? ? ?= 0x00008000, > + ? ? ? ATH_DBG_DFS ? ? ? ? ? ? = 0x00010000, > ? ? ? ?ATH_DBG_ANY ? ? ? ? ? ? = 0xffffffff > ?}; > > diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/ath/ath9k/dfs.c > new file mode 100644 > index 0000000..9d3c8b9 > --- /dev/null > +++ b/drivers/net/wireless/ath/ath9k/dfs.c > @@ -0,0 +1,192 @@ > +/* > + * 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" > + > +/* pulse duration reported is scaled with 1000/800 us */ > +#define AR93X_NSECS_PER_DUR 800 > +static u32 dur_to_usecs(u32 dur) > +{ > + ? ? ? return (dur * AR93X_NSECS_PER_DUR + 500) / 1000; > +} > + > +/* 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; > +}; > + > +/* 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; > +}; > + > +#define PRI_CH_RADAR_FOUND 0x01 > +#define EXT_CH_RADAR_FOUND 0x02 > +static bool 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 0: can we define some macro for this. thanks! > + ? ? ? ? ? ? ? /* Bogus bandwidth info received in descriptor, > + ? ? ? ? ? ? ? ?so ignore this PHY error */ > + ? ? ? ? ? ? ? DFS_STAT_INC(sc, bwinfo_discards); > + ? ? ? ? ? ? ? return false; > + ? ? ? 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; > + ? ? ? } > + > + ? ? ? if (rssi == 0) { > + ? ? ? ? ? ? ? DFS_STAT_INC(sc, rssi_discards); > + ? ? ? ? ? ? ? return false; > + ? ? ? } > + > + ? ? ? /* > + ? ? ? ?* TODO: check chirping pulses > + ? ? ? ?*/ > + > + ? ? ? /* convert duration to usecs */ > + ? ? ? drp->width = dur_to_usecs(dur); > + ? ? ? drp->rssi = rssi; > + > + ? ? ? DFS_STAT_INC(sc, pulses_detected); > + ? ? ? return true; > +} > + > + > +/* > + * 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 (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); > + ? ? ? ? ? ? ? ?*/ > + ? ? ? } > +} > +EXPORT_SYMBOL(ath9k_dfs_process_phyerr); > diff --git a/drivers/net/wireless/ath/ath9k/dfs.h b/drivers/net/wireless/ath/ath9k/dfs.h > new file mode 100644 > index 0000000..4d95cad > --- /dev/null > +++ b/drivers/net/wireless/ath/ath9k/dfs.h > @@ -0,0 +1,24 @@ > +/* > + * 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. > + */ > + > +#ifndef ATH9K_DFS_H > +#define ATH9K_DFS_H > + > +void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data, > + ? ? ? ? ? ? ? struct ath_rx_status *rs, u64 mactime); > + > +#endif /* ATH9K_DFS_H */ > diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.c b/drivers/net/wireless/ath/ath9k/dfs_debug.c > new file mode 100644 > index 0000000..3c03552 > --- /dev/null > +++ b/drivers/net/wireless/ath/ath9k/dfs_debug.c > @@ -0,0 +1,89 @@ > +/* > + * 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 <linux/debugfs.h> > + > +#include "ath9k.h" > +#include "dfs_debug.h" > + > + > +#if defined(CONFIG_ATH9K_DEBUGFS) > + > +#define ATH9K_DFS_STAT(s, p) \ > + ? ? ? len += snprintf(buf + len, size - len, "%28s : %10u\n", s, \ > + ? ? ? ? ? ? ? ? ? ? ? sc->debug.stats.dfs_stats.p); > + > +static ssize_t read_file_dfs(struct file *file, char __user *user_buf, > + ? ? ? ? ? ? ? ? ? ? ? ? ? ?size_t count, loff_t *ppos) > +{ > + ? ? ? struct ath_softc *sc = file->private_data; > + ? ? ? struct ath9k_hw_version *hw_ver = &sc->sc_ah->hw_version; > + ? ? ? char *buf; > + ? ? ? unsigned int len = 0, size = 8000; > + ? ? ? ssize_t retval = 0; > + > + ? ? ? buf = kzalloc(size, GFP_KERNEL); > + ? ? ? if (buf == NULL) > + ? ? ? ? ? ? ? return -ENOMEM; > + > + ? ? ? len += snprintf(buf + len, size - len, "DFS support for " > + ? ? ? ? ? ? ? ? ? ? ? "macVersion = 0x%x, macRev = 0x%x: %s\n", > + ? ? ? ? ? ? ? ? ? ? ? hw_ver->macVersion, hw_ver->macRev, > + ? ? ? ? ? ? ? ? ? ? ? (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_DFS) ? > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? "enabled" : "disabled"); > + ? ? ? ATH9K_DFS_STAT("DFS pulses detected ? ? ", pulses_detected); > + ? ? ? ATH9K_DFS_STAT("Datalen discards ? ? ? ?", datalen_discards); > + ? ? ? ATH9K_DFS_STAT("RSSI discards ? ? ? ? ? ", rssi_discards); > + ? ? ? ATH9K_DFS_STAT("BW info discards ? ? ? ?", bwinfo_discards); > + ? ? ? ATH9K_DFS_STAT("Primary channel pulses ?", pri_phy_errors); > + ? ? ? ATH9K_DFS_STAT("Secondary channel pulses", ext_phy_errors); > + ? ? ? ATH9K_DFS_STAT("Dual channel pulses ? ? ", dc_phy_errors); > + > + ? ? ? if (len > size) > + ? ? ? ? ? ? ? len = size; > + > + ? ? ? retval = simple_read_from_buffer(user_buf, count, ppos, buf, len); > + ? ? ? kfree(buf); > + > + ? ? ? return retval; > +} > + > +static int ath9k_dfs_debugfs_open(struct inode *inode, struct file *file) > +{ > + ? ? ? file->private_data = inode->i_private; > + ? ? ? return 0; > +} > + > + > +static const struct file_operations fops_dfs_stats = { > + ? ? ? .read = read_file_dfs, > + ? ? ? .open = ath9k_dfs_debugfs_open, > + ? ? ? .owner = THIS_MODULE, > + ? ? ? .llseek = default_llseek, > +}; > + > + > +void ath9k_dfs_init_debug(struct ath_softc *sc) > +{ > + ? ? ? debugfs_create_file("dfs_stats", S_IRUSR, > + ? ? ? ? ? ? ? ? ? ? ? sc->debug.debugfs_phy, sc, &fops_dfs_stats); > +} > +EXPORT_SYMBOL(ath9k_dfs_init_debug); > + > +#endif /* CONFIG_ATH9K_DEBUGFS */ > + > diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.h b/drivers/net/wireless/ath/ath9k/dfs_debug.h > new file mode 100644 > index 0000000..079cf53 > --- /dev/null > +++ b/drivers/net/wireless/ath/ath9k/dfs_debug.h > @@ -0,0 +1,59 @@ > +/* > + * 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. > + */ > + > + > +#ifndef DFS_DEBUG_H > +#define DFS_DEBUG_H > + > +#include "hw.h" > + > +/** > + * struct ath_dfs_stats - DFS Statistics > + * > + * @pulses_detected: ?No. of pulses detected so far > + * @datalen_discards: No. of pulses discarded due to invalid datalen > + * @rssi_discards: ? ?No. of pulses discarded due to invalid RSSI > + * @bwinfo_discards: ?No. of pulses discarded due to invalid BW info > + * @pri_phy_errors: ? No. of pulses reported for primary channel > + * @ext_phy_errors: ? No. of pulses reported for extension channel > + * @dc_phy_errors: ? ?No. of pulses reported for primary + extension channel > + */ > +struct ath_dfs_stats { > + ? ? ? u32 pulses_detected; > + ? ? ? u32 datalen_discards; > + ? ? ? u32 rssi_discards; > + ? ? ? u32 bwinfo_discards; > + ? ? ? u32 pri_phy_errors; > + ? ? ? u32 ext_phy_errors; > + ? ? ? u32 dc_phy_errors; > +}; > + > + > +#if defined(CONFIG_ATH9K_DEBUGFS) > + > +#define DFS_STAT_INC(sc, c) (sc->debug.stats.dfs_stats.c++) > +void ath9k_dfs_init_debug(struct ath_softc *sc); > + > +#else > + > +#define DFS_STAT_INC(sc, c) do { } while (0) > +static inline void ath9k_dfs_init_debug(struct ath_softc *sc) { } > + > +#endif > + > + > +#endif /* DFS_DEBUG_H */ > -- > 1.7.4.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at ?http://vger.kernel.org/majordomo-info.html > -- shafi ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [RFC v2 1/2] ath9k: add DFS radar pulse processing @ 2011-11-03 15:56 ` Mohammed Shafi 0 siblings, 0 replies; 38+ messages in thread From: Mohammed Shafi @ 2011-11-03 15:56 UTC (permalink / raw) To: Zefir Kurtisi; +Cc: linux-wireless, ath9k-devel, rodrigue, nbd On Thu, Nov 3, 2011 at 7:25 PM, Zefir Kurtisi <zefir.kurtisi@neratec.com> wrote: > This initial DFS module provides basic functionality to deal with > radar pulses reported by the DFS HW pattern detector. > > The reported data is evaluated and basic plausibility checks are > performed to filter false pulses. Passing radar pulses are > forwarded to pattern detectors (not part of this patch). > > The patch also includes > * new debug level ATH_DBG_DFS > * debugfs DFS radar statistics > > Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com> > --- > drivers/net/wireless/ath/ath.h | 2 + > drivers/net/wireless/ath/ath9k/dfs.c | 192 ++++++++++++++++++++++++++++ > drivers/net/wireless/ath/ath9k/dfs.h | 24 ++++ > drivers/net/wireless/ath/ath9k/dfs_debug.c | 89 +++++++++++++ > drivers/net/wireless/ath/ath9k/dfs_debug.h | 59 +++++++++ > 5 files changed, 366 insertions(+), 0 deletions(-) > create mode 100644 drivers/net/wireless/ath/ath9k/dfs.c > create mode 100644 drivers/net/wireless/ath/ath9k/dfs.h > create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.c > create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.h > > diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h > index 46d6926..e38fcad 100644 > --- a/drivers/net/wireless/ath/ath.h > +++ b/drivers/net/wireless/ath/ath.h > @@ -215,6 +215,7 @@ do { \ > * @ATH_DBG_HWTIMER: hardware timer handling > * @ATH_DBG_BTCOEX: bluetooth coexistance > * @ATH_DBG_BSTUCK: stuck beacons > + * @ATH_DBG_DFS: radar datection > * @ATH_DBG_ANY: enable all debugging > * > * The debug level is used to control the amount and type of debugging output > @@ -240,6 +241,7 @@ enum ATH_DEBUG { > ATH_DBG_BTCOEX = 0x00002000, > ATH_DBG_WMI = 0x00004000, > ATH_DBG_BSTUCK = 0x00008000, > + ATH_DBG_DFS = 0x00010000, > ATH_DBG_ANY = 0xffffffff > }; > > diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/ath/ath9k/dfs.c > new file mode 100644 > index 0000000..9d3c8b9 > --- /dev/null > +++ b/drivers/net/wireless/ath/ath9k/dfs.c > @@ -0,0 +1,192 @@ > +/* > + * 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" > + > +/* pulse duration reported is scaled with 1000/800 us */ > +#define AR93X_NSECS_PER_DUR 800 > +static u32 dur_to_usecs(u32 dur) > +{ > + return (dur * AR93X_NSECS_PER_DUR + 500) / 1000; > +} > + > +/* 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; > +}; > + > +/* 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; > +}; > + > +#define PRI_CH_RADAR_FOUND 0x01 > +#define EXT_CH_RADAR_FOUND 0x02 > +static bool 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 0: can we define some macro for this. thanks! > + /* Bogus bandwidth info received in descriptor, > + so ignore this PHY error */ > + DFS_STAT_INC(sc, bwinfo_discards); > + return false; > + 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; > + } > + > + if (rssi == 0) { > + DFS_STAT_INC(sc, rssi_discards); > + return false; > + } > + > + /* > + * TODO: check chirping pulses > + */ > + > + /* convert duration to usecs */ > + drp->width = dur_to_usecs(dur); > + drp->rssi = rssi; > + > + DFS_STAT_INC(sc, pulses_detected); > + return true; > +} > + > + > +/* > + * 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 (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); > + */ > + } > +} > +EXPORT_SYMBOL(ath9k_dfs_process_phyerr); > diff --git a/drivers/net/wireless/ath/ath9k/dfs.h b/drivers/net/wireless/ath/ath9k/dfs.h > new file mode 100644 > index 0000000..4d95cad > --- /dev/null > +++ b/drivers/net/wireless/ath/ath9k/dfs.h > @@ -0,0 +1,24 @@ > +/* > + * 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. > + */ > + > +#ifndef ATH9K_DFS_H > +#define ATH9K_DFS_H > + > +void ath9k_dfs_process_phyerr(struct ath_softc *sc, void *data, > + struct ath_rx_status *rs, u64 mactime); > + > +#endif /* ATH9K_DFS_H */ > diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.c b/drivers/net/wireless/ath/ath9k/dfs_debug.c > new file mode 100644 > index 0000000..3c03552 > --- /dev/null > +++ b/drivers/net/wireless/ath/ath9k/dfs_debug.c > @@ -0,0 +1,89 @@ > +/* > + * 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 <linux/debugfs.h> > + > +#include "ath9k.h" > +#include "dfs_debug.h" > + > + > +#if defined(CONFIG_ATH9K_DEBUGFS) > + > +#define ATH9K_DFS_STAT(s, p) \ > + len += snprintf(buf + len, size - len, "%28s : %10u\n", s, \ > + sc->debug.stats.dfs_stats.p); > + > +static ssize_t read_file_dfs(struct file *file, char __user *user_buf, > + size_t count, loff_t *ppos) > +{ > + struct ath_softc *sc = file->private_data; > + struct ath9k_hw_version *hw_ver = &sc->sc_ah->hw_version; > + char *buf; > + unsigned int len = 0, size = 8000; > + ssize_t retval = 0; > + > + buf = kzalloc(size, GFP_KERNEL); > + if (buf == NULL) > + return -ENOMEM; > + > + len += snprintf(buf + len, size - len, "DFS support for " > + "macVersion = 0x%x, macRev = 0x%x: %s\n", > + hw_ver->macVersion, hw_ver->macRev, > + (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_DFS) ? > + "enabled" : "disabled"); > + ATH9K_DFS_STAT("DFS pulses detected ", pulses_detected); > + ATH9K_DFS_STAT("Datalen discards ", datalen_discards); > + ATH9K_DFS_STAT("RSSI discards ", rssi_discards); > + ATH9K_DFS_STAT("BW info discards ", bwinfo_discards); > + ATH9K_DFS_STAT("Primary channel pulses ", pri_phy_errors); > + ATH9K_DFS_STAT("Secondary channel pulses", ext_phy_errors); > + ATH9K_DFS_STAT("Dual channel pulses ", dc_phy_errors); > + > + if (len > size) > + len = size; > + > + retval = simple_read_from_buffer(user_buf, count, ppos, buf, len); > + kfree(buf); > + > + return retval; > +} > + > +static int ath9k_dfs_debugfs_open(struct inode *inode, struct file *file) > +{ > + file->private_data = inode->i_private; > + return 0; > +} > + > + > +static const struct file_operations fops_dfs_stats = { > + .read = read_file_dfs, > + .open = ath9k_dfs_debugfs_open, > + .owner = THIS_MODULE, > + .llseek = default_llseek, > +}; > + > + > +void ath9k_dfs_init_debug(struct ath_softc *sc) > +{ > + debugfs_create_file("dfs_stats", S_IRUSR, > + sc->debug.debugfs_phy, sc, &fops_dfs_stats); > +} > +EXPORT_SYMBOL(ath9k_dfs_init_debug); > + > +#endif /* CONFIG_ATH9K_DEBUGFS */ > + > diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.h b/drivers/net/wireless/ath/ath9k/dfs_debug.h > new file mode 100644 > index 0000000..079cf53 > --- /dev/null > +++ b/drivers/net/wireless/ath/ath9k/dfs_debug.h > @@ -0,0 +1,59 @@ > +/* > + * 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. > + */ > + > + > +#ifndef DFS_DEBUG_H > +#define DFS_DEBUG_H > + > +#include "hw.h" > + > +/** > + * struct ath_dfs_stats - DFS Statistics > + * > + * @pulses_detected: No. of pulses detected so far > + * @datalen_discards: No. of pulses discarded due to invalid datalen > + * @rssi_discards: No. of pulses discarded due to invalid RSSI > + * @bwinfo_discards: No. of pulses discarded due to invalid BW info > + * @pri_phy_errors: No. of pulses reported for primary channel > + * @ext_phy_errors: No. of pulses reported for extension channel > + * @dc_phy_errors: No. of pulses reported for primary + extension channel > + */ > +struct ath_dfs_stats { > + u32 pulses_detected; > + u32 datalen_discards; > + u32 rssi_discards; > + u32 bwinfo_discards; > + u32 pri_phy_errors; > + u32 ext_phy_errors; > + u32 dc_phy_errors; > +}; > + > + > +#if defined(CONFIG_ATH9K_DEBUGFS) > + > +#define DFS_STAT_INC(sc, c) (sc->debug.stats.dfs_stats.c++) > +void ath9k_dfs_init_debug(struct ath_softc *sc); > + > +#else > + > +#define DFS_STAT_INC(sc, c) do { } while (0) > +static inline void ath9k_dfs_init_debug(struct ath_softc *sc) { } > + > +#endif > + > + > +#endif /* DFS_DEBUG_H */ > -- > 1.7.4.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- shafi ^ permalink raw reply [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 1/2] ath9k: add DFS radar pulse processing 2011-11-03 15:56 ` Mohammed Shafi @ 2011-11-03 16:26 ` Zefir Kurtisi -1 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 16:26 UTC (permalink / raw) To: ath9k-devel On 11/03/2011 04:56 PM, Mohammed Shafi wrote: > On Thu, Nov 3, 2011 at 7:25 PM, Zefir Kurtisi <zefir.kurtisi@neratec.com> wrote: >> [...] >> + switch (are->pulse_bw_info) { >> + case 0: > > can we define some macro for this. thanks! > Ok. ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [RFC v2 1/2] ath9k: add DFS radar pulse processing @ 2011-11-03 16:26 ` Zefir Kurtisi 0 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 16:26 UTC (permalink / raw) To: Mohammed Shafi; +Cc: linux-wireless, ath9k-devel, rodrigue, nbd On 11/03/2011 04:56 PM, Mohammed Shafi wrote: > On Thu, Nov 3, 2011 at 7:25 PM, Zefir Kurtisi <zefir.kurtisi@neratec.com> wrote: >> [...] >> + switch (are->pulse_bw_info) { >> + case 0: > > can we define some macro for this. thanks! > Ok. ^ permalink raw reply [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 2/2] ath9k: integrate initial DFS module 2011-11-03 13:55 ` Zefir Kurtisi @ 2011-11-03 13:55 ` Zefir Kurtisi -1 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 13:55 UTC (permalink / raw) To: ath9k-devel This patch integrates the DFS module into ath9k, including * building the module into ath9k_hw * setting up DFS debugfs * defining HW capability flag for DFS support * setting this flag by DFS supporting devices (so far: AR_SREV_9280_20_OR_LATER, TBC) * setting PHYRADAR rx filter flag to enable radar pulse reporting * forward radar PHY errors to dfs module This is WIP and at its current stage is limited to test ath9k pulse detection capabilities. The DFS pattern matching is TBD in the higher layers and is not part of this patch. CONFIG_ATH9K_DFS must be set to enable pulse detection. Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com> --- drivers/net/wireless/ath/ath9k/Makefile | 2 ++ drivers/net/wireless/ath/ath9k/debug.c | 3 +++ drivers/net/wireless/ath/ath9k/debug.h | 2 ++ drivers/net/wireless/ath/ath9k/hw.c | 12 ++++++++++++ drivers/net/wireless/ath/ath9k/hw.h | 1 + drivers/net/wireless/ath/ath9k/main.c | 17 +++++++++++++++++ drivers/net/wireless/ath/ath9k/recv.c | 18 +++++++++++++----- 7 files changed, 50 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile index 36ed3c4..1f260a5 100644 --- a/drivers/net/wireless/ath/ath9k/Makefile +++ b/drivers/net/wireless/ath/ath9k/Makefile @@ -29,6 +29,8 @@ ath9k_hw-y:= \ eeprom_9287.o \ ani.o \ btcoex.o \ + dfs.o \ + dfs_debug.o \ mac.o \ ar9002_mac.o \ ar9003_mac.o \ diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c index 138ae09..6642108 100644 --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c @@ -1633,6 +1633,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, diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h index 4f6c939..f70735a 100644 --- a/drivers/net/wireless/ath/ath9k/debug.h +++ b/drivers/net/wireless/ath/ath9k/debug.h @@ -19,6 +19,7 @@ #include "hw.h" #include "rc.h" +#include "dfs_debug.h" struct ath_txq; struct ath_buf; @@ -180,6 +181,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]; }; diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 76dbc85..0f2fb42 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -2333,6 +2333,18 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) pCap->pcie_lcr_offset = 0x80; } +#ifdef CONFIG_ATH9K_DFS + /* + * enable radar detection on DFS supporting devices + */ + if (AR_SREV_9280_20_OR_LATER(ah)) { + /* + * TODO: check for which chip-sets we want to support DFS + */ + pCap->hw_caps |= ATH9K_HW_CAP_DFS; + } +#endif + tx_chainmask = pCap->tx_chainmask; rx_chainmask = pCap->rx_chainmask; while (tx_chainmask || rx_chainmask) { diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index 9dbc3cd..4f02f83 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h @@ -204,6 +204,7 @@ enum ath9k_hw_caps { ATH9K_HW_CAP_5GHZ = BIT(14), ATH9K_HW_CAP_APM = BIT(15), ATH9K_HW_CAP_RTT = BIT(16), + ATH9K_HW_CAP_DFS = BIT(17), }; struct ath9k_hw_capabilities { diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index d3b92ce..4d70aab 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -305,6 +305,23 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) ath9k_hw_antdiv_comb_conf_set(ah, &div_ant_conf); } + if (ah->caps.hw_caps && ATH9K_HW_CAP_DFS) { + /** + * enable radar pulse detection + * + * TODO: do this only for DFS channels + */ + ah->private_ops.set_radar_params(ah, &ah->radar_conf); + ath9k_hw_setrxfilter(ah, + ath9k_hw_getrxfilter(ah) | ATH9K_RX_FILTER_PHYRADAR); + ath_dbg(common, ATH_DBG_DFS, + "DFS radar detection enabled for channel %d\n", + ah->curchan->channel); + } else { + ath9k_hw_setrxfilter(ah, + ath9k_hw_getrxfilter(ah) & ~ATH9K_RX_FILTER_PHYRADAR); + } + ieee80211_wake_queues(sc->hw); return true; diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index a46e6ab..5dfd081 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c @@ -17,6 +17,7 @@ #include <linux/dma-mapping.h> #include "ath9k.h" #include "ar9003_mac.h" +#include "dfs.h" #define SKB_CB_ATHBUF(__skb) (*((struct ath_buf **)__skb->cb)) @@ -1865,11 +1866,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) if (sc->sc_flags & SC_OP_RXFLUSH) goto requeue_drop_frag; - retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs, - rxs, &decrypt_error); - if (retval) - goto requeue_drop_frag; - rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp; if (rs.rs_tstamp > tsf_lower && unlikely(rs.rs_tstamp - tsf_lower > 0x10000000)) @@ -1879,6 +1875,18 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) unlikely(tsf_lower - rs.rs_tstamp > 0x10000000)) rxs->mactime += 0x100000000ULL; + if ((ah->caps.hw_caps & ATH9K_HW_CAP_DFS) && + (rs.rs_status & ATH9K_RXERR_PHY) && + (rs.rs_phyerr == ATH9K_PHYERR_RADAR)) { + /* DFS: check for radar pulse */ + ath9k_dfs_process_phyerr(sc, hdr, &rs, rxs->mactime); + } + + retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs, + rxs, &decrypt_error); + if (retval) + goto requeue_drop_frag; + /* Ensure we always have an skb to requeue once we are done * processing the current buffer's skb */ requeue_skb = ath_rxbuf_alloc(common, common->rx_bufsize, GFP_ATOMIC); -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 38+ messages in thread
* [RFC v2 2/2] ath9k: integrate initial DFS module @ 2011-11-03 13:55 ` Zefir Kurtisi 0 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 13:55 UTC (permalink / raw) To: linux-wireless, ath9k-devel; +Cc: rodrigue, nbd, Zefir Kurtisi This patch integrates the DFS module into ath9k, including * building the module into ath9k_hw * setting up DFS debugfs * defining HW capability flag for DFS support * setting this flag by DFS supporting devices (so far: AR_SREV_9280_20_OR_LATER, TBC) * setting PHYRADAR rx filter flag to enable radar pulse reporting * forward radar PHY errors to dfs module This is WIP and at its current stage is limited to test ath9k pulse detection capabilities. The DFS pattern matching is TBD in the higher layers and is not part of this patch. CONFIG_ATH9K_DFS must be set to enable pulse detection. Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com> --- drivers/net/wireless/ath/ath9k/Makefile | 2 ++ drivers/net/wireless/ath/ath9k/debug.c | 3 +++ drivers/net/wireless/ath/ath9k/debug.h | 2 ++ drivers/net/wireless/ath/ath9k/hw.c | 12 ++++++++++++ drivers/net/wireless/ath/ath9k/hw.h | 1 + drivers/net/wireless/ath/ath9k/main.c | 17 +++++++++++++++++ drivers/net/wireless/ath/ath9k/recv.c | 18 +++++++++++++----- 7 files changed, 50 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile index 36ed3c4..1f260a5 100644 --- a/drivers/net/wireless/ath/ath9k/Makefile +++ b/drivers/net/wireless/ath/ath9k/Makefile @@ -29,6 +29,8 @@ ath9k_hw-y:= \ eeprom_9287.o \ ani.o \ btcoex.o \ + dfs.o \ + dfs_debug.o \ mac.o \ ar9002_mac.o \ ar9003_mac.o \ diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c index 138ae09..6642108 100644 --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c @@ -1633,6 +1633,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, diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h index 4f6c939..f70735a 100644 --- a/drivers/net/wireless/ath/ath9k/debug.h +++ b/drivers/net/wireless/ath/ath9k/debug.h @@ -19,6 +19,7 @@ #include "hw.h" #include "rc.h" +#include "dfs_debug.h" struct ath_txq; struct ath_buf; @@ -180,6 +181,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]; }; diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 76dbc85..0f2fb42 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -2333,6 +2333,18 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) pCap->pcie_lcr_offset = 0x80; } +#ifdef CONFIG_ATH9K_DFS + /* + * enable radar detection on DFS supporting devices + */ + if (AR_SREV_9280_20_OR_LATER(ah)) { + /* + * TODO: check for which chip-sets we want to support DFS + */ + pCap->hw_caps |= ATH9K_HW_CAP_DFS; + } +#endif + tx_chainmask = pCap->tx_chainmask; rx_chainmask = pCap->rx_chainmask; while (tx_chainmask || rx_chainmask) { diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index 9dbc3cd..4f02f83 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h @@ -204,6 +204,7 @@ enum ath9k_hw_caps { ATH9K_HW_CAP_5GHZ = BIT(14), ATH9K_HW_CAP_APM = BIT(15), ATH9K_HW_CAP_RTT = BIT(16), + ATH9K_HW_CAP_DFS = BIT(17), }; struct ath9k_hw_capabilities { diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index d3b92ce..4d70aab 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -305,6 +305,23 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) ath9k_hw_antdiv_comb_conf_set(ah, &div_ant_conf); } + if (ah->caps.hw_caps && ATH9K_HW_CAP_DFS) { + /** + * enable radar pulse detection + * + * TODO: do this only for DFS channels + */ + ah->private_ops.set_radar_params(ah, &ah->radar_conf); + ath9k_hw_setrxfilter(ah, + ath9k_hw_getrxfilter(ah) | ATH9K_RX_FILTER_PHYRADAR); + ath_dbg(common, ATH_DBG_DFS, + "DFS radar detection enabled for channel %d\n", + ah->curchan->channel); + } else { + ath9k_hw_setrxfilter(ah, + ath9k_hw_getrxfilter(ah) & ~ATH9K_RX_FILTER_PHYRADAR); + } + ieee80211_wake_queues(sc->hw); return true; diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index a46e6ab..5dfd081 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c @@ -17,6 +17,7 @@ #include <linux/dma-mapping.h> #include "ath9k.h" #include "ar9003_mac.h" +#include "dfs.h" #define SKB_CB_ATHBUF(__skb) (*((struct ath_buf **)__skb->cb)) @@ -1865,11 +1866,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) if (sc->sc_flags & SC_OP_RXFLUSH) goto requeue_drop_frag; - retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs, - rxs, &decrypt_error); - if (retval) - goto requeue_drop_frag; - rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp; if (rs.rs_tstamp > tsf_lower && unlikely(rs.rs_tstamp - tsf_lower > 0x10000000)) @@ -1879,6 +1875,18 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) unlikely(tsf_lower - rs.rs_tstamp > 0x10000000)) rxs->mactime += 0x100000000ULL; + if ((ah->caps.hw_caps & ATH9K_HW_CAP_DFS) && + (rs.rs_status & ATH9K_RXERR_PHY) && + (rs.rs_phyerr == ATH9K_PHYERR_RADAR)) { + /* DFS: check for radar pulse */ + ath9k_dfs_process_phyerr(sc, hdr, &rs, rxs->mactime); + } + + retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs, + rxs, &decrypt_error); + if (retval) + goto requeue_drop_frag; + /* Ensure we always have an skb to requeue once we are done * processing the current buffer's skb */ requeue_skb = ath_rxbuf_alloc(common, common->rx_bufsize, GFP_ATOMIC); -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 2/2] ath9k: integrate initial DFS module 2011-11-03 13:55 ` Zefir Kurtisi @ 2011-11-03 15:11 ` Felix Fietkau -1 siblings, 0 replies; 38+ messages in thread From: Felix Fietkau @ 2011-11-03 15:11 UTC (permalink / raw) To: ath9k-devel On 2011-11-03 2:55 PM, Zefir Kurtisi wrote: > This patch integrates the DFS module into ath9k, including > * building the module into ath9k_hw > * setting up DFS debugfs > * defining HW capability flag for DFS support > * setting this flag by DFS supporting devices > (so far: AR_SREV_9280_20_OR_LATER, TBC) > * setting PHYRADAR rx filter flag to enable radar > pulse reporting > * forward radar PHY errors to dfs module > > This is WIP and at its current stage is limited to test ath9k > pulse detection capabilities. The DFS pattern matching is > TBD in the higher layers and is not part of this patch. > > CONFIG_ATH9K_DFS must be set to enable pulse detection. > > Signed-off-by: Zefir Kurtisi<zefir.kurtisi@neratec.com> > --- > drivers/net/wireless/ath/ath9k/Makefile | 2 ++ > drivers/net/wireless/ath/ath9k/debug.c | 3 +++ > drivers/net/wireless/ath/ath9k/debug.h | 2 ++ > drivers/net/wireless/ath/ath9k/hw.c | 12 ++++++++++++ > drivers/net/wireless/ath/ath9k/hw.h | 1 + > drivers/net/wireless/ath/ath9k/main.c | 17 +++++++++++++++++ > drivers/net/wireless/ath/ath9k/recv.c | 18 +++++++++++++----- > 7 files changed, 50 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c > index d3b92ce..4d70aab 100644 > --- a/drivers/net/wireless/ath/ath9k/main.c > +++ b/drivers/net/wireless/ath/ath9k/main.c > @@ -305,6 +305,23 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) > ath9k_hw_antdiv_comb_conf_set(ah,&div_ant_conf); > } > > + if (ah->caps.hw_caps&& ATH9K_HW_CAP_DFS) { > + /** > + * enable radar pulse detection > + * > + * TODO: do this only for DFS channels > + */ > + ah->private_ops.set_radar_params(ah,&ah->radar_conf); > + ath9k_hw_setrxfilter(ah, > + ath9k_hw_getrxfilter(ah) | ATH9K_RX_FILTER_PHYRADAR); > + ath_dbg(common, ATH_DBG_DFS, > + "DFS radar detection enabled for channel %d\n", > + ah->curchan->channel); > + } else { > + ath9k_hw_setrxfilter(ah, > + ath9k_hw_getrxfilter(ah)& ~ATH9K_RX_FILTER_PHYRADAR); > + } > + Please drop this chunk of code and move the check to ath_calcrxfilter, which gets called after every reset anyway. Also, use a separate flag in sc->flags for actually enabling DFS. Even if the chip has DFS support, we don't always want to enable it - especially not on 2.4 GHz or indoor 5 GHz channels. - Felix ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [RFC v2 2/2] ath9k: integrate initial DFS module @ 2011-11-03 15:11 ` Felix Fietkau 0 siblings, 0 replies; 38+ messages in thread From: Felix Fietkau @ 2011-11-03 15:11 UTC (permalink / raw) To: Zefir Kurtisi; +Cc: linux-wireless, ath9k-devel, rodrigue On 2011-11-03 2:55 PM, Zefir Kurtisi wrote: > This patch integrates the DFS module into ath9k, including > * building the module into ath9k_hw > * setting up DFS debugfs > * defining HW capability flag for DFS support > * setting this flag by DFS supporting devices > (so far: AR_SREV_9280_20_OR_LATER, TBC) > * setting PHYRADAR rx filter flag to enable radar > pulse reporting > * forward radar PHY errors to dfs module > > This is WIP and at its current stage is limited to test ath9k > pulse detection capabilities. The DFS pattern matching is > TBD in the higher layers and is not part of this patch. > > CONFIG_ATH9K_DFS must be set to enable pulse detection. > > Signed-off-by: Zefir Kurtisi<zefir.kurtisi@neratec.com> > --- > drivers/net/wireless/ath/ath9k/Makefile | 2 ++ > drivers/net/wireless/ath/ath9k/debug.c | 3 +++ > drivers/net/wireless/ath/ath9k/debug.h | 2 ++ > drivers/net/wireless/ath/ath9k/hw.c | 12 ++++++++++++ > drivers/net/wireless/ath/ath9k/hw.h | 1 + > drivers/net/wireless/ath/ath9k/main.c | 17 +++++++++++++++++ > drivers/net/wireless/ath/ath9k/recv.c | 18 +++++++++++++----- > 7 files changed, 50 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c > index d3b92ce..4d70aab 100644 > --- a/drivers/net/wireless/ath/ath9k/main.c > +++ b/drivers/net/wireless/ath/ath9k/main.c > @@ -305,6 +305,23 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) > ath9k_hw_antdiv_comb_conf_set(ah,&div_ant_conf); > } > > + if (ah->caps.hw_caps&& ATH9K_HW_CAP_DFS) { > + /** > + * enable radar pulse detection > + * > + * TODO: do this only for DFS channels > + */ > + ah->private_ops.set_radar_params(ah,&ah->radar_conf); > + ath9k_hw_setrxfilter(ah, > + ath9k_hw_getrxfilter(ah) | ATH9K_RX_FILTER_PHYRADAR); > + ath_dbg(common, ATH_DBG_DFS, > + "DFS radar detection enabled for channel %d\n", > + ah->curchan->channel); > + } else { > + ath9k_hw_setrxfilter(ah, > + ath9k_hw_getrxfilter(ah)& ~ATH9K_RX_FILTER_PHYRADAR); > + } > + Please drop this chunk of code and move the check to ath_calcrxfilter, which gets called after every reset anyway. Also, use a separate flag in sc->flags for actually enabling DFS. Even if the chip has DFS support, we don't always want to enable it - especially not on 2.4 GHz or indoor 5 GHz channels. - Felix ^ permalink raw reply [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 2/2] ath9k: integrate initial DFS module 2011-11-03 15:11 ` Felix Fietkau @ 2011-11-03 18:01 ` Zefir Kurtisi -1 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 18:01 UTC (permalink / raw) To: ath9k-devel On 11/03/2011 04:11 PM, Felix Fietkau wrote: > On 2011-11-03 2:55 PM, Zefir Kurtisi wrote: >> This patch integrates the DFS module into ath9k, including >> * building the module into ath9k_hw >> * setting up DFS debugfs >> * defining HW capability flag for DFS support >> * setting this flag by DFS supporting devices >> (so far: AR_SREV_9280_20_OR_LATER, TBC) >> * setting PHYRADAR rx filter flag to enable radar >> pulse reporting >> * forward radar PHY errors to dfs module >> >> This is WIP and at its current stage is limited to test ath9k >> pulse detection capabilities. The DFS pattern matching is >> TBD in the higher layers and is not part of this patch. >> >> CONFIG_ATH9K_DFS must be set to enable pulse detection. >> >> Signed-off-by: Zefir Kurtisi<zefir.kurtisi@neratec.com> >> --- >> drivers/net/wireless/ath/ath9k/Makefile | 2 ++ >> drivers/net/wireless/ath/ath9k/debug.c | 3 +++ >> drivers/net/wireless/ath/ath9k/debug.h | 2 ++ >> drivers/net/wireless/ath/ath9k/hw.c | 12 ++++++++++++ >> drivers/net/wireless/ath/ath9k/hw.h | 1 + >> drivers/net/wireless/ath/ath9k/main.c | 17 +++++++++++++++++ >> drivers/net/wireless/ath/ath9k/recv.c | 18 +++++++++++++----- >> 7 files changed, 50 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c >> index d3b92ce..4d70aab 100644 >> --- a/drivers/net/wireless/ath/ath9k/main.c >> +++ b/drivers/net/wireless/ath/ath9k/main.c >> @@ -305,6 +305,23 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) >> ath9k_hw_antdiv_comb_conf_set(ah,&div_ant_conf); >> } >> >> + if (ah->caps.hw_caps&& ATH9K_HW_CAP_DFS) { >> + /** >> + * enable radar pulse detection >> + * >> + * TODO: do this only for DFS channels >> + */ >> + ah->private_ops.set_radar_params(ah,&ah->radar_conf); >> + ath9k_hw_setrxfilter(ah, >> + ath9k_hw_getrxfilter(ah) | ATH9K_RX_FILTER_PHYRADAR); >> + ath_dbg(common, ATH_DBG_DFS, >> + "DFS radar detection enabled for channel %d\n", >> + ah->curchan->channel); >> + } else { >> + ath9k_hw_setrxfilter(ah, >> + ath9k_hw_getrxfilter(ah)& ~ATH9K_RX_FILTER_PHYRADAR); >> + } >> + > Please drop this chunk of code and move the check to ath_calcrxfilter, which gets called after every reset anyway. Also, use a separate flag in sc->flags for actually enabling DFS. Even if the chip has DFS support, we don't always want to enable it - especially not on 2.4 GHz or indoor 5 GHz channels. > > - Felix > Hi Felix, while I was waiting for your feedback on my related patch, I assumed you're okay with having those rx filter flags preserved in ath_calcrxfilter. I'll check your proposal for v3. BTW, as the comment says, it is TODO enable radar detection only for DFS channels. Beside the lack of the management module to provide the relevant information, it comes handy to test pulse detection on non-DFS channels without the need to modify hostapd ;) Thanks, Zefir ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [RFC v2 2/2] ath9k: integrate initial DFS module @ 2011-11-03 18:01 ` Zefir Kurtisi 0 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 18:01 UTC (permalink / raw) To: Felix Fietkau; +Cc: linux-wireless, ath9k-devel, rodrigue On 11/03/2011 04:11 PM, Felix Fietkau wrote: > On 2011-11-03 2:55 PM, Zefir Kurtisi wrote: >> This patch integrates the DFS module into ath9k, including >> * building the module into ath9k_hw >> * setting up DFS debugfs >> * defining HW capability flag for DFS support >> * setting this flag by DFS supporting devices >> (so far: AR_SREV_9280_20_OR_LATER, TBC) >> * setting PHYRADAR rx filter flag to enable radar >> pulse reporting >> * forward radar PHY errors to dfs module >> >> This is WIP and at its current stage is limited to test ath9k >> pulse detection capabilities. The DFS pattern matching is >> TBD in the higher layers and is not part of this patch. >> >> CONFIG_ATH9K_DFS must be set to enable pulse detection. >> >> Signed-off-by: Zefir Kurtisi<zefir.kurtisi@neratec.com> >> --- >> drivers/net/wireless/ath/ath9k/Makefile | 2 ++ >> drivers/net/wireless/ath/ath9k/debug.c | 3 +++ >> drivers/net/wireless/ath/ath9k/debug.h | 2 ++ >> drivers/net/wireless/ath/ath9k/hw.c | 12 ++++++++++++ >> drivers/net/wireless/ath/ath9k/hw.h | 1 + >> drivers/net/wireless/ath/ath9k/main.c | 17 +++++++++++++++++ >> drivers/net/wireless/ath/ath9k/recv.c | 18 +++++++++++++----- >> 7 files changed, 50 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c >> index d3b92ce..4d70aab 100644 >> --- a/drivers/net/wireless/ath/ath9k/main.c >> +++ b/drivers/net/wireless/ath/ath9k/main.c >> @@ -305,6 +305,23 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) >> ath9k_hw_antdiv_comb_conf_set(ah,&div_ant_conf); >> } >> >> + if (ah->caps.hw_caps&& ATH9K_HW_CAP_DFS) { >> + /** >> + * enable radar pulse detection >> + * >> + * TODO: do this only for DFS channels >> + */ >> + ah->private_ops.set_radar_params(ah,&ah->radar_conf); >> + ath9k_hw_setrxfilter(ah, >> + ath9k_hw_getrxfilter(ah) | ATH9K_RX_FILTER_PHYRADAR); >> + ath_dbg(common, ATH_DBG_DFS, >> + "DFS radar detection enabled for channel %d\n", >> + ah->curchan->channel); >> + } else { >> + ath9k_hw_setrxfilter(ah, >> + ath9k_hw_getrxfilter(ah)& ~ATH9K_RX_FILTER_PHYRADAR); >> + } >> + > Please drop this chunk of code and move the check to ath_calcrxfilter, which gets called after every reset anyway. Also, use a separate flag in sc->flags for actually enabling DFS. Even if the chip has DFS support, we don't always want to enable it - especially not on 2.4 GHz or indoor 5 GHz channels. > > - Felix > Hi Felix, while I was waiting for your feedback on my related patch, I assumed you're okay with having those rx filter flags preserved in ath_calcrxfilter. I'll check your proposal for v3. BTW, as the comment says, it is TODO enable radar detection only for DFS channels. Beside the lack of the management module to provide the relevant information, it comes handy to test pulse detection on non-DFS channels without the need to modify hostapd ;) Thanks, Zefir ^ permalink raw reply [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 2/2] ath9k: integrate initial DFS module 2011-11-03 18:01 ` Zefir Kurtisi @ 2011-11-03 18:15 ` Felix Fietkau -1 siblings, 0 replies; 38+ messages in thread From: Felix Fietkau @ 2011-11-03 18:15 UTC (permalink / raw) To: ath9k-devel On 2011-11-03 7:01 PM, Zefir Kurtisi wrote: > Hi Felix, > > while I was waiting for your feedback on my related patch, I assumed > you're okay with having those rx filter flags preserved in ath_calcrxfilter. I did send some feedback on the rx filter preserve patch. I think it's unnecessary and should be left out. If calcrxfilter properly returns the ATH9K_RX_FILTER_PHYRADAR flag where necessary, then no preserve logic is needed. > I'll check your proposal for v3. > > BTW, as the comment says, it is TODO enable radar detection only for > DFS channels. Beside the lack of the management module to provide the > relevant information, it comes handy to test pulse detection on non-DFS > channels without the need to modify hostapd ;) Yeah, but it would be nice to split hardware capability from runtime state early on. - Felix ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [RFC v2 2/2] ath9k: integrate initial DFS module @ 2011-11-03 18:15 ` Felix Fietkau 0 siblings, 0 replies; 38+ messages in thread From: Felix Fietkau @ 2011-11-03 18:15 UTC (permalink / raw) To: Zefir Kurtisi; +Cc: linux-wireless, ath9k-devel, rodrigue On 2011-11-03 7:01 PM, Zefir Kurtisi wrote: > Hi Felix, > > while I was waiting for your feedback on my related patch, I assumed > you're okay with having those rx filter flags preserved in ath_calcrxfilter. I did send some feedback on the rx filter preserve patch. I think it's unnecessary and should be left out. If calcrxfilter properly returns the ATH9K_RX_FILTER_PHYRADAR flag where necessary, then no preserve logic is needed. > I'll check your proposal for v3. > > BTW, as the comment says, it is TODO enable radar detection only for > DFS channels. Beside the lack of the management module to provide the > relevant information, it comes handy to test pulse detection on non-DFS > channels without the need to modify hostapd ;) Yeah, but it would be nice to split hardware capability from runtime state early on. - Felix ^ permalink raw reply [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 2/2] ath9k: integrate initial DFS module 2011-11-03 13:55 ` Zefir Kurtisi @ 2011-11-03 15:27 ` Mohammed Shafi -1 siblings, 0 replies; 38+ messages in thread From: Mohammed Shafi @ 2011-11-03 15:27 UTC (permalink / raw) To: ath9k-devel Hi Zefir, On Thu, Nov 3, 2011 at 7:25 PM, Zefir Kurtisi <zefir.kurtisi@neratec.com> wrote: > This patch integrates the DFS module into ath9k, including > ?* building the module into ath9k_hw > ?* setting up DFS debugfs > ?* defining HW capability flag for DFS support > ?* setting this flag by DFS supporting devices > ? (so far: AR_SREV_9280_20_OR_LATER, TBC) > ?* setting PHYRADAR rx filter flag to enable radar > ? pulse reporting > ?* forward radar PHY errors to dfs module > > This is WIP and at its current stage is limited to test ath9k > pulse detection capabilities. The DFS pattern matching is > TBD in the higher layers and is not part of this patch. > > CONFIG_ATH9K_DFS must be set to enable pulse detection. > > Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com> > --- > ?drivers/net/wireless/ath/ath9k/Makefile | ? ?2 ++ > ?drivers/net/wireless/ath/ath9k/debug.c ?| ? ?3 +++ > ?drivers/net/wireless/ath/ath9k/debug.h ?| ? ?2 ++ > ?drivers/net/wireless/ath/ath9k/hw.c ? ? | ? 12 ++++++++++++ > ?drivers/net/wireless/ath/ath9k/hw.h ? ? | ? ?1 + > ?drivers/net/wireless/ath/ath9k/main.c ? | ? 17 +++++++++++++++++ > ?drivers/net/wireless/ath/ath9k/recv.c ? | ? 18 +++++++++++++----- > ?7 files changed, 50 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile > index 36ed3c4..1f260a5 100644 > --- a/drivers/net/wireless/ath/ath9k/Makefile > +++ b/drivers/net/wireless/ath/ath9k/Makefile > @@ -29,6 +29,8 @@ ath9k_hw-y:= ?\ > ? ? ? ? ? ? ? ?eeprom_9287.o \ > ? ? ? ? ? ? ? ?ani.o \ > ? ? ? ? ? ? ? ?btcoex.o \ > + ? ? ? ? ? ? ? dfs.o \ > + ? ? ? ? ? ? ? dfs_debug.o \ > ? ? ? ? ? ? ? ?mac.o \ > ? ? ? ? ? ? ? ?ar9002_mac.o \ > ? ? ? ? ? ? ? ?ar9003_mac.o \ > diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c > index 138ae09..6642108 100644 > --- a/drivers/net/wireless/ath/ath9k/debug.c > +++ b/drivers/net/wireless/ath/ath9k/debug.c > @@ -1633,6 +1633,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, > diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h > index 4f6c939..f70735a 100644 > --- a/drivers/net/wireless/ath/ath9k/debug.h > +++ b/drivers/net/wireless/ath/ath9k/debug.h > @@ -19,6 +19,7 @@ > > ?#include "hw.h" > ?#include "rc.h" > +#include "dfs_debug.h" > > ?struct ath_txq; > ?struct ath_buf; > @@ -180,6 +181,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]; > ?}; > > diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c > index 76dbc85..0f2fb42 100644 > --- a/drivers/net/wireless/ath/ath9k/hw.c > +++ b/drivers/net/wireless/ath/ath9k/hw.c > @@ -2333,6 +2333,18 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) > ? ? ? ? ? ? ? ?pCap->pcie_lcr_offset = 0x80; > ? ? ? ?} > > +#ifdef CONFIG_ATH9K_DFS > + ? ? ? /* > + ? ? ? ?* enable radar detection on DFS supporting devices > + ? ? ? ?*/ > + ? ? ? if (AR_SREV_9280_20_OR_LATER(ah)) { > + ? ? ? ? ? ? ? /* > + ? ? ? ? ? ? ? ?* TODO: check for which chip-sets we want to support DFS > + ? ? ? ? ? ? ? ?*/ > + ? ? ? ? ? ? ? pCap->hw_caps |= ATH9K_HW_CAP_DFS; > + ? ? ? } > +#endif > + > ? ? ? ?tx_chainmask = pCap->tx_chainmask; > ? ? ? ?rx_chainmask = pCap->rx_chainmask; > ? ? ? ?while (tx_chainmask || rx_chainmask) { > diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h > index 9dbc3cd..4f02f83 100644 > --- a/drivers/net/wireless/ath/ath9k/hw.h > +++ b/drivers/net/wireless/ath/ath9k/hw.h > @@ -204,6 +204,7 @@ enum ath9k_hw_caps { > ? ? ? ?ATH9K_HW_CAP_5GHZ ? ? ? ? ? ? ? ? ? ? ? = BIT(14), > ? ? ? ?ATH9K_HW_CAP_APM ? ? ? ? ? ? ? ? ? ? ? ?= BIT(15), > ? ? ? ?ATH9K_HW_CAP_RTT ? ? ? ? ? ? ? ? ? ? ? ?= BIT(16), > + ? ? ? ATH9K_HW_CAP_DFS ? ? ? ? ? ? ? ? ? ? ? ?= BIT(17), > ?}; > > ?struct ath9k_hw_capabilities { > diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c > index d3b92ce..4d70aab 100644 > --- a/drivers/net/wireless/ath/ath9k/main.c > +++ b/drivers/net/wireless/ath/ath9k/main.c > @@ -305,6 +305,23 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) > ? ? ? ? ? ? ? ?ath9k_hw_antdiv_comb_conf_set(ah, &div_ant_conf); > ? ? ? ?} > > + ? ? ? if (ah->caps.hw_caps && ATH9K_HW_CAP_DFS) { > + ? ? ? ? ? ? ? /** > + ? ? ? ? ? ? ? ?* enable radar pulse detection > + ? ? ? ? ? ? ? ?* > + ? ? ? ? ? ? ? ?* TODO: do this only for DFS channels > + ? ? ? ? ? ? ? ?*/ > + ? ? ? ? ? ? ? ah->private_ops.set_radar_params(ah, &ah->radar_conf); can we do this something like ath9k_hw_set_radar_params? why we need a seperate debug file for dfs, had i missed something? > + ? ? ? ? ? ? ? ath9k_hw_setrxfilter(ah, > + ? ? ? ? ? ? ? ? ? ? ? ath9k_hw_getrxfilter(ah) | ATH9K_RX_FILTER_PHYRADAR); > + ? ? ? ? ? ? ? ath_dbg(common, ATH_DBG_DFS, > + ? ? ? ? ? ? ? ? ? ? ? "DFS radar detection enabled for channel %d\n", > + ? ? ? ? ? ? ? ? ? ? ? ah->curchan->channel); > + ? ? ? } else { > + ? ? ? ? ? ? ? ath9k_hw_setrxfilter(ah, > + ? ? ? ? ? ? ? ? ? ? ? ath9k_hw_getrxfilter(ah) & ~ATH9K_RX_FILTER_PHYRADAR); > + ? ? ? } > + > ? ? ? ?ieee80211_wake_queues(sc->hw); > > ? ? ? ?return true; > diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c > index a46e6ab..5dfd081 100644 > --- a/drivers/net/wireless/ath/ath9k/recv.c > +++ b/drivers/net/wireless/ath/ath9k/recv.c > @@ -17,6 +17,7 @@ > ?#include <linux/dma-mapping.h> > ?#include "ath9k.h" > ?#include "ar9003_mac.h" > +#include "dfs.h" > > ?#define SKB_CB_ATHBUF(__skb) ? (*((struct ath_buf **)__skb->cb)) > > @@ -1865,11 +1866,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) > ? ? ? ? ? ? ? ?if (sc->sc_flags & SC_OP_RXFLUSH) > ? ? ? ? ? ? ? ? ? ? ? ?goto requeue_drop_frag; > > - ? ? ? ? ? ? ? retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs, > - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?rxs, &decrypt_error); > - ? ? ? ? ? ? ? if (retval) > - ? ? ? ? ? ? ? ? ? ? ? goto requeue_drop_frag; > - > ? ? ? ? ? ? ? ?rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp; > ? ? ? ? ? ? ? ?if (rs.rs_tstamp > tsf_lower && > ? ? ? ? ? ? ? ? ? ?unlikely(rs.rs_tstamp - tsf_lower > 0x10000000)) > @@ -1879,6 +1875,18 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) > ? ? ? ? ? ? ? ? ? ?unlikely(tsf_lower - rs.rs_tstamp > 0x10000000)) > ? ? ? ? ? ? ? ? ? ? ? ?rxs->mactime += 0x100000000ULL; > > + ? ? ? ? ? ? ? if ((ah->caps.hw_caps & ATH9K_HW_CAP_DFS) && > + ? ? ? ? ? ? ? ? ? (rs.rs_status & ATH9K_RXERR_PHY) && > + ? ? ? ? ? ? ? ? ? (rs.rs_phyerr == ATH9K_PHYERR_RADAR)) { > + ? ? ? ? ? ? ? ? ? ? ? /* DFS: check for radar pulse */ > + ? ? ? ? ? ? ? ? ? ? ? ath9k_dfs_process_phyerr(sc, hdr, &rs, rxs->mactime); > + ? ? ? ? ? ? ? } > + > + ? ? ? ? ? ? ? retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs, > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?rxs, &decrypt_error); > + ? ? ? ? ? ? ? if (retval) > + ? ? ? ? ? ? ? ? ? ? ? goto requeue_drop_frag; > + > ? ? ? ? ? ? ? ?/* Ensure we always have an skb to requeue once we are done > ? ? ? ? ? ? ? ? * processing the current buffer's skb */ > ? ? ? ? ? ? ? ?requeue_skb = ath_rxbuf_alloc(common, common->rx_bufsize, GFP_ATOMIC); > -- > 1.7.4.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at ?http://vger.kernel.org/majordomo-info.html > -- shafi ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [RFC v2 2/2] ath9k: integrate initial DFS module @ 2011-11-03 15:27 ` Mohammed Shafi 0 siblings, 0 replies; 38+ messages in thread From: Mohammed Shafi @ 2011-11-03 15:27 UTC (permalink / raw) To: Zefir Kurtisi; +Cc: linux-wireless, ath9k-devel, rodrigue, nbd Hi Zefir, On Thu, Nov 3, 2011 at 7:25 PM, Zefir Kurtisi <zefir.kurtisi@neratec.com> wrote: > This patch integrates the DFS module into ath9k, including > * building the module into ath9k_hw > * setting up DFS debugfs > * defining HW capability flag for DFS support > * setting this flag by DFS supporting devices > (so far: AR_SREV_9280_20_OR_LATER, TBC) > * setting PHYRADAR rx filter flag to enable radar > pulse reporting > * forward radar PHY errors to dfs module > > This is WIP and at its current stage is limited to test ath9k > pulse detection capabilities. The DFS pattern matching is > TBD in the higher layers and is not part of this patch. > > CONFIG_ATH9K_DFS must be set to enable pulse detection. > > Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com> > --- > drivers/net/wireless/ath/ath9k/Makefile | 2 ++ > drivers/net/wireless/ath/ath9k/debug.c | 3 +++ > drivers/net/wireless/ath/ath9k/debug.h | 2 ++ > drivers/net/wireless/ath/ath9k/hw.c | 12 ++++++++++++ > drivers/net/wireless/ath/ath9k/hw.h | 1 + > drivers/net/wireless/ath/ath9k/main.c | 17 +++++++++++++++++ > drivers/net/wireless/ath/ath9k/recv.c | 18 +++++++++++++----- > 7 files changed, 50 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile > index 36ed3c4..1f260a5 100644 > --- a/drivers/net/wireless/ath/ath9k/Makefile > +++ b/drivers/net/wireless/ath/ath9k/Makefile > @@ -29,6 +29,8 @@ ath9k_hw-y:= \ > eeprom_9287.o \ > ani.o \ > btcoex.o \ > + dfs.o \ > + dfs_debug.o \ > mac.o \ > ar9002_mac.o \ > ar9003_mac.o \ > diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c > index 138ae09..6642108 100644 > --- a/drivers/net/wireless/ath/ath9k/debug.c > +++ b/drivers/net/wireless/ath/ath9k/debug.c > @@ -1633,6 +1633,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, > diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h > index 4f6c939..f70735a 100644 > --- a/drivers/net/wireless/ath/ath9k/debug.h > +++ b/drivers/net/wireless/ath/ath9k/debug.h > @@ -19,6 +19,7 @@ > > #include "hw.h" > #include "rc.h" > +#include "dfs_debug.h" > > struct ath_txq; > struct ath_buf; > @@ -180,6 +181,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]; > }; > > diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c > index 76dbc85..0f2fb42 100644 > --- a/drivers/net/wireless/ath/ath9k/hw.c > +++ b/drivers/net/wireless/ath/ath9k/hw.c > @@ -2333,6 +2333,18 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) > pCap->pcie_lcr_offset = 0x80; > } > > +#ifdef CONFIG_ATH9K_DFS > + /* > + * enable radar detection on DFS supporting devices > + */ > + if (AR_SREV_9280_20_OR_LATER(ah)) { > + /* > + * TODO: check for which chip-sets we want to support DFS > + */ > + pCap->hw_caps |= ATH9K_HW_CAP_DFS; > + } > +#endif > + > tx_chainmask = pCap->tx_chainmask; > rx_chainmask = pCap->rx_chainmask; > while (tx_chainmask || rx_chainmask) { > diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h > index 9dbc3cd..4f02f83 100644 > --- a/drivers/net/wireless/ath/ath9k/hw.h > +++ b/drivers/net/wireless/ath/ath9k/hw.h > @@ -204,6 +204,7 @@ enum ath9k_hw_caps { > ATH9K_HW_CAP_5GHZ = BIT(14), > ATH9K_HW_CAP_APM = BIT(15), > ATH9K_HW_CAP_RTT = BIT(16), > + ATH9K_HW_CAP_DFS = BIT(17), > }; > > struct ath9k_hw_capabilities { > diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c > index d3b92ce..4d70aab 100644 > --- a/drivers/net/wireless/ath/ath9k/main.c > +++ b/drivers/net/wireless/ath/ath9k/main.c > @@ -305,6 +305,23 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) > ath9k_hw_antdiv_comb_conf_set(ah, &div_ant_conf); > } > > + if (ah->caps.hw_caps && ATH9K_HW_CAP_DFS) { > + /** > + * enable radar pulse detection > + * > + * TODO: do this only for DFS channels > + */ > + ah->private_ops.set_radar_params(ah, &ah->radar_conf); can we do this something like ath9k_hw_set_radar_params? why we need a seperate debug file for dfs, had i missed something? > + ath9k_hw_setrxfilter(ah, > + ath9k_hw_getrxfilter(ah) | ATH9K_RX_FILTER_PHYRADAR); > + ath_dbg(common, ATH_DBG_DFS, > + "DFS radar detection enabled for channel %d\n", > + ah->curchan->channel); > + } else { > + ath9k_hw_setrxfilter(ah, > + ath9k_hw_getrxfilter(ah) & ~ATH9K_RX_FILTER_PHYRADAR); > + } > + > ieee80211_wake_queues(sc->hw); > > return true; > diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c > index a46e6ab..5dfd081 100644 > --- a/drivers/net/wireless/ath/ath9k/recv.c > +++ b/drivers/net/wireless/ath/ath9k/recv.c > @@ -17,6 +17,7 @@ > #include <linux/dma-mapping.h> > #include "ath9k.h" > #include "ar9003_mac.h" > +#include "dfs.h" > > #define SKB_CB_ATHBUF(__skb) (*((struct ath_buf **)__skb->cb)) > > @@ -1865,11 +1866,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) > if (sc->sc_flags & SC_OP_RXFLUSH) > goto requeue_drop_frag; > > - retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs, > - rxs, &decrypt_error); > - if (retval) > - goto requeue_drop_frag; > - > rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp; > if (rs.rs_tstamp > tsf_lower && > unlikely(rs.rs_tstamp - tsf_lower > 0x10000000)) > @@ -1879,6 +1875,18 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) > unlikely(tsf_lower - rs.rs_tstamp > 0x10000000)) > rxs->mactime += 0x100000000ULL; > > + if ((ah->caps.hw_caps & ATH9K_HW_CAP_DFS) && > + (rs.rs_status & ATH9K_RXERR_PHY) && > + (rs.rs_phyerr == ATH9K_PHYERR_RADAR)) { > + /* DFS: check for radar pulse */ > + ath9k_dfs_process_phyerr(sc, hdr, &rs, rxs->mactime); > + } > + > + retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs, > + rxs, &decrypt_error); > + if (retval) > + goto requeue_drop_frag; > + > /* Ensure we always have an skb to requeue once we are done > * processing the current buffer's skb */ > requeue_skb = ath_rxbuf_alloc(common, common->rx_bufsize, GFP_ATOMIC); > -- > 1.7.4.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- shafi ^ permalink raw reply [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 2/2] ath9k: integrate initial DFS module 2011-11-03 15:27 ` Mohammed Shafi @ 2011-11-03 16:45 ` Zefir Kurtisi -1 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 16:45 UTC (permalink / raw) To: ath9k-devel On 11/03/2011 04:27 PM, Mohammed Shafi wrote: > Hi Zefir, > Hello Mohammed, > On Thu, Nov 3, 2011 at 7:25 PM, Zefir Kurtisi <zefir.kurtisi@neratec.com> wrote: >> [...] >> >> + if (ah->caps.hw_caps && ATH9K_HW_CAP_DFS) { >> + /** >> + * enable radar pulse detection >> + * >> + * TODO: do this only for DFS channels >> + */ >> + ah->private_ops.set_radar_params(ah, &ah->radar_conf); > > can we do this something like ath9k_hw_set_radar_params? > why we need a seperate debug file for dfs, had i missed something? > My first proposal included the DFS statistics in debug.c, but Luis asked me to keep it separated (see http://www.mail-archive.com/ath9k-devel at lists.ath9k.org/msg06821.html). I'm fine with both approaches, just let me know. I'll add a ath9k_hw_set_radar_params() in v3. Thanks, Zefir ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [RFC v2 2/2] ath9k: integrate initial DFS module @ 2011-11-03 16:45 ` Zefir Kurtisi 0 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 16:45 UTC (permalink / raw) To: Mohammed Shafi; +Cc: linux-wireless, ath9k-devel, rodrigue, nbd On 11/03/2011 04:27 PM, Mohammed Shafi wrote: > Hi Zefir, > Hello Mohammed, > On Thu, Nov 3, 2011 at 7:25 PM, Zefir Kurtisi <zefir.kurtisi@neratec.com> wrote: >> [...] >> >> + if (ah->caps.hw_caps && ATH9K_HW_CAP_DFS) { >> + /** >> + * enable radar pulse detection >> + * >> + * TODO: do this only for DFS channels >> + */ >> + ah->private_ops.set_radar_params(ah, &ah->radar_conf); > > can we do this something like ath9k_hw_set_radar_params? > why we need a seperate debug file for dfs, had i missed something? > My first proposal included the DFS statistics in debug.c, but Luis asked me to keep it separated (see http://www.mail-archive.com/ath9k-devel@lists.ath9k.org/msg06821.html). I'm fine with both approaches, just let me know. I'll add a ath9k_hw_set_radar_params() in v3. Thanks, Zefir ^ permalink raw reply [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 2/2] ath9k: integrate initial DFS module 2011-11-03 16:45 ` Zefir Kurtisi @ 2011-11-03 16:57 ` Mohammed Shafi -1 siblings, 0 replies; 38+ messages in thread From: Mohammed Shafi @ 2011-11-03 16:57 UTC (permalink / raw) To: ath9k-devel On Thu, Nov 3, 2011 at 10:15 PM, Zefir Kurtisi <zefir.kurtisi@neratec.com> wrote: > On 11/03/2011 04:27 PM, Mohammed Shafi wrote: >> Hi Zefir, >> > Hello Mohammed, > >> On Thu, Nov 3, 2011 at 7:25 PM, Zefir Kurtisi <zefir.kurtisi@neratec.com> wrote: >>> [...] >>> >>> + ? ? ? if (ah->caps.hw_caps && ATH9K_HW_CAP_DFS) { >>> + ? ? ? ? ? ? ? /** >>> + ? ? ? ? ? ? ? ?* enable radar pulse detection >>> + ? ? ? ? ? ? ? ?* >>> + ? ? ? ? ? ? ? ?* TODO: do this only for DFS channels >>> + ? ? ? ? ? ? ? ?*/ >>> + ? ? ? ? ? ? ? ah->private_ops.set_radar_params(ah, &ah->radar_conf); >> >> can we do this something like ath9k_hw_set_radar_params? >> why we need a seperate debug file for dfs, had i missed something? >> > My first proposal included the DFS statistics in debug.c, but Luis asked me to keep it separated (see http://www.mail-archive.com/ath9k-devel at lists.ath9k.org/msg06821.html). I'm fine with both approaches, just let me know. oh ok. please follow up with Luis's approach. thanks. > > I'll add a ath9k_hw_set_radar_params() in v3. > > > Thanks, > Zefir > -- shafi ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [RFC v2 2/2] ath9k: integrate initial DFS module @ 2011-11-03 16:57 ` Mohammed Shafi 0 siblings, 0 replies; 38+ messages in thread From: Mohammed Shafi @ 2011-11-03 16:57 UTC (permalink / raw) To: Zefir Kurtisi; +Cc: linux-wireless, ath9k-devel, rodrigue, nbd On Thu, Nov 3, 2011 at 10:15 PM, Zefir Kurtisi <zefir.kurtisi@neratec.com> wrote: > On 11/03/2011 04:27 PM, Mohammed Shafi wrote: >> Hi Zefir, >> > Hello Mohammed, > >> On Thu, Nov 3, 2011 at 7:25 PM, Zefir Kurtisi <zefir.kurtisi@neratec.com> wrote: >>> [...] >>> >>> + if (ah->caps.hw_caps && ATH9K_HW_CAP_DFS) { >>> + /** >>> + * enable radar pulse detection >>> + * >>> + * TODO: do this only for DFS channels >>> + */ >>> + ah->private_ops.set_radar_params(ah, &ah->radar_conf); >> >> can we do this something like ath9k_hw_set_radar_params? >> why we need a seperate debug file for dfs, had i missed something? >> > My first proposal included the DFS statistics in debug.c, but Luis asked me to keep it separated (see http://www.mail-archive.com/ath9k-devel@lists.ath9k.org/msg06821.html). I'm fine with both approaches, just let me know. oh ok. please follow up with Luis's approach. thanks. > > I'll add a ath9k_hw_set_radar_params() in v3. > > > Thanks, > Zefir > -- shafi ^ permalink raw reply [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 2/2] ath9k: integrate initial DFS module 2011-11-03 13:55 ` Zefir Kurtisi @ 2011-11-03 15:51 ` Christian Lamparter -1 siblings, 0 replies; 38+ messages in thread From: Christian Lamparter @ 2011-11-03 15:51 UTC (permalink / raw) To: ath9k-devel On Thursday, November 03, 2011 02:55:53 PM Zefir Kurtisi wrote: > This patch integrates the DFS module into ath9k, including > * building the module into ath9k_hw > * setting up DFS debugfs > * defining HW capability flag for DFS support > * setting this flag by DFS supporting devices > (so far: AR_SREV_9280_20_OR_LATER, TBC) > * setting PHYRADAR rx filter flag to enable radar > pulse reporting > * forward radar PHY errors to dfs module > > This is WIP and at its current stage is limited to test ath9k > pulse detection capabilities. The DFS pattern matching is > TBD in the higher layers and is not part of this patch. > > CONFIG_ATH9K_DFS must be set to enable pulse detection. where? There's no kconfig option, yet it has the CONFIG_ perifx. So people will be looking for it. This is exactly why I made such a big fuss about CONFIG_XYZ issue last time. <http://www.mail-archive.com/ath9k-devel@lists.ath9k.org/msg06825.html> Just drop the ifdef. > Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com> > --- > drivers/net/wireless/ath/ath9k/Makefile | 2 ++ > drivers/net/wireless/ath/ath9k/debug.c | 3 +++ > drivers/net/wireless/ath/ath9k/debug.h | 2 ++ > drivers/net/wireless/ath/ath9k/hw.c | 12 ++++++++++++ > drivers/net/wireless/ath/ath9k/hw.h | 1 + > drivers/net/wireless/ath/ath9k/main.c | 17 +++++++++++++++++ > drivers/net/wireless/ath/ath9k/recv.c | 18 +++++++++++++----- > 7 files changed, 50 insertions(+), 5 deletions(-) > > --- a/drivers/net/wireless/ath/ath9k/hw.c > +++ b/drivers/net/wireless/ath/ath9k/hw.c > @@ -2333,6 +2333,18 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) > pCap->pcie_lcr_offset = 0x80; > } > > +#ifdef CONFIG_ATH9K_DFS > + /* > + * enable radar detection on DFS supporting devices > + */ > + if (AR_SREV_9280_20_OR_LATER(ah)) { > + /* > + * TODO: check for which chip-sets we want to support DFS > + */ > + pCap->hw_caps |= ATH9K_HW_CAP_DFS; > + } > +#endif > + > tx_chainmask = pCap->tx_chainmask; > rx_chainmask = pCap->rx_chainmask; > while (tx_chainmask || rx_chainmask) { Regards, Chr ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [RFC v2 2/2] ath9k: integrate initial DFS module @ 2011-11-03 15:51 ` Christian Lamparter 0 siblings, 0 replies; 38+ messages in thread From: Christian Lamparter @ 2011-11-03 15:51 UTC (permalink / raw) To: Zefir Kurtisi; +Cc: linux-wireless, ath9k-devel, rodrigue, nbd On Thursday, November 03, 2011 02:55:53 PM Zefir Kurtisi wrote: > This patch integrates the DFS module into ath9k, including > * building the module into ath9k_hw > * setting up DFS debugfs > * defining HW capability flag for DFS support > * setting this flag by DFS supporting devices > (so far: AR_SREV_9280_20_OR_LATER, TBC) > * setting PHYRADAR rx filter flag to enable radar > pulse reporting > * forward radar PHY errors to dfs module > > This is WIP and at its current stage is limited to test ath9k > pulse detection capabilities. The DFS pattern matching is > TBD in the higher layers and is not part of this patch. > > CONFIG_ATH9K_DFS must be set to enable pulse detection. where? There's no kconfig option, yet it has the CONFIG_ perifx. So people will be looking for it. This is exactly why I made such a big fuss about CONFIG_XYZ issue last time. <http://www.mail-archive.com/ath9k-devel@lists.ath9k.org/msg06825.html> Just drop the ifdef. > Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com> > --- > drivers/net/wireless/ath/ath9k/Makefile | 2 ++ > drivers/net/wireless/ath/ath9k/debug.c | 3 +++ > drivers/net/wireless/ath/ath9k/debug.h | 2 ++ > drivers/net/wireless/ath/ath9k/hw.c | 12 ++++++++++++ > drivers/net/wireless/ath/ath9k/hw.h | 1 + > drivers/net/wireless/ath/ath9k/main.c | 17 +++++++++++++++++ > drivers/net/wireless/ath/ath9k/recv.c | 18 +++++++++++++----- > 7 files changed, 50 insertions(+), 5 deletions(-) > > --- a/drivers/net/wireless/ath/ath9k/hw.c > +++ b/drivers/net/wireless/ath/ath9k/hw.c > @@ -2333,6 +2333,18 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) > pCap->pcie_lcr_offset = 0x80; > } > > +#ifdef CONFIG_ATH9K_DFS > + /* > + * enable radar detection on DFS supporting devices > + */ > + if (AR_SREV_9280_20_OR_LATER(ah)) { > + /* > + * TODO: check for which chip-sets we want to support DFS > + */ > + pCap->hw_caps |= ATH9K_HW_CAP_DFS; > + } > +#endif > + > tx_chainmask = pCap->tx_chainmask; > rx_chainmask = pCap->rx_chainmask; > while (tx_chainmask || rx_chainmask) { Regards, Chr ^ permalink raw reply [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 2/2] ath9k: integrate initial DFS module 2011-11-03 15:51 ` Christian Lamparter @ 2011-11-03 17:25 ` Zefir Kurtisi -1 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 17:25 UTC (permalink / raw) To: ath9k-devel On 11/03/2011 04:51 PM, Christian Lamparter wrote: > On Thursday, November 03, 2011 02:55:53 PM Zefir Kurtisi wrote: >> This patch integrates the DFS module into ath9k, including >> * building the module into ath9k_hw >> * setting up DFS debugfs >> * defining HW capability flag for DFS support >> * setting this flag by DFS supporting devices >> (so far: AR_SREV_9280_20_OR_LATER, TBC) >> * setting PHYRADAR rx filter flag to enable radar >> pulse reporting >> * forward radar PHY errors to dfs module >> >> This is WIP and at its current stage is limited to test ath9k >> pulse detection capabilities. The DFS pattern matching is >> TBD in the higher layers and is not part of this patch. >> >> CONFIG_ATH9K_DFS must be set to enable pulse detection. > where? There's no kconfig option, yet it has the CONFIG_ perifx. > So people will be looking for it. > > This is exactly why I made such a big fuss about CONFIG_XYZ issue last time. > <http://www.mail-archive.com/ath9k-devel@lists.ath9k.org/msg06825.html> > Just drop the ifdef. > > Hi Christian, I just followed Luis' request to follow the regulatory statement and make non regulatory certified code unusable by the 'common user'. Therefore, not (yet) selectable as a kconfig option, but for devs and testers to be easily enabled. At this stage, removing the ifdef would not harm, because all the code does is counting events. But for the long run I understand it is a sensitive topic and requires to be disabled (at least as default setting). I'll consider your feedback for v3, thanks. Just clarify whether you do not like the CONFIG_ prefix or the fact that it can't be enabled. > Regards, > Chr Cheers Zefir ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [RFC v2 2/2] ath9k: integrate initial DFS module @ 2011-11-03 17:25 ` Zefir Kurtisi 0 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 17:25 UTC (permalink / raw) To: Christian Lamparter; +Cc: linux-wireless, ath9k-devel, rodrigue, nbd On 11/03/2011 04:51 PM, Christian Lamparter wrote: > On Thursday, November 03, 2011 02:55:53 PM Zefir Kurtisi wrote: >> This patch integrates the DFS module into ath9k, including >> * building the module into ath9k_hw >> * setting up DFS debugfs >> * defining HW capability flag for DFS support >> * setting this flag by DFS supporting devices >> (so far: AR_SREV_9280_20_OR_LATER, TBC) >> * setting PHYRADAR rx filter flag to enable radar >> pulse reporting >> * forward radar PHY errors to dfs module >> >> This is WIP and at its current stage is limited to test ath9k >> pulse detection capabilities. The DFS pattern matching is >> TBD in the higher layers and is not part of this patch. >> >> CONFIG_ATH9K_DFS must be set to enable pulse detection. > where? There's no kconfig option, yet it has the CONFIG_ perifx. > So people will be looking for it. > > This is exactly why I made such a big fuss about CONFIG_XYZ issue last time. > <http://www.mail-archive.com/ath9k-devel@lists.ath9k.org/msg06825.html> > Just drop the ifdef. > > Hi Christian, I just followed Luis' request to follow the regulatory statement and make non regulatory certified code unusable by the 'common user'. Therefore, not (yet) selectable as a kconfig option, but for devs and testers to be easily enabled. At this stage, removing the ifdef would not harm, because all the code does is counting events. But for the long run I understand it is a sensitive topic and requires to be disabled (at least as default setting). I'll consider your feedback for v3, thanks. Just clarify whether you do not like the CONFIG_ prefix or the fact that it can't be enabled. > Regards, > Chr Cheers Zefir ^ permalink raw reply [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 2/2] ath9k: integrate initial DFS module 2011-11-03 17:25 ` Zefir Kurtisi @ 2011-11-03 17:30 ` Felix Fietkau -1 siblings, 0 replies; 38+ messages in thread From: Felix Fietkau @ 2011-11-03 17:30 UTC (permalink / raw) To: ath9k-devel On 2011-11-03 6:25 PM, Zefir Kurtisi wrote: > On 11/03/2011 04:51 PM, Christian Lamparter wrote: >> On Thursday, November 03, 2011 02:55:53 PM Zefir Kurtisi wrote: >>> This patch integrates the DFS module into ath9k, including >>> * building the module into ath9k_hw >>> * setting up DFS debugfs >>> * defining HW capability flag for DFS support >>> * setting this flag by DFS supporting devices >>> (so far: AR_SREV_9280_20_OR_LATER, TBC) >>> * setting PHYRADAR rx filter flag to enable radar >>> pulse reporting >>> * forward radar PHY errors to dfs module >>> >>> This is WIP and at its current stage is limited to test ath9k >>> pulse detection capabilities. The DFS pattern matching is >>> TBD in the higher layers and is not part of this patch. >>> >>> CONFIG_ATH9K_DFS must be set to enable pulse detection. >> where? There's no kconfig option, yet it has the CONFIG_ perifx. >> So people will be looking for it. >> >> This is exactly why I made such a big fuss about CONFIG_XYZ issue last time. >> <http://www.mail-archive.com/ath9k-devel@lists.ath9k.org/msg06825.html> >> Just drop the ifdef. >> >> > Hi Christian, > > I just followed Luis' request to follow the regulatory statement and > make non regulatory certified code unusable by the 'common user'. > > Therefore, not (yet) selectable as a kconfig option, but for devs and > testers to be easily enabled. > > At this stage, removing the ifdef would not harm, because all the > code does is counting events. But for the long run I understand it is > a sensitive topic and requires to be disabled (at least as default > setting). I don't think it's a sensitive topic at all. Just leave out all the ifdef stuff. In the long run when we actually get to the part where we can test a full DFS implementation, the only thing that needs to be left out for normal users is the flag announcing support for it. - Felix ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [RFC v2 2/2] ath9k: integrate initial DFS module @ 2011-11-03 17:30 ` Felix Fietkau 0 siblings, 0 replies; 38+ messages in thread From: Felix Fietkau @ 2011-11-03 17:30 UTC (permalink / raw) To: Zefir Kurtisi; +Cc: Christian Lamparter, linux-wireless, ath9k-devel, rodrigue On 2011-11-03 6:25 PM, Zefir Kurtisi wrote: > On 11/03/2011 04:51 PM, Christian Lamparter wrote: >> On Thursday, November 03, 2011 02:55:53 PM Zefir Kurtisi wrote: >>> This patch integrates the DFS module into ath9k, including >>> * building the module into ath9k_hw >>> * setting up DFS debugfs >>> * defining HW capability flag for DFS support >>> * setting this flag by DFS supporting devices >>> (so far: AR_SREV_9280_20_OR_LATER, TBC) >>> * setting PHYRADAR rx filter flag to enable radar >>> pulse reporting >>> * forward radar PHY errors to dfs module >>> >>> This is WIP and at its current stage is limited to test ath9k >>> pulse detection capabilities. The DFS pattern matching is >>> TBD in the higher layers and is not part of this patch. >>> >>> CONFIG_ATH9K_DFS must be set to enable pulse detection. >> where? There's no kconfig option, yet it has the CONFIG_ perifx. >> So people will be looking for it. >> >> This is exactly why I made such a big fuss about CONFIG_XYZ issue last time. >> <http://www.mail-archive.com/ath9k-devel@lists.ath9k.org/msg06825.html> >> Just drop the ifdef. >> >> > Hi Christian, > > I just followed Luis' request to follow the regulatory statement and > make non regulatory certified code unusable by the 'common user'. > > Therefore, not (yet) selectable as a kconfig option, but for devs and > testers to be easily enabled. > > At this stage, removing the ifdef would not harm, because all the > code does is counting events. But for the long run I understand it is > a sensitive topic and requires to be disabled (at least as default > setting). I don't think it's a sensitive topic at all. Just leave out all the ifdef stuff. In the long run when we actually get to the part where we can test a full DFS implementation, the only thing that needs to be left out for normal users is the flag announcing support for it. - Felix ^ permalink raw reply [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 2/2] ath9k: integrate initial DFS module 2011-11-03 17:30 ` Felix Fietkau @ 2011-11-03 17:46 ` Zefir Kurtisi -1 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 17:46 UTC (permalink / raw) To: ath9k-devel On 11/03/2011 06:30 PM, Felix Fietkau wrote: > On 2011-11-03 6:25 PM, Zefir Kurtisi wrote: >> On 11/03/2011 04:51 PM, Christian Lamparter wrote: >>> On Thursday, November 03, 2011 02:55:53 PM Zefir Kurtisi wrote: >>>> [...] >>> where? There's no kconfig option, yet it has the CONFIG_ perifx. >>> So people will be looking for it. >>> >>> This is exactly why I made such a big fuss about CONFIG_XYZ issue last time. >>> <http://www.mail-archive.com/ath9k-devel@lists.ath9k.org/msg06825.html> >>> Just drop the ifdef. >>> >>> >> Hi Christian, >> >> I just followed Luis' request to follow the regulatory statement and >> make non regulatory certified code unusable by the 'common user'. >> >> Therefore, not (yet) selectable as a kconfig option, but for devs and >> testers to be easily enabled. >> >> At this stage, removing the ifdef would not harm, because all the >> code does is counting events. But for the long run I understand it is >> a sensitive topic and requires to be disabled (at least as default >> setting). > I don't think it's a sensitive topic at all. Just leave out all the ifdef stuff. In the long run when we actually get to the part where we can test a full DFS implementation, the only thing that needs to be left out for normal users is the flag announcing support for it. > > - Felix Yes, and that's what is done here: just let the HW pretend having no DFS capabilities until enabled. Anyhow, DFS channels operation is not supported so far (and will be controlled) by hostapd, it's therefore safe to remove the remaining ifdef in v3. Thanks Zefir ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [RFC v2 2/2] ath9k: integrate initial DFS module @ 2011-11-03 17:46 ` Zefir Kurtisi 0 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-03 17:46 UTC (permalink / raw) To: Felix Fietkau; +Cc: Christian Lamparter, linux-wireless, ath9k-devel, rodrigue On 11/03/2011 06:30 PM, Felix Fietkau wrote: > On 2011-11-03 6:25 PM, Zefir Kurtisi wrote: >> On 11/03/2011 04:51 PM, Christian Lamparter wrote: >>> On Thursday, November 03, 2011 02:55:53 PM Zefir Kurtisi wrote: >>>> [...] >>> where? There's no kconfig option, yet it has the CONFIG_ perifx. >>> So people will be looking for it. >>> >>> This is exactly why I made such a big fuss about CONFIG_XYZ issue last time. >>> <http://www.mail-archive.com/ath9k-devel@lists.ath9k.org/msg06825.html> >>> Just drop the ifdef. >>> >>> >> Hi Christian, >> >> I just followed Luis' request to follow the regulatory statement and >> make non regulatory certified code unusable by the 'common user'. >> >> Therefore, not (yet) selectable as a kconfig option, but for devs and >> testers to be easily enabled. >> >> At this stage, removing the ifdef would not harm, because all the >> code does is counting events. But for the long run I understand it is >> a sensitive topic and requires to be disabled (at least as default >> setting). > I don't think it's a sensitive topic at all. Just leave out all the ifdef stuff. In the long run when we actually get to the part where we can test a full DFS implementation, the only thing that needs to be left out for normal users is the flag announcing support for it. > > - Felix Yes, and that's what is done here: just let the HW pretend having no DFS capabilities until enabled. Anyhow, DFS channels operation is not supported so far (and will be controlled) by hostapd, it's therefore safe to remove the remaining ifdef in v3. Thanks Zefir ^ permalink raw reply [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 2/2] ath9k: integrate initial DFS module 2011-11-03 17:25 ` Zefir Kurtisi @ 2011-11-04 3:00 ` Peter Stuge -1 siblings, 0 replies; 38+ messages in thread From: Peter Stuge @ 2011-11-04 3:00 UTC (permalink / raw) To: ath9k-devel Zefir Kurtisi wrote: > Just clarify whether you do not like the CONFIG_ prefix or the fact > that it can't be enabled. It's IMO always stupid to add dead code. No exceptions for $random_authority_which_has_no_jurisdiction_for_billions_of_users. //Peter ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [ath9k-devel] [RFC v2 2/2] ath9k: integrate initial DFS module @ 2011-11-04 3:00 ` Peter Stuge 0 siblings, 0 replies; 38+ messages in thread From: Peter Stuge @ 2011-11-04 3:00 UTC (permalink / raw) To: Zefir Kurtisi; +Cc: Christian Lamparter, ath9k-devel, linux-wireless, rodrigue Zefir Kurtisi wrote: > Just clarify whether you do not like the CONFIG_ prefix or the fact > that it can't be enabled. It's IMO always stupid to add dead code. No exceptions for $random_authority_which_has_no_jurisdiction_for_billions_of_users. //Peter ^ permalink raw reply [flat|nested] 38+ messages in thread
* [ath9k-devel] [RFC v2 2/2] ath9k: integrate initial DFS module 2011-11-04 3:00 ` Peter Stuge @ 2011-11-04 9:47 ` Zefir Kurtisi -1 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-04 9:47 UTC (permalink / raw) To: ath9k-devel On 11/04/2011 04:00 AM, Peter Stuge wrote: > Zefir Kurtisi wrote: >> Just clarify whether you do not like the CONFIG_ prefix or the fact >> that it can't be enabled. > > It's IMO always stupid to add dead code. No exceptions for > $random_authority_which_has_no_jurisdiction_for_billions_of_users. > > > //Peter Hi Peter, ok, got it. But I don't call it dead code when its sole purpose is to be tested by developers (i.e. useless for the common user) and can be easily enabled by those. This is only a tiny fraction of the DFS functionality at the lowest layer that need additional support at the upper (mac, hostapd) that is missing so far. Therefore I opted to make it available for devs until all pieces are in (no authority issue, just sanity), but will change it in v3. Thanks for your feedback Zefir ^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [ath9k-devel] [RFC v2 2/2] ath9k: integrate initial DFS module @ 2011-11-04 9:47 ` Zefir Kurtisi 0 siblings, 0 replies; 38+ messages in thread From: Zefir Kurtisi @ 2011-11-04 9:47 UTC (permalink / raw) To: Christian Lamparter, ath9k-devel, linux-wireless, rodrigue On 11/04/2011 04:00 AM, Peter Stuge wrote: > Zefir Kurtisi wrote: >> Just clarify whether you do not like the CONFIG_ prefix or the fact >> that it can't be enabled. > > It's IMO always stupid to add dead code. No exceptions for > $random_authority_which_has_no_jurisdiction_for_billions_of_users. > > > //Peter Hi Peter, ok, got it. But I don't call it dead code when its sole purpose is to be tested by developers (i.e. useless for the common user) and can be easily enabled by those. This is only a tiny fraction of the DFS functionality at the lowest layer that need additional support at the upper (mac, hostapd) that is missing so far. Therefore I opted to make it available for devs until all pieces are in (no authority issue, just sanity), but will change it in v3. Thanks for your feedback Zefir ^ permalink raw reply [flat|nested] 38+ messages in thread
end of thread, other threads:[~2011-11-04 9:47 UTC | newest] Thread overview: 38+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-11-03 13:55 [ath9k-devel] [RFC v2 0/2] ath9k: DFS radar detection Zefir Kurtisi 2011-11-03 13:55 ` Zefir Kurtisi 2011-11-03 13:55 ` [ath9k-devel] [RFC v2 1/2] ath9k: add DFS radar pulse processing Zefir Kurtisi 2011-11-03 13:55 ` Zefir Kurtisi 2011-11-03 15:54 ` [ath9k-devel] " Mohammed Shafi 2011-11-03 15:54 ` Mohammed Shafi 2011-11-03 16:25 ` [ath9k-devel] " Zefir Kurtisi 2011-11-03 16:25 ` Zefir Kurtisi 2011-11-03 15:56 ` [ath9k-devel] " Mohammed Shafi 2011-11-03 15:56 ` Mohammed Shafi 2011-11-03 16:26 ` [ath9k-devel] " Zefir Kurtisi 2011-11-03 16:26 ` Zefir Kurtisi 2011-11-03 13:55 ` [ath9k-devel] [RFC v2 2/2] ath9k: integrate initial DFS module Zefir Kurtisi 2011-11-03 13:55 ` Zefir Kurtisi 2011-11-03 15:11 ` [ath9k-devel] " Felix Fietkau 2011-11-03 15:11 ` Felix Fietkau 2011-11-03 18:01 ` [ath9k-devel] " Zefir Kurtisi 2011-11-03 18:01 ` Zefir Kurtisi 2011-11-03 18:15 ` [ath9k-devel] " Felix Fietkau 2011-11-03 18:15 ` Felix Fietkau 2011-11-03 15:27 ` [ath9k-devel] " Mohammed Shafi 2011-11-03 15:27 ` Mohammed Shafi 2011-11-03 16:45 ` [ath9k-devel] " Zefir Kurtisi 2011-11-03 16:45 ` Zefir Kurtisi 2011-11-03 16:57 ` [ath9k-devel] " Mohammed Shafi 2011-11-03 16:57 ` Mohammed Shafi 2011-11-03 15:51 ` [ath9k-devel] " Christian Lamparter 2011-11-03 15:51 ` Christian Lamparter 2011-11-03 17:25 ` [ath9k-devel] " Zefir Kurtisi 2011-11-03 17:25 ` Zefir Kurtisi 2011-11-03 17:30 ` [ath9k-devel] " Felix Fietkau 2011-11-03 17:30 ` Felix Fietkau 2011-11-03 17:46 ` [ath9k-devel] " Zefir Kurtisi 2011-11-03 17:46 ` Zefir Kurtisi 2011-11-04 3:00 ` [ath9k-devel] " Peter Stuge 2011-11-04 3:00 ` Peter Stuge 2011-11-04 9:47 ` Zefir Kurtisi 2011-11-04 9:47 ` Zefir Kurtisi
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.