From owner-svn-src-user@FreeBSD.ORG Sun Dec 30 20:01:02 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DF455BF5; Sun, 30 Dec 2012 20:01:02 +0000 (UTC) (envelope-from mr.kodiak@gmail.com) Received: from mail-ia0-f174.google.com (mail-ia0-f174.google.com [209.85.210.174]) by mx1.freebsd.org (Postfix) with ESMTP id 7F30A8FC0A; Sun, 30 Dec 2012 20:01:02 +0000 (UTC) Received: by mail-ia0-f174.google.com with SMTP id y25so9985463iay.19 for ; Sun, 30 Dec 2012 12:01:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type; bh=SNXIS6fDW2kchO2qpF5RQdbK4aAZn3ahoTK5FOS7hnc=; b=y2ro9DldA1hE9TRxWQaNbvzsiyd1zrBEc8Yu0iq62LwOfOf4oxr3+D0hCrNQt7/I5+ 2ETVvi3OCUqpBbWqXyTMHPMVO7QuizCQzkpDGo4FrFC3bLkltfIuMSgw8iS0ykqQsHdl OGv/xbqFBPYzhjScpq9KQcsEKGcIJxB4yOTdCREkPsBiftKyFD2eO/nLoGZKPi7Kuk4g Ds3Yz1gto7BF3XWspVo9k4t0WlfL1l4R81+wDd9IYHwkFjOeGgN8nHlSp0bDuSxpYT2L +3Olsys3CkG/Kr5s1Xm9wwl3GiaPS0N6CP+BYw0kOqhOBHndDgrCmCgIELW1JdyC7z9G 5PXA== Received: by 10.50.156.196 with SMTP id wg4mr34933579igb.25.1356897661694; Sun, 30 Dec 2012 12:01:01 -0800 (PST) MIME-Version: 1.0 Sender: mr.kodiak@gmail.com Received: by 10.64.142.198 with HTTP; Sun, 30 Dec 2012 12:00:31 -0800 (PST) In-Reply-To: References: <201212282218.qBSMIfX2015054@svn.freebsd.org> <20121228223259.GX82219@kib.kiev.ua> <20121228231649.GZ82219@kib.kiev.ua> <20121229150107.GC82219@kib.kiev.ua> <20121229160355.GD82219@kib.kiev.ua> From: Bryan Venteicher Date: Sun, 30 Dec 2012 14:00:31 -0600 X-Google-Sender-Auth: PGYP_FV9l7nmUPkNPQazPCAhXq8 Message-ID: Subject: Re: svn commit: r244793 - in user/attilio/membarclean/dev: drm drm2 netmap virtio To: attilio@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 Cc: src-committers@freebsd.org, svn-src-user@freebsd.org X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Dec 2012 20:01:02 -0000 On Sat, Dec 29, 2012 at 10:37 AM, Attilio Rao wrote: > On Sat, Dec 29, 2012 at 5:03 PM, Konstantin Belousov > wrote: >> On Sat, Dec 29, 2012 at 07:13:57AM -0800, Attilio Rao wrote: >>> On Sat, Dec 29, 2012 at 7:01 AM, Konstantin Belousov >>> wrote: >>> > On Fri, Dec 28, 2012 at 11:34:39PM +0000, Attilio Rao wrote: >>> >> On Fri, Dec 28, 2012 at 11:16 PM, Konstantin Belousov >>> >> wrote: >>> >> > On Fri, Dec 28, 2012 at 10:55:47PM +0000, Attilio Rao wrote: >>> >> >> On Fri, Dec 28, 2012 at 10:32 PM, Konstantin Belousov >>> >> >> wrote: >>> >> >> > On Fri, Dec 28, 2012 at 10:18:41PM +0000, Attilio Rao wrote: >>> >> >> >> Author: attilio >>> >> >> >> Date: Fri Dec 28 22:18:41 2012 >>> >> >> >> New Revision: 244793 >>> >> >> >> URL: http://svnweb.freebsd.org/changeset/base/244793 >>> >> >> >> >>> >> >> >> Log: >>> >> >> >> - Remove rmb() usage from netmap and replace it with intended operation >>> >> >> >> to do actual memory fetching reads. >>> >> >> >> - GC unused DRM_WRITEMEMORYBARRIER() from drm and drm2. >>> >> >> >> - Use atomic_load_acq_*() in virtio and drm2 in places that don't need >>> >> >> >> to use rmb(). >>> >> >> >> >>> >> >> >> All these changes remove completely rmb() from MI code, with the >>> >> >> >> exception of cxgbe which will be hammered in a followup commit. >>> >> >> >> >>> >> >> >> Modified: >>> >> >> >> user/attilio/membarclean/dev/drm/drmP.h >>> >> >> >> user/attilio/membarclean/dev/drm2/drmP.h >>> >> >> >> user/attilio/membarclean/dev/drm2/drm_atomic.h >>> >> >> >> user/attilio/membarclean/dev/drm2/drm_irq.c >>> >> >> >> user/attilio/membarclean/dev/netmap/netmap.c >>> >> >> >> user/attilio/membarclean/dev/virtio/virtqueue.c >>> >> >> >> >>> >> >> >> Modified: user/attilio/membarclean/dev/drm/drmP.h >>> >> >> >> ============================================================================== >>> >> >> >> --- user/attilio/membarclean/dev/drm/drmP.h Fri Dec 28 22:06:50 2012 (r244792) >>> >> >> >> +++ user/attilio/membarclean/dev/drm/drmP.h Fri Dec 28 22:18:41 2012 (r244793) >>> >> >> >> @@ -241,11 +241,9 @@ typedef u_int32_t u32; >>> >> >> >> typedef u_int16_t u16; >>> >> >> >> typedef u_int8_t u8; >>> >> >> >> >>> >> >> >> -/* DRM_READMEMORYBARRIER() prevents reordering of reads. >>> >> >> >> - * DRM_WRITEMEMORYBARRIER() prevents reordering of writes. >>> >> >> >> +/* DRM_WRITEMEMORYBARRIER() prevents reordering of writes. >>> >> >> >> * DRM_MEMORYBARRIER() prevents reordering of reads and writes. >>> >> >> >> */ >>> >> >> >> -#define DRM_READMEMORYBARRIER() rmb() >>> >> >> >> #define DRM_WRITEMEMORYBARRIER() wmb() >>> >> >> >> #define DRM_MEMORYBARRIER() mb() >>> >> >> >> >>> >> >> >> >>> >> >> >> Modified: user/attilio/membarclean/dev/drm2/drmP.h >>> >> >> >> ============================================================================== >>> >> >> >> --- user/attilio/membarclean/dev/drm2/drmP.h Fri Dec 28 22:06:50 2012 (r244792) >>> >> >> >> +++ user/attilio/membarclean/dev/drm2/drmP.h Fri Dec 28 22:18:41 2012 (r244793) >>> >> >> >> @@ -263,11 +263,9 @@ typedef int32_t s32; >>> >> >> >> typedef int16_t s16; >>> >> >> >> typedef int8_t s8; >>> >> >> >> >>> >> >> >> -/* DRM_READMEMORYBARRIER() prevents reordering of reads. >>> >> >> >> - * DRM_WRITEMEMORYBARRIER() prevents reordering of writes. >>> >> >> >> +/* DRM_WRITEMEMORYBARRIER() prevents reordering of writes. >>> >> >> >> * DRM_MEMORYBARRIER() prevents reordering of reads and writes. >>> >> >> >> */ >>> >> >> >> -#define DRM_READMEMORYBARRIER() rmb() >>> >> >> >> #define DRM_WRITEMEMORYBARRIER() wmb() >>> >> >> >> #define DRM_MEMORYBARRIER() mb() >>> >> >> >> >>> >> >> >> >>> >> >> >> Modified: user/attilio/membarclean/dev/drm2/drm_atomic.h >>> >> >> >> ============================================================================== >>> >> >> >> --- user/attilio/membarclean/dev/drm2/drm_atomic.h Fri Dec 28 22:06:50 2012 (r244792) >>> >> >> >> +++ user/attilio/membarclean/dev/drm2/drm_atomic.h Fri Dec 28 22:18:41 2012 (r244793) >>> >> >> >> @@ -38,6 +38,7 @@ typedef u_int32_t atomic_t; >>> >> >> >> >>> >> >> >> #define atomic_set(p, v) (*(p) = (v)) >>> >> >> >> #define atomic_read(p) (*(p)) >>> >> >> >> +#define atomic_read_acq(p) atomic_load_acq_int(p) >>> >> >> >> #define atomic_inc(p) atomic_add_int(p, 1) >>> >> >> >> #define atomic_dec(p) atomic_subtract_int(p, 1) >>> >> >> >> #define atomic_add(n, p) atomic_add_int(p, n) >>> >> >> >> >>> >> >> >> Modified: user/attilio/membarclean/dev/drm2/drm_irq.c >>> >> >> >> ============================================================================== >>> >> >> >> --- user/attilio/membarclean/dev/drm2/drm_irq.c Fri Dec 28 22:06:50 2012 (r244792) >>> >> >> >> +++ user/attilio/membarclean/dev/drm2/drm_irq.c Fri Dec 28 22:18:41 2012 (r244793) >>> >> >> >> @@ -701,8 +701,7 @@ u32 drm_vblank_count_and_time(struct drm >>> >> >> >> do { >>> >> >> >> cur_vblank = atomic_read(&dev->_vblank_count[crtc]); >>> >> >> >> *vblanktime = vblanktimestamp(dev, crtc, cur_vblank); >>> >> >> >> - rmb(); >>> >> >> >> - } while (cur_vblank != atomic_read(&dev->_vblank_count[crtc])); >>> >> >> >> + } while (cur_vblank != atomic_read_acq(&dev->_vblank_count[crtc])); >>> >> >> >> >>> >> >> >> return cur_vblank; >>> >> >> >> } >>> >> >> > >>> >> >> > The drm/drm2 is the contributed code, maintained outside the tree, and I >>> >> >> > explicitely decided to keep the original approach. I will appreciate if >>> >> >> > this would be left as it is. >>> >> >> >>> >> >> Aren't the stubs in atomic FreeBSD specific? >>> >> >> So it does rely on some sort of Linux layer emulation? >>> >> >> Right now my target is to get rid of rmb() and wmb() and garbage >>> >> >> collect them. If drm2 is Linux specific and needs to stay that way I >>> >> >> will make a different patch. >>> >> > >>> >> > *mb() are the Linux KPI, and almost any non-trivial ported driver >>> >> > depends on them. The mess which we already have in tree with the >>> >> > duplicated and sometimes wrong definitions of the barries is because we >>> >> > get this compat functions too late, and the driver authors added them >>> >> > locally. >>> >> > >>> >> > The functions should stay there, and their usage in the ported drivers too. >>> >> > Otherwise, the mess will reappear and continue to spread. >>> >> >>> >> I don't agree with "the functions should stay there" just for your >>> >> premise: they are not a FreeBSD KPI and they should be defined in >>> >> atomic.h. They violate our atomic/membar model and they are only >>> >> useful for Linux-feature emulation purposes. More importantly, they >>> >> are mostly wrong and the requirements are niether clear or precise >>> >> because they makes just no sense in FreeBSD. >>> > In what way they are wrong ? >>> > >>> > I am fine with removing them from the machine/atomic.h and putting >>> > under any other namespace, even into machine/never_use_the_linuxisms.h. >>> > But driver authors must not be forced to reimplement the same KPI >>> > Nth time. >>> >>> This is fine. >>> They are wrong because Linux requirements about write memory barriers >>> are different than our _rel barriers and their requirements about read >>> memory barriers are different than our _acq barriers. >>> Per-Linux doc, infact, their write barriers only serialize over other >>> pre-stores while their read barriers only serialize over post-loads. >>> FreeBSD serializes over pre-stores/loads (for _rel) and >>> post-stores/loads (for _acq). >> Yes, but this does not make Linux-style rmb/wmb barriers incompatible with >> the FreeBSD acq/rel barriers. They pairs have obviously different >> semantic, they are not interchangable, but there is nothing new to state. >> I do not see how the rmb/wmb can be claimed incompatible or wrong. >> They are only different. > > As first thing they are undocumented in our world. Second thing they > are different by freebsd philosophy. And I hardly believe all drivers > developer understands this nit differences between freebsd _rel/_acq > and wmb()/acq(), leaving alone architecture porters. > >>> >>> Having the wmb() and rmb() in linux compat stub, that all the drivers >>> can reuse, is a perfectly acceptable compromise. >>> However such layer doesn't exist nowadays. I think there were some >>> resistence in the past about implementing it, because people were >>> freightened that drivers weren't going to be ported natively to >>> FreeBSD anymore. However for simple stuff like membars this should not >>> withstand. >> Ok. >> >>> >>> > BTW, did you looked at the lib/libc/sys/__vdso_gettimeofday.c:binuptime() ? >>> > >>> >> >>> >> My current plan is to just keep mb() at the atomic-FreeBSD level and >>> >> get rid of the others. >> Still, there are situations where FreeBSD implementation does not work, >> see above example from libc. > > I still need to look into it, but there are also other cases, like the > virtio ones, where we want to get _rel or _acq semantic for smaller > than int read and writes. I think I will make a followup soon on all > the cases where the wmb() and rmb() are used, try to see where our > initial model is failing, if any, and try to formalize the situation > some more. This is a first attempt. > But supporting wmb() and rmb() at the architecture level only because > "Linux does it" is wrong. If they belong to a compat layer, it is > acceptable. > For VirtIO, I think I would be fine with reverting r240427 to make everything just straight mb()'s, and then #ifdef'ing atomic(9) for those arch's with 16-bit support. > Attilio > > > -- > Peace can only be achieved by understanding - A. Einstein From owner-svn-src-user@FreeBSD.ORG Mon Dec 31 01:33:20 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8E5106A2; Mon, 31 Dec 2012 01:33:20 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com [209.85.215.42]) by mx1.freebsd.org (Postfix) with ESMTP id 9BF858FC0C; Mon, 31 Dec 2012 01:33:19 +0000 (UTC) Received: by mail-la0-f42.google.com with SMTP id fe20so3302831lab.29 for ; Sun, 30 Dec 2012 17:33:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=VTGChPmrQoEEIXIPBt+sxnEKqyScGHZkVTlJB71It2M=; b=DiF6dcn2ycyKhMGimKff8tP6FsP9XE4NuWuAcZLZw4dk4UddD/K41YIVMzsXXLB721 T/qaKoIzAQalZ62TY0MHxpPqahKxFim4EExvAr1Wo+NaTutzoFwWjVZxPjFgIQPY81HB VJzv/joYu68WZGR7J0zCGneeCea+LAM6nknb9p/xyDcqoJl/02gaDN9qUH1LziKK+BO5 cuHSHFH54OPzty+4g3Bleoo3lFS9ugb9N6SRVpiScpdZRjoR//1G8ZiNSMEAKSxXnlt9 We0hVZo1yjpizV85ZZQiCpVcT9uD66+uTU9CJG2erLoI6mYWayqoWdt6TYZhMeze5rGH 1SpQ== MIME-Version: 1.0 Received: by 10.112.14.169 with SMTP id q9mr15922149lbc.110.1356917592667; Sun, 30 Dec 2012 17:33:12 -0800 (PST) Sender: asmrookie@gmail.com Received: by 10.112.84.193 with HTTP; Sun, 30 Dec 2012 17:33:12 -0800 (PST) In-Reply-To: References: <201212282218.qBSMIfX2015054@svn.freebsd.org> <20121228223259.GX82219@kib.kiev.ua> <20121228231649.GZ82219@kib.kiev.ua> <20121229150107.GC82219@kib.kiev.ua> <20121229160355.GD82219@kib.kiev.ua> Date: Mon, 31 Dec 2012 02:33:12 +0100 X-Google-Sender-Auth: rvMLnPd-yagzKaTDg1FJu6Dm9-E Message-ID: Subject: Re: svn commit: r244793 - in user/attilio/membarclean/dev: drm drm2 netmap virtio From: Attilio Rao To: Bryan Venteicher Content-Type: text/plain; charset=UTF-8 Cc: src-committers@freebsd.org, svn-src-user@freebsd.org X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: attilio@FreeBSD.org List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2012 01:33:20 -0000 On Sun, Dec 30, 2012 at 9:00 PM, Bryan Venteicher wrote: > On Sat, Dec 29, 2012 at 10:37 AM, Attilio Rao wrote: >> On Sat, Dec 29, 2012 at 5:03 PM, Konstantin Belousov >> wrote: >>> On Sat, Dec 29, 2012 at 07:13:57AM -0800, Attilio Rao wrote: >>>> On Sat, Dec 29, 2012 at 7:01 AM, Konstantin Belousov >>>> wrote: >>>> > On Fri, Dec 28, 2012 at 11:34:39PM +0000, Attilio Rao wrote: >>>> >> On Fri, Dec 28, 2012 at 11:16 PM, Konstantin Belousov >>>> >> wrote: >>>> >> > On Fri, Dec 28, 2012 at 10:55:47PM +0000, Attilio Rao wrote: >>>> >> >> On Fri, Dec 28, 2012 at 10:32 PM, Konstantin Belousov >>>> >> >> wrote: >>>> >> >> > On Fri, Dec 28, 2012 at 10:18:41PM +0000, Attilio Rao wrote: >>>> >> >> >> Author: attilio >>>> >> >> >> Date: Fri Dec 28 22:18:41 2012 >>>> >> >> >> New Revision: 244793 >>>> >> >> >> URL: http://svnweb.freebsd.org/changeset/base/244793 >>>> >> >> >> >>>> >> >> >> Log: >>>> >> >> >> - Remove rmb() usage from netmap and replace it with intended operation >>>> >> >> >> to do actual memory fetching reads. >>>> >> >> >> - GC unused DRM_WRITEMEMORYBARRIER() from drm and drm2. >>>> >> >> >> - Use atomic_load_acq_*() in virtio and drm2 in places that don't need >>>> >> >> >> to use rmb(). >>>> >> >> >> >>>> >> >> >> All these changes remove completely rmb() from MI code, with the >>>> >> >> >> exception of cxgbe which will be hammered in a followup commit. >>>> >> >> >> >>>> >> >> >> Modified: >>>> >> >> >> user/attilio/membarclean/dev/drm/drmP.h >>>> >> >> >> user/attilio/membarclean/dev/drm2/drmP.h >>>> >> >> >> user/attilio/membarclean/dev/drm2/drm_atomic.h >>>> >> >> >> user/attilio/membarclean/dev/drm2/drm_irq.c >>>> >> >> >> user/attilio/membarclean/dev/netmap/netmap.c >>>> >> >> >> user/attilio/membarclean/dev/virtio/virtqueue.c >>>> >> >> >> >>>> >> >> >> Modified: user/attilio/membarclean/dev/drm/drmP.h >>>> >> >> >> ============================================================================== >>>> >> >> >> --- user/attilio/membarclean/dev/drm/drmP.h Fri Dec 28 22:06:50 2012 (r244792) >>>> >> >> >> +++ user/attilio/membarclean/dev/drm/drmP.h Fri Dec 28 22:18:41 2012 (r244793) >>>> >> >> >> @@ -241,11 +241,9 @@ typedef u_int32_t u32; >>>> >> >> >> typedef u_int16_t u16; >>>> >> >> >> typedef u_int8_t u8; >>>> >> >> >> >>>> >> >> >> -/* DRM_READMEMORYBARRIER() prevents reordering of reads. >>>> >> >> >> - * DRM_WRITEMEMORYBARRIER() prevents reordering of writes. >>>> >> >> >> +/* DRM_WRITEMEMORYBARRIER() prevents reordering of writes. >>>> >> >> >> * DRM_MEMORYBARRIER() prevents reordering of reads and writes. >>>> >> >> >> */ >>>> >> >> >> -#define DRM_READMEMORYBARRIER() rmb() >>>> >> >> >> #define DRM_WRITEMEMORYBARRIER() wmb() >>>> >> >> >> #define DRM_MEMORYBARRIER() mb() >>>> >> >> >> >>>> >> >> >> >>>> >> >> >> Modified: user/attilio/membarclean/dev/drm2/drmP.h >>>> >> >> >> ============================================================================== >>>> >> >> >> --- user/attilio/membarclean/dev/drm2/drmP.h Fri Dec 28 22:06:50 2012 (r244792) >>>> >> >> >> +++ user/attilio/membarclean/dev/drm2/drmP.h Fri Dec 28 22:18:41 2012 (r244793) >>>> >> >> >> @@ -263,11 +263,9 @@ typedef int32_t s32; >>>> >> >> >> typedef int16_t s16; >>>> >> >> >> typedef int8_t s8; >>>> >> >> >> >>>> >> >> >> -/* DRM_READMEMORYBARRIER() prevents reordering of reads. >>>> >> >> >> - * DRM_WRITEMEMORYBARRIER() prevents reordering of writes. >>>> >> >> >> +/* DRM_WRITEMEMORYBARRIER() prevents reordering of writes. >>>> >> >> >> * DRM_MEMORYBARRIER() prevents reordering of reads and writes. >>>> >> >> >> */ >>>> >> >> >> -#define DRM_READMEMORYBARRIER() rmb() >>>> >> >> >> #define DRM_WRITEMEMORYBARRIER() wmb() >>>> >> >> >> #define DRM_MEMORYBARRIER() mb() >>>> >> >> >> >>>> >> >> >> >>>> >> >> >> Modified: user/attilio/membarclean/dev/drm2/drm_atomic.h >>>> >> >> >> ============================================================================== >>>> >> >> >> --- user/attilio/membarclean/dev/drm2/drm_atomic.h Fri Dec 28 22:06:50 2012 (r244792) >>>> >> >> >> +++ user/attilio/membarclean/dev/drm2/drm_atomic.h Fri Dec 28 22:18:41 2012 (r244793) >>>> >> >> >> @@ -38,6 +38,7 @@ typedef u_int32_t atomic_t; >>>> >> >> >> >>>> >> >> >> #define atomic_set(p, v) (*(p) = (v)) >>>> >> >> >> #define atomic_read(p) (*(p)) >>>> >> >> >> +#define atomic_read_acq(p) atomic_load_acq_int(p) >>>> >> >> >> #define atomic_inc(p) atomic_add_int(p, 1) >>>> >> >> >> #define atomic_dec(p) atomic_subtract_int(p, 1) >>>> >> >> >> #define atomic_add(n, p) atomic_add_int(p, n) >>>> >> >> >> >>>> >> >> >> Modified: user/attilio/membarclean/dev/drm2/drm_irq.c >>>> >> >> >> ============================================================================== >>>> >> >> >> --- user/attilio/membarclean/dev/drm2/drm_irq.c Fri Dec 28 22:06:50 2012 (r244792) >>>> >> >> >> +++ user/attilio/membarclean/dev/drm2/drm_irq.c Fri Dec 28 22:18:41 2012 (r244793) >>>> >> >> >> @@ -701,8 +701,7 @@ u32 drm_vblank_count_and_time(struct drm >>>> >> >> >> do { >>>> >> >> >> cur_vblank = atomic_read(&dev->_vblank_count[crtc]); >>>> >> >> >> *vblanktime = vblanktimestamp(dev, crtc, cur_vblank); >>>> >> >> >> - rmb(); >>>> >> >> >> - } while (cur_vblank != atomic_read(&dev->_vblank_count[crtc])); >>>> >> >> >> + } while (cur_vblank != atomic_read_acq(&dev->_vblank_count[crtc])); >>>> >> >> >> >>>> >> >> >> return cur_vblank; >>>> >> >> >> } >>>> >> >> > >>>> >> >> > The drm/drm2 is the contributed code, maintained outside the tree, and I >>>> >> >> > explicitely decided to keep the original approach. I will appreciate if >>>> >> >> > this would be left as it is. >>>> >> >> >>>> >> >> Aren't the stubs in atomic FreeBSD specific? >>>> >> >> So it does rely on some sort of Linux layer emulation? >>>> >> >> Right now my target is to get rid of rmb() and wmb() and garbage >>>> >> >> collect them. If drm2 is Linux specific and needs to stay that way I >>>> >> >> will make a different patch. >>>> >> > >>>> >> > *mb() are the Linux KPI, and almost any non-trivial ported driver >>>> >> > depends on them. The mess which we already have in tree with the >>>> >> > duplicated and sometimes wrong definitions of the barries is because we >>>> >> > get this compat functions too late, and the driver authors added them >>>> >> > locally. >>>> >> > >>>> >> > The functions should stay there, and their usage in the ported drivers too. >>>> >> > Otherwise, the mess will reappear and continue to spread. >>>> >> >>>> >> I don't agree with "the functions should stay there" just for your >>>> >> premise: they are not a FreeBSD KPI and they should be defined in >>>> >> atomic.h. They violate our atomic/membar model and they are only >>>> >> useful for Linux-feature emulation purposes. More importantly, they >>>> >> are mostly wrong and the requirements are niether clear or precise >>>> >> because they makes just no sense in FreeBSD. >>>> > In what way they are wrong ? >>>> > >>>> > I am fine with removing them from the machine/atomic.h and putting >>>> > under any other namespace, even into machine/never_use_the_linuxisms.h. >>>> > But driver authors must not be forced to reimplement the same KPI >>>> > Nth time. >>>> >>>> This is fine. >>>> They are wrong because Linux requirements about write memory barriers >>>> are different than our _rel barriers and their requirements about read >>>> memory barriers are different than our _acq barriers. >>>> Per-Linux doc, infact, their write barriers only serialize over other >>>> pre-stores while their read barriers only serialize over post-loads. >>>> FreeBSD serializes over pre-stores/loads (for _rel) and >>>> post-stores/loads (for _acq). >>> Yes, but this does not make Linux-style rmb/wmb barriers incompatible with >>> the FreeBSD acq/rel barriers. They pairs have obviously different >>> semantic, they are not interchangable, but there is nothing new to state. >>> I do not see how the rmb/wmb can be claimed incompatible or wrong. >>> They are only different. >> >> As first thing they are undocumented in our world. Second thing they >> are different by freebsd philosophy. And I hardly believe all drivers >> developer understands this nit differences between freebsd _rel/_acq >> and wmb()/acq(), leaving alone architecture porters. >> >>>> >>>> Having the wmb() and rmb() in linux compat stub, that all the drivers >>>> can reuse, is a perfectly acceptable compromise. >>>> However such layer doesn't exist nowadays. I think there were some >>>> resistence in the past about implementing it, because people were >>>> freightened that drivers weren't going to be ported natively to >>>> FreeBSD anymore. However for simple stuff like membars this should not >>>> withstand. >>> Ok. >>> >>>> >>>> > BTW, did you looked at the lib/libc/sys/__vdso_gettimeofday.c:binuptime() ? >>>> > >>>> >> >>>> >> My current plan is to just keep mb() at the atomic-FreeBSD level and >>>> >> get rid of the others. >>> Still, there are situations where FreeBSD implementation does not work, >>> see above example from libc. >> >> I still need to look into it, but there are also other cases, like the >> virtio ones, where we want to get _rel or _acq semantic for smaller >> than int read and writes. I think I will make a followup soon on all >> the cases where the wmb() and rmb() are used, try to see where our >> initial model is failing, if any, and try to formalize the situation >> some more. This is a first attempt. >> But supporting wmb() and rmb() at the architecture level only because >> "Linux does it" is wrong. If they belong to a compat layer, it is >> acceptable. >> > > For VirtIO, I think I would be fine with reverting r240427 to make > everything just straight mb()'s, and then #ifdef'ing atomic(9) for > those arch's with 16-bit support. Can you take care of doing so? I don't plan any immediate action on this item in the next weeks so any help will be appreciated. At least add some comments saying while the wmb(), rmb() are used would be helpful in understanding what are the constraints in general. Attilio -- Peace can only be achieved by understanding - A. Einstein From owner-svn-src-user@FreeBSD.ORG Mon Dec 31 06:38:13 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 736F6683; Mon, 31 Dec 2012 06:38:13 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 571368FC08; Mon, 31 Dec 2012 06:38:13 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBV6cDef075549; Mon, 31 Dec 2012 06:38:13 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBV6cCJR075546; Mon, 31 Dec 2012 06:38:12 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201212310638.qBV6cCJR075546@svn.freebsd.org> From: Adrian Chadd Date: Mon, 31 Dec 2012 06:38:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r244890 - in user/adrian/ath_radar_stuff: . lib src X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2012 06:38:13 -0000 Author: adrian Date: Mon Dec 31 06:38:12 2012 New Revision: 244890 URL: http://svnweb.freebsd.org/changeset/base/244890 Log: Add some top level makefile glue. Added: user/adrian/ath_radar_stuff/Makefile (contents, props changed) user/adrian/ath_radar_stuff/lib/Makefile (contents, props changed) user/adrian/ath_radar_stuff/src/Makefile (contents, props changed) Added: user/adrian/ath_radar_stuff/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/ath_radar_stuff/Makefile Mon Dec 31 06:38:12 2012 (r244890) @@ -0,0 +1,5 @@ +.include + +SUBDIR=lib src + +.include Added: user/adrian/ath_radar_stuff/lib/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/ath_radar_stuff/lib/Makefile Mon Dec 31 06:38:12 2012 (r244890) @@ -0,0 +1,5 @@ +.include + +SUBDIR=libradarpkt + +.include Added: user/adrian/ath_radar_stuff/src/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/ath_radar_stuff/src/Makefile Mon Dec 31 06:38:12 2012 (r244890) @@ -0,0 +1,6 @@ +.include + +SUBDIR=pktlog qt-hpktlog + +.include + From owner-svn-src-user@FreeBSD.ORG Mon Dec 31 06:39:21 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4C05679B; Mon, 31 Dec 2012 06:39:21 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2FCB38FC08; Mon, 31 Dec 2012 06:39:21 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBV6dLXP075721; Mon, 31 Dec 2012 06:39:21 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBV6dLvQ075720; Mon, 31 Dec 2012 06:39:21 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201212310639.qBV6dLvQ075720@svn.freebsd.org> From: Adrian Chadd Date: Mon, 31 Dec 2012 06:39:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r244891 - user/adrian/ath_radar_stuff/src/qt-hpktlog X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2012 06:39:21 -0000 Author: adrian Date: Mon Dec 31 06:39:20 2012 New Revision: 244891 URL: http://svnweb.freebsd.org/changeset/base/244891 Log: Add AR5212 chip support. Modified: user/adrian/ath_radar_stuff/src/qt-hpktlog/PktSource.cpp Modified: user/adrian/ath_radar_stuff/src/qt-hpktlog/PktSource.cpp ============================================================================== --- user/adrian/ath_radar_stuff/src/qt-hpktlog/PktSource.cpp Mon Dec 31 06:38:12 2012 (r244890) +++ user/adrian/ath_radar_stuff/src/qt-hpktlog/PktSource.cpp Mon Dec 31 06:39:20 2012 (r244891) @@ -8,6 +8,7 @@ #include "PktSource.h" #include "libradarpkt/pkt.h" +#include "libradarpkt/ar5212_radar.h" #include "libradarpkt/ar5416_radar.h" #include "libradarpkt/ar9280_radar.h" @@ -164,6 +165,11 @@ PktSource::timerEvent(QTimerEvent *event (pkt + le16toh(rt->it_len)), hdr->caplen - le16toh(rt->it_len), &re); break; + case CHIP_AR5212: + r = ar5212_radar_decode(rt, + (pkt + le16toh(rt->it_len)), + hdr->caplen - le16toh(rt->it_len), &re); + break; case CHIP_AR9280: r = ar9280_radar_decode(rt, (pkt + le16toh(rt->it_len)), From owner-svn-src-user@FreeBSD.ORG Mon Dec 31 06:39:40 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BEBC98AE; Mon, 31 Dec 2012 06:39:40 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A20E68FC0C; Mon, 31 Dec 2012 06:39:40 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBV6deOh075804; Mon, 31 Dec 2012 06:39:40 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBV6ddaG075794; Mon, 31 Dec 2012 06:39:39 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201212310639.qBV6ddaG075794@svn.freebsd.org> From: Adrian Chadd Date: Mon, 31 Dec 2012 06:39:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r244892 - user/adrian/ath_radar_stuff/src/qt-hpktlog X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2012 06:39:40 -0000 Author: adrian Date: Mon Dec 31 06:39:38 2012 New Revision: 244892 URL: http://svnweb.freebsd.org/changeset/base/244892 Log: Add very basic heatmap support. Added: user/adrian/ath_radar_stuff/src/qt-hpktlog/HeatMap.cpp user/adrian/ath_radar_stuff/src/qt-hpktlog/HeatMap.h Modified: user/adrian/ath_radar_stuff/src/qt-hpktlog/MainApp.cpp user/adrian/ath_radar_stuff/src/qt-hpktlog/MainApp.h user/adrian/ath_radar_stuff/src/qt-hpktlog/Makefile user/adrian/ath_radar_stuff/src/qt-hpktlog/main.cpp user/adrian/ath_radar_stuff/src/qt-hpktlog/qt-hpktlog.pro Added: user/adrian/ath_radar_stuff/src/qt-hpktlog/HeatMap.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/ath_radar_stuff/src/qt-hpktlog/HeatMap.cpp Mon Dec 31 06:39:38 2012 (r244892) @@ -0,0 +1,33 @@ + +#include "HeatMap.h" + +HeatMap::HeatMap() +{ + + // Blank the heat map + for (int i = 0; i < MAX_RSSI; i++) + for (int j = 0; j < MAX_PULSEDUR; j++) + heatmap[i][j] = 0; +} + +void +HeatMap::incr(int x, int y) +{ + + if (heatmap[x % MAX_RSSI][y % MAX_PULSEDUR] < (MAX_HEATCNT - 1)) + heatmap[x % MAX_RSSI][y % MAX_PULSEDUR]++; +} + +void +HeatMap::decr(int x, int y) +{ + + if (heatmap[x % MAX_RSSI][y % MAX_PULSEDUR] > 0) + heatmap[x % MAX_RSSI][y % MAX_PULSEDUR]--; +} + +uint8_t +HeatMap::get(int x, int y) +{ + return heatmap[x % MAX_RSSI][y % MAX_PULSEDUR]; +} Added: user/adrian/ath_radar_stuff/src/qt-hpktlog/HeatMap.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/ath_radar_stuff/src/qt-hpktlog/HeatMap.h Mon Dec 31 06:39:38 2012 (r244892) @@ -0,0 +1,28 @@ +#ifndef __HEATMAP_H__ +#define __HEATMAP_H__ + +#include + +/* + * This is a hard-coded heatmap for RSSI/duration. + * It should be made less hardcoded! + */ + +/* XXX hard-coded */ +#define MAX_PULSEDUR 255 +#define MAX_RSSI 255 + +#define MAX_HEATCNT 255 + +class HeatMap { + private: + uint8_t heatmap[MAX_PULSEDUR][MAX_RSSI]; + + public: + HeatMap(); + void incr(int x, int y); + void decr(int x, int y); + uint8_t get(int x, int y); +}; + +#endif /* __HEATMAP_H__ */ Modified: user/adrian/ath_radar_stuff/src/qt-hpktlog/MainApp.cpp ============================================================================== --- user/adrian/ath_radar_stuff/src/qt-hpktlog/MainApp.cpp Mon Dec 31 06:39:20 2012 (r244891) +++ user/adrian/ath_radar_stuff/src/qt-hpktlog/MainApp.cpp Mon Dec 31 06:39:38 2012 (r244892) @@ -11,17 +11,14 @@ #include "qwt_plot_histogram.h" #include "qwt_symbol.h" +#include "HeatMap.h" + #include "MainApp.h" MainApp::MainApp(QMainWindow *parent) { - // Blank the heat map - for (int i = 0; i < MAX_RSSI; i++) { - for (int j = 0; j < MAX_PULSEDUR; j++) { - heat_map[i][j] = 0; - } - } + hm = new HeatMap(); // How many entries to keep in the FIFO num_entries = 128; @@ -64,6 +61,8 @@ MainApp::~MainApp() delete q_curve; if (q_plot) delete q_plot; + + delete hm; } void @@ -90,16 +89,14 @@ MainApp::getRadarEntry(struct radar_entr q_rssi.insert(q_rssi.begin(), (float) re.re_rssi); - // Update the heat map for the current pixel, topping out at 65535 - // entries (ie, don't overflow.) - if (heat_map[re.re_rssi % MAX_RSSI][re.re_dur % MAX_PULSEDUR] < MAX_HEATCNT) - heat_map[re.re_rssi % MAX_RSSI][re.re_dur % MAX_PULSEDUR]++; + // Update the heat map for the current sample + hm->incr(re.re_rssi, re.re_dur); q_points.insert(q_points.begin(), QwtPoint3D( (float) re.re_dur, (float) re.re_rssi, - (float) heat_map[re.re_rssi % MAX_RSSI][re.re_dur % MAX_PULSEDUR] * 100.0)); + (float) hm->get(re.re_rssi, re.re_dur) * 100.0)); // If we're too big, delete the first entry if (q_points.size() > num_entries) { @@ -107,8 +104,7 @@ MainApp::getRadarEntry(struct radar_entr uint8_t rssi, dur; rssi = q_rssi[q_rssi.size() - 1]; dur = q_dur[q_dur.size() - 1]; - if (heat_map[rssi % MAX_RSSI][dur % MAX_PULSEDUR] > 0) - heat_map[rssi % MAX_RSSI][dur % MAX_PULSEDUR]--; + hm->decr(rssi, dur); // Remove the tail entry q_dur.pop_back(); Modified: user/adrian/ath_radar_stuff/src/qt-hpktlog/MainApp.h ============================================================================== --- user/adrian/ath_radar_stuff/src/qt-hpktlog/MainApp.h Mon Dec 31 06:39:20 2012 (r244891) +++ user/adrian/ath_radar_stuff/src/qt-hpktlog/MainApp.h Mon Dec 31 06:39:38 2012 (r244892) @@ -20,9 +20,7 @@ #include "libradarpkt/pkt.h" -#define MAX_RSSI 256 -#define MAX_PULSEDUR 256 -#define MAX_HEATCNT 254 +#include "HeatMap.h" class MainApp : public QMainWindow { @@ -36,7 +34,7 @@ class MainApp : public QMainWindow QwtSymbol *q_symbol; // How many entries to keep in the histogram - size_t num_entries; + int num_entries; // Our old-style histogram data std::vector q_dur; @@ -45,9 +43,8 @@ class MainApp : public QMainWindow // and the new-style histogram data QVector q_points; - // Now, an array of items, for "heat" data - // XXX this really should be another class.. - uint8_t heat_map[MAX_RSSI][MAX_PULSEDUR]; + // "Heat" map data + HeatMap *hm; // TODO When rendering the screen, we only want to do it // every say, 3ms. Modified: user/adrian/ath_radar_stuff/src/qt-hpktlog/Makefile ============================================================================== --- user/adrian/ath_radar_stuff/src/qt-hpktlog/Makefile Mon Dec 31 06:39:20 2012 (r244891) +++ user/adrian/ath_radar_stuff/src/qt-hpktlog/Makefile Mon Dec 31 06:39:38 2012 (r244892) @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: qt-hpktlog -# Generated by qmake (2.01a) (Qt 4.7.4) on: Sun Jun 24 00:10:19 2012 +# Generated by qmake (2.01a) (Qt 4.7.4) on: Mon Jun 25 15:31:47 2012 # Project: qt-hpktlog.pro # Template: app # Command: /usr/local/bin/qmake-qt4 -o Makefile qt-hpktlog.pro @@ -43,11 +43,13 @@ OBJECTS_DIR = ./ ####### Files -SOURCES = MainApp.cpp \ +SOURCES = HeatMap.cpp \ + MainApp.cpp \ PktSource.cpp \ main.cpp moc_MainApp.cpp \ moc_PktSource.cpp -OBJECTS = MainApp.o \ +OBJECTS = HeatMap.o \ + MainApp.o \ PktSource.o \ main.o \ moc_MainApp.o \ @@ -154,7 +156,7 @@ qmake: FORCE dist: @$(CHK_DIR_EXISTS) .tmp/qt-hpktlog1.0.0 || $(MKDIR) .tmp/qt-hpktlog1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/qt-hpktlog1.0.0/ && $(COPY_FILE) --parents MainApp.h PktSource.h .tmp/qt-hpktlog1.0.0/ && $(COPY_FILE) --parents MainApp.cpp PktSource.cpp main.cpp .tmp/qt-hpktlog1.0.0/ && (cd `dirname .tmp/qt-hpktlog1.0.0` && $(TAR) qt-hpktlog1.0.0.tar qt-hpktlog1.0.0 && $(COMPRESS) qt-hpktlog1.0.0.tar) && $(MOVE) `dirname .tmp/qt-hpktlog1.0.0`/qt-hpktlog1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/qt-hpktlog1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/qt-hpktlog1.0.0/ && $(COPY_FILE) --parents HeatMap.h MainApp.h PktSource.h .tmp/qt-hpktlog1.0.0/ && $(COPY_FILE) --parents HeatMap.cpp MainApp.cpp PktSource.cpp main.cpp .tmp/qt-hpktlog1.0.0/ && (cd `dirname .tmp/qt-hpktlog1.0.0` && $(TAR) qt-hpktlog1.0.0.tar qt-hpktlog1.0.0 && $(COMPRESS) qt-hpktlog1.0.0.tar) && $(MOVE) `dirname .tmp/qt-hpktlog1.0.0`/qt-hpktlog1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/qt-hpktlog1.0.0 clean:compiler_clean @@ -178,7 +180,8 @@ mocables: compiler_moc_header_make_all c compiler_moc_header_make_all: moc_MainApp.cpp moc_PktSource.cpp compiler_moc_header_clean: -$(DEL_FILE) moc_MainApp.cpp moc_PktSource.cpp -moc_MainApp.cpp: MainApp.h +moc_MainApp.cpp: HeatMap.h \ + MainApp.h /usr/local/bin/moc-qt4 $(DEFINES) $(INCPATH) MainApp.h -o moc_MainApp.cpp moc_PktSource.cpp: PktSource.h @@ -203,13 +206,18 @@ compiler_clean: compiler_moc_header_clea ####### Compile -MainApp.o: MainApp.cpp MainApp.h +HeatMap.o: HeatMap.cpp HeatMap.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o HeatMap.o HeatMap.cpp + +MainApp.o: MainApp.cpp HeatMap.h \ + MainApp.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o MainApp.o MainApp.cpp PktSource.o: PktSource.cpp PktSource.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o PktSource.o PktSource.cpp main.o: main.cpp MainApp.h \ + HeatMap.h \ PktSource.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp Modified: user/adrian/ath_radar_stuff/src/qt-hpktlog/main.cpp ============================================================================== --- user/adrian/ath_radar_stuff/src/qt-hpktlog/main.cpp Mon Dec 31 06:39:20 2012 (r244891) +++ user/adrian/ath_radar_stuff/src/qt-hpktlog/main.cpp Mon Dec 31 06:39:38 2012 (r244892) @@ -12,6 +12,7 @@ #include "libradarpkt/pkt.h" #include "libradarpkt/ar5416_radar.h" +#include "libradarpkt/ar5212_radar.h" #include "libradarpkt/ar9280_radar.h" @@ -69,7 +70,7 @@ plotSet(QwtPlot *p, PktLogData *pl) static void usage() { - printf("usage: \n"); + printf("usage: \n"); exit(127); } @@ -88,6 +89,8 @@ main(int argc, char *argv[]) if (strcmp(argv[1], "ar5416")== 0) type = CHIP_AR5416; + else if (strcmp(argv[1], "ar5212")== 0) + type = CHIP_AR5212; else if (strcmp(argv[1], "ar9280")== 0) type = CHIP_AR9280; else Modified: user/adrian/ath_radar_stuff/src/qt-hpktlog/qt-hpktlog.pro ============================================================================== --- user/adrian/ath_radar_stuff/src/qt-hpktlog/qt-hpktlog.pro Mon Dec 31 06:39:20 2012 (r244891) +++ user/adrian/ath_radar_stuff/src/qt-hpktlog/qt-hpktlog.pro Mon Dec 31 06:39:38 2012 (r244892) @@ -12,6 +12,6 @@ QMAKE_CFLAGS= -g -ggdb -DATH_ENABLE_RADI QMAKE_CXXFLAGS= -g -ggdb -DATH_ENABLE_RADIOTAP_VENDOR_EXT # Input -HEADERS += MainApp.h PktSource.h +HEADERS += HeatMap.h MainApp.h PktSource.h # FORMS += PlotWindow.ui MainWindow.ui -SOURCES += MainApp.cpp PktSource.cpp main.cpp +SOURCES += HeatMap.cpp MainApp.cpp PktSource.cpp main.cpp From owner-svn-src-user@FreeBSD.ORG Mon Dec 31 06:47:17 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AB916B21; Mon, 31 Dec 2012 06:47:17 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8DF938FC08; Mon, 31 Dec 2012 06:47:17 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBV6lHoG077037; Mon, 31 Dec 2012 06:47:17 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBV6lGsq077030; Mon, 31 Dec 2012 06:47:16 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201212310647.qBV6lGsq077030@svn.freebsd.org> From: Adrian Chadd Date: Mon, 31 Dec 2012 06:47:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r244893 - in user/adrian/ath_radar_stuff/src/spectral_fft: . font samples X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2012 06:47:17 -0000 Author: adrian Date: Mon Dec 31 06:47:16 2012 New Revision: 244893 URL: http://svnweb.freebsd.org/changeset/base/244893 Log: Bring over the spectral fft code from Simon over at linux-wireless. This is GPLed, be careful. Added: user/adrian/ath_radar_stuff/src/spectral_fft/ user/adrian/ath_radar_stuff/src/spectral_fft/COPYING user/adrian/ath_radar_stuff/src/spectral_fft/Makefile user/adrian/ath_radar_stuff/src/spectral_fft/README user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c user/adrian/ath_radar_stuff/src/spectral_fft/font/ user/adrian/ath_radar_stuff/src/spectral_fft/font/AUTHORS user/adrian/ath_radar_stuff/src/spectral_fft/font/COPYING user/adrian/ath_radar_stuff/src/spectral_fft/font/ChangeLog user/adrian/ath_radar_stuff/src/spectral_fft/font/LiberationSans-Regular.ttf (contents, props changed) user/adrian/ath_radar_stuff/src/spectral_fft/font/License.txt user/adrian/ath_radar_stuff/src/spectral_fft/font/README user/adrian/ath_radar_stuff/src/spectral_fft/samples/ user/adrian/ath_radar_stuff/src/spectral_fft/samples/ar9223_analog_camera_ch1.dump (contents, props changed) user/adrian/ath_radar_stuff/src/spectral_fft/samples/ar9280_analog_camera_ch1.dump (contents, props changed) user/adrian/ath_radar_stuff/src/spectral_fft/samples/ar9390_analog_camera_ch1.dump (contents, props changed) Added: user/adrian/ath_radar_stuff/src/spectral_fft/COPYING ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/ath_radar_stuff/src/spectral_fft/COPYING Mon Dec 31 06:47:16 2012 (r244893) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Added: user/adrian/ath_radar_stuff/src/spectral_fft/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/ath_radar_stuff/src/spectral_fft/Makefile Mon Dec 31 06:47:16 2012 (r244893) @@ -0,0 +1,10 @@ +SRCS= fft_eval.c + +CFLAGS+= -I/usr/local/include +LDFLAGS+= -L/usr/local/lib +LDLIBS+= -lSDL -lSDL_ttf + +all: fft_eval + +clean: + rm -f *.o fft_eval Added: user/adrian/ath_radar_stuff/src/spectral_fft/README ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/ath_radar_stuff/src/spectral_fft/README Mon Dec 31 06:47:16 2012 (r244893) @@ -0,0 +1,59 @@ +DESCRIPTION +=========== + +This program has been created to aid open source spectrum +analyzer development for Qualcomm/Atheros AR92xx and AR93xx +based chipsets. + +It visualizes the FFT data reported by the chips to help intepreting +and understanding the data. + +TODO: The interpreted data format is unknown! Please help +investigating the data, or help acquiring information about the +data format from Qualcomm Atheros! + +BUILD +===== + +You need to have SDL and SDL_ttf development packages installed +on your system, as well as make and gcc. + +Just type make to build the program: + +$ make +gcc -O2 -Wall -pedantic -c -o fft_eval.o fft_eval.c +gcc -lSDL -lSDL_ttf -o fft_eval fft_eval.o +$ + +USAGE +===== + +First, you need to acquire sample data from your spectral-scan enabled +Atheros WiFi card. If the patches are applied correctly, you can use +the following commands: + +ifconfig wlan0 up +iw dev wlan0 scan spec-scan +cat /sys/kernel/debug/ieee80211/phy0/ath9k/spectral_scan > /tmp/fft_results + +There are some recorded samples in the "samples" directory to try it +out without actual hardware. + +To view the FFT results, use: + +./fft_eval /tmp/fft_results + +Navigate through the currently selected datasets using the arrow keys (left +and right). Scroll through the spectrum using the Page Up/Down keys. + + +LICENSE +======= + +Read the GPL v2 file 'COPYING'. + +AUTHOR +====== + +This software has been written by Simon Wunderlich +for Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V. Added: user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c Mon Dec 31 06:47:16 2012 (r244893) @@ -0,0 +1,536 @@ +/* + * Copyright (C) 2012 Simon Wunderlich + * Copyright (C) 2012 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ + +/* + * This program has been created to aid open source spectrum + * analyzer development for Qualcomm/Atheros AR92xx and AR93xx + * based chipsets. + */ + +#include +#include +#include +#include +#include + +typedef int8_t s8; +typedef uint8_t u8; +typedef uint16_t u16; +typedef uint64_t u64; + +/* taken from ath9k.h */ +#define SPECTRAL_HT20_NUM_BINS 56 + +enum ath_fft_sample_type { + ATH_FFT_SAMPLE_HT20 = 0 +}; + +struct fft_sample_tlv { + u8 type; /* see ath_fft_sample */ + u16 length; + /* type dependent data follows */ +} __attribute__((packed)); + +struct fft_sample_ht20 { + struct fft_sample_tlv tlv; + + u8 __alignment; + + u16 freq; + s8 rssi; + s8 noise; + + u16 max_magnitude; + u8 max_index; + u8 bitmap_weight; + + u64 tsf; + + u16 data[SPECTRAL_HT20_NUM_BINS]; +} __attribute__((packed)); + + +struct scanresult { + struct fft_sample_ht20 sample; + struct scanresult *next; +}; + +#define WIDTH 1600 +#define HEIGHT 650 +#define BPP 32 + +#define X_SCALE 10 +#define Y_SCALE 4 + +#define RMASK 0x000000ff +#define RBITS 0 +#define GMASK 0x0000ff00 +#define GBITS 8 +#define BMASK 0x00ff0000 +#define BBITS 16 +#define AMASK 0xff000000 + + +SDL_Surface *screen = NULL; +TTF_Font *font = NULL; +struct scanresult *result_list; +int scanresults_n = 0; + +int graphics_init_sdl(void) +{ + SDL_VideoInfo *VideoInfo; + int SDLFlags; + + SDLFlags = SDL_HWPALETTE | SDL_RESIZABLE; + + if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) < 0) { + fprintf(stderr, "Initializing SDL failed\n"); + return -1; + } + + if ((VideoInfo = (SDL_VideoInfo *) SDL_GetVideoInfo()) == NULL) { + fprintf(stderr, "Getting SDL Video Info failed\n"); + return -1; + } + + else { + if (VideoInfo->hw_available) { + SDLFlags |= SDL_HWSURFACE; + } else { + SDLFlags |= SDL_SWSURFACE; + } + if (VideoInfo->blit_hw) + SDLFlags |= SDL_HWACCEL; + } + + SDL_WM_SetCaption("FFT eval", "FFT eval"); + screen = SDL_SetVideoMode(WIDTH, HEIGHT, BPP, SDLFlags); + + if (TTF_Init() < 0) { + fprintf(stderr, "Initializing SDL TTF failed\n"); + return -1; + } + + font = TTF_OpenFont("font/LiberationSans-Regular.ttf", 14); + if (!font) { + fprintf(stderr, "Opening font failed\n"); + return -1; + } + + return 0; +} + +void graphics_quit_sdl(void) +{ + SDL_Quit(); +} + +int pixel(Uint32 *pixels, int x, int y, Uint32 color) +{ + if (x < 0 || x >= WIDTH) + return -1; + if (y < 0 || y >= HEIGHT) + return -1; + + pixels[x + y * WIDTH] |= color; + return 0; +} + + +#define SIZE 3 +/* this function blends a 2*SIZE x 2*SIZE blob at the given position with + * the defined opacity. */ +int bigpixel(Uint32 *pixels, int x, int y, Uint32 color, uint8_t opacity) +{ + int x1, y1; + + if (x - SIZE < 0 || x + SIZE >= WIDTH) + return -1; + if (y - SIZE < 0 || y + SIZE >= HEIGHT) + return -1; + + for (x1 = x - SIZE; x1 < x + SIZE; x1++) + for (y1 = y - SIZE; y1 < y + SIZE; y1++) { + Uint32 r, g, b; + + r = ((pixels[x1 + y1 * WIDTH] & RMASK) >> RBITS) + ((((color & RMASK) >> RBITS) * opacity) / 255); + if (r > 255) r = 255; + g = ((pixels[x1 + y1 * WIDTH] & GMASK) >> GBITS) + ((((color & GMASK) >> GBITS) * opacity) / 255); + if (g > 255) g = 255; + b = ((pixels[x1 + y1 * WIDTH] & BMASK) >> BBITS) + ((((color & BMASK) >> BBITS) * opacity) / 255); + if (b > 255) b = 255; + + pixels[x1 + y1 * WIDTH] = r << RBITS | g << GBITS | b << BBITS | (color & AMASK); + } + return 0; +} + +int render_text(SDL_Surface *surface, char *text, int x, int y) +{ + SDL_Surface *text_surface; + SDL_Color fontcolor = {255, 255, 255, 255}; + SDL_Rect fontdest = {0, 0, 0, 0}; + + fontdest.x = x; + fontdest.y = y; + + text_surface = TTF_RenderText_Solid(font, text, fontcolor); + if (!text_surface) + return -1; + + SDL_BlitSurface(text_surface, NULL, surface, &fontdest); + SDL_FreeSurface(text_surface); + + return 0; +} + +/* + * draw_picture - draws the current screen. + * + * @highlight: the index of the dataset to be highlighted + * + * returns the center frequency of the currently highlighted dataset + */ +int draw_picture(int highlight, int startfreq) +{ + Uint32 *pixels, color, opacity; + int x, y, i, rnum; + int highlight_freq = startfreq + 20; + char text[1024]; + struct scanresult *result; + SDL_Surface *surface; + + surface = SDL_CreateRGBSurface(SDL_SWSURFACE, WIDTH, HEIGHT, BPP, RMASK, GMASK, BMASK, AMASK); + pixels = (Uint32 *) surface->pixels; + for (y = 0; y < HEIGHT; y++) + for (x = 0; x < WIDTH; x++) + pixels[x + y * WIDTH] = AMASK; + + /* vertical lines (frequency) */ + for (i = 2300; i < 6000; i += 10) { + x = (X_SCALE * (i - startfreq)); + + if (x < 0 || x > WIDTH) + continue; + + for (y = 0; y < HEIGHT - 20; y++) + pixels[x + y * WIDTH] = 0x40404040 | AMASK; + + snprintf(text, sizeof(text), "%d MHz", i); + render_text(surface, text, x - 30, HEIGHT - 20); + } + + /* horizontal lines (dBm) */ + for (i = 0; i < 150; i += 10) { + y = 600 - Y_SCALE * i; + + for (x = 0; x < WIDTH; x++) + pixels[x + y * WIDTH] = 0x40404040 | AMASK; + + snprintf(text, sizeof(text), "-%d dBm", (150 - i)); + render_text(surface, text, 5, y - 15); + } + + + rnum = 0; + for (result = result_list; result ; result = result->next) { + int datamax = 0, datamin = 65536; + int datasquaresum = 0; + + for (i = 0; i < SPECTRAL_HT20_NUM_BINS; i++) { + int data; + + data = result->sample.data[i] * result->sample.data[i]; + datasquaresum += data; + if (data > datamax) datamax = data; + if (data < datamin) datamin = data; + } + + if (rnum == highlight) { + /* prints some statistical data about the currently selected + * data sample and auxiliary data. */ + printf("result[%03d]: freq %04d rssi %03d, noise %03d, max_magnitude %04d max_index %03d bitmap_weight %03d tsf %llu | ", + rnum, result->sample.freq, result->sample.rssi, result->sample.noise, + result->sample.max_magnitude, result->sample.max_index, result->sample.bitmap_weight, + result->sample.tsf); + printf("datamax = %d, datamin = %d, datasquaresum = %d\n", datamax, datamin, datasquaresum); + + highlight_freq = result->sample.freq; + } + + + for (i = 0; i < SPECTRAL_HT20_NUM_BINS; i++) { + float freq; + float signal; + int data; + freq = result->sample.freq - 10.0 + ((20.0 * i) / SPECTRAL_HT20_NUM_BINS); + + x = (X_SCALE * (freq - startfreq)); + + /* This is where the "magic" happens: interpret the signal + * to output some kind of data which looks useful. */ + + data = result->sample.data[i]; + if (data == 0) + data = 1; + signal = result->sample.noise + result->sample.rssi + 20 * log10f(data) - log10f(datasquaresum) * 10; + + y = 400 - (400.0 + Y_SCALE * signal); + + if (rnum == highlight) { + color = RMASK | AMASK; + opacity = 255; + } else { + color = BMASK | AMASK; + opacity = 30; + } + + if (bigpixel(pixels, x, y, color, opacity) < 0) + continue; + + } + rnum++; + } + + SDL_BlitSurface(surface, NULL, screen, NULL); + SDL_FreeSurface(surface); + SDL_Flip(screen); + + return highlight_freq; +} + +/* read_file - reads an file into a big buffer and returns it + * + * @fname: file name + * + * returns the buffer with the files content + */ +char *read_file(char *fname, size_t *size) +{ + FILE *fp; + char *buf = NULL; + size_t ret; + + fp = fopen(fname, "r"); + + if (!fp) + return NULL; + + *size = 0; + while (!feof(fp)) { + + buf = realloc(buf, *size + 4097); + if (!buf) + return NULL; + + ret = fread(buf + *size, 1, 4096, fp); + *size += ret; + } + fclose(fp); + + buf[*size] = 0; + + return buf; +} + +/* + * read_scandata - reads the fft scandata and compiles a linked list of datasets + * + * @fname: file name + * + * returns 0 on success, -1 on error. + */ +int read_scandata(char *fname) +{ + char *pos, *scandata; + size_t len, sample_len; + struct scanresult *result; + struct fft_sample_tlv *tlv; + struct scanresult *tail = result_list; + + scandata = read_file(fname, &len); + if (!scandata) + return -1; + + pos = scandata; + + while (pos - scandata < len) { + tlv = (struct fft_sample_tlv *) pos; + sample_len = sizeof(*tlv) + tlv->length; + pos += sample_len; + if (tlv->type != ATH_FFT_SAMPLE_HT20) { + fprintf(stderr, "unknown sample type (%d)\n", tlv->type); + continue; + } + + if (sample_len != sizeof(result->sample)) { + fprintf(stderr, "wrong sample length (have %d, expected %d)\n", sample_len, sizeof(result->sample)); + continue; + } + + result = malloc(sizeof(*result)); + if (!result) + continue; + + memset(result, 0, sizeof(*result)); + memcpy(&result->sample, tlv, sizeof(result->sample)); + fprintf(stderr, "copy %d bytes\n", sizeof(result->sample)); + + if (tail) + tail->next = result; + else + result_list = result; + + tail = result; + + scanresults_n++; + } + + fprintf(stderr, "read %d scan results\n", scanresults_n); + return 0; +} + +/* + * graphics_main - sets up the data and holds the mainloop. + * + */ +void graphics_main(void) +{ + SDL_Event event; + int quit = 0; + int highlight = 0; + int change = 1, scroll = 0; + int startfreq = 2350, accel = 0; + int highlight_freq = startfreq; + + if (graphics_init_sdl() < 0) { + fprintf(stderr, "Failed to initialize graphics.\n"); + return; + } + SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); + while (!quit) { + if (change) { + highlight_freq = draw_picture(highlight, startfreq); + change = 0; + } + + if (!scroll) { + /* move to highlighted object */ + if (highlight_freq - 20 < startfreq) + accel = -10; + if (highlight_freq > (startfreq + WIDTH/X_SCALE)) + accel = 10; + + /* if we are "far off", move a little bit faster */ + if (highlight_freq + 300 < startfreq) + accel = -100; + + if (highlight_freq - 300 > (startfreq + WIDTH/X_SCALE)) + accel = 100; + } + + if (accel) + SDL_PollEvent(&event); + else + SDL_WaitEvent(&event); + + switch (event.type) { + case SDL_QUIT: + quit = 1; + break; + case SDL_KEYDOWN: + switch (event.key.keysym.sym) { + case SDLK_LEFT: + if (highlight > 0) { + highlight--; + scroll = 0; + change = 1; + } + break; + case SDLK_RIGHT: + if (highlight < scanresults_n - 1){ + highlight++; + scroll = 0; + change = 1; + } + break; + case SDLK_PAGEUP: + accel-= 2; + scroll = 1; + break; + case SDLK_PAGEDOWN: + accel+= 2; + scroll = 1; + default: + break; + } + break; + } + if (accel) { + startfreq += accel; + if (accel > 0) accel--; + if (accel < 0) accel++; + change = 1; + } + if (startfreq < 2300) startfreq = 2300; + if (startfreq > 6000) startfreq = 6000; + if (accel < -20) accel = -20; + if (accel > 20) accel = 20; + } + + graphics_quit_sdl(); +} + +void usage(int argc, char *argv[]) +{ + fprintf(stderr, "Usage: %s [scanfile]\n", argv[0]); + fprintf(stderr, "\n"); + fprintf(stderr, "scanfile is generated by the spectral analyzer feature\n"); + fprintf(stderr, "of your wifi card. If you have a AR92xx or AR93xx based\n"); + fprintf(stderr, "card, try:\n"); + fprintf(stderr, "\n"); + fprintf(stderr, "ifconfig wlan0 up\n"); + fprintf(stderr, "iw dev wlan0 scan spec-scan\n"); + fprintf(stderr, "cat /sys/kernel/debug/ieee80211/phy0/ath9k/spectral_scan > /tmp/fft_results\n"); + fprintf(stderr, "%s /tmp/fft_results\n", argv[0]); + fprintf(stderr, "\n"); + fprintf(stderr, "(NOTE: maybe debugfs must be mounted first: mount -t debugfs none /sys/kernel/debug/ )\n"); + fprintf(stderr, "\n"); + +} + +int main(int argc, char *argv[]) +{ + if (argc < 2) { + usage(argc, argv); + return -1; + } + + fprintf(stderr, "WARNING: Experimental Software! Don't trust anything you see. :)\n"); + fprintf(stderr, "\n"); + if (read_scandata(argv[1]) < 0) { + fprintf(stderr, "Couldn't read scanfile ...\n"); + usage(argc, argv); + return -1; + } + graphics_main(); + + return 0; +} Added: user/adrian/ath_radar_stuff/src/spectral_fft/font/AUTHORS ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/ath_radar_stuff/src/spectral_fft/font/AUTHORS Mon Dec 31 06:47:16 2012 (r244893) @@ -0,0 +1,10 @@ +Font Designer: + Ascender Corporation. + http://www.ascendercorp.com/ + +Original Designer: + Steve Matteson + http://www.ascendercorp.com/typedesigners.html + +Current Maintainer: + Caius Chance Added: user/adrian/ath_radar_stuff/src/spectral_fft/font/COPYING ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/ath_radar_stuff/src/spectral_fft/font/COPYING Mon Dec 31 06:47:16 2012 (r244893) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Mon Dec 31 06:49:43 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3F4D0C51; Mon, 31 Dec 2012 06:49:43 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 235BA8FC08; Mon, 31 Dec 2012 06:49:43 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBV6nh7i077379; Mon, 31 Dec 2012 06:49:43 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBV6nh9n077378; Mon, 31 Dec 2012 06:49:43 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201212310649.qBV6nh9n077378@svn.freebsd.org> From: Adrian Chadd Date: Mon, 31 Dec 2012 06:49:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r244894 - user/adrian/ath_radar_stuff/src/spectral_fft X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2012 06:49:43 -0000 Author: adrian Date: Mon Dec 31 06:49:42 2012 New Revision: 244894 URL: http://svnweb.freebsd.org/changeset/base/244894 Log: BSD-ify the make file. Modified: user/adrian/ath_radar_stuff/src/spectral_fft/Makefile Modified: user/adrian/ath_radar_stuff/src/spectral_fft/Makefile ============================================================================== --- user/adrian/ath_radar_stuff/src/spectral_fft/Makefile Mon Dec 31 06:47:16 2012 (r244893) +++ user/adrian/ath_radar_stuff/src/spectral_fft/Makefile Mon Dec 31 06:49:42 2012 (r244894) @@ -1,10 +1,11 @@ +PROG= fft_eval + SRCS= fft_eval.c -CFLAGS+= -I/usr/local/include -LDFLAGS+= -L/usr/local/lib -LDLIBS+= -lSDL -lSDL_ttf +CFLAGS+= -I/usr/local/include -L/usr/local/lib + +LDADD+= -lSDL -lSDL_ttf -all: fft_eval +NO_MAN= 1 -clean: - rm -f *.o fft_eval +.include From owner-svn-src-user@FreeBSD.ORG Mon Dec 31 06:53:04 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2A8D2DA9; Mon, 31 Dec 2012 06:53:04 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0E2348FC0C; Mon, 31 Dec 2012 06:53:04 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBV6r32g077956; Mon, 31 Dec 2012 06:53:03 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBV6r3Ww077954; Mon, 31 Dec 2012 06:53:03 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201212310653.qBV6r3Ww077954@svn.freebsd.org> From: Adrian Chadd Date: Mon, 31 Dec 2012 06:53:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r244895 - user/adrian/ath_radar_stuff/src/spectral_fft X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2012 06:53:04 -0000 Author: adrian Date: Mon Dec 31 06:53:03 2012 New Revision: 244895 URL: http://svnweb.freebsd.org/changeset/base/244895 Log: Break out the includes! Added: user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.h Modified: user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c Modified: user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c ============================================================================== --- user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c Mon Dec 31 06:49:42 2012 (r244894) +++ user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c Mon Dec 31 06:53:03 2012 (r244895) @@ -30,47 +30,7 @@ #include #include -typedef int8_t s8; -typedef uint8_t u8; -typedef uint16_t u16; -typedef uint64_t u64; - -/* taken from ath9k.h */ -#define SPECTRAL_HT20_NUM_BINS 56 - -enum ath_fft_sample_type { - ATH_FFT_SAMPLE_HT20 = 0 -}; - -struct fft_sample_tlv { - u8 type; /* see ath_fft_sample */ - u16 length; - /* type dependent data follows */ -} __attribute__((packed)); - -struct fft_sample_ht20 { - struct fft_sample_tlv tlv; - - u8 __alignment; - - u16 freq; - s8 rssi; - s8 noise; - - u16 max_magnitude; - u8 max_index; - u8 bitmap_weight; - - u64 tsf; - - u16 data[SPECTRAL_HT20_NUM_BINS]; -} __attribute__((packed)); - - -struct scanresult { - struct fft_sample_ht20 sample; - struct scanresult *next; -}; +#include "fft_eval.h" #define WIDTH 1600 #define HEIGHT 650 Added: user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.h Mon Dec 31 06:53:03 2012 (r244895) @@ -0,0 +1,46 @@ +#ifndef __FFT_EVAL_H__ +#define __FFT_EVAL_H__ + +typedef int8_t s8; +typedef uint8_t u8; +typedef uint16_t u16; +typedef uint64_t u64; + +/* taken from ath9k.h */ +#define SPECTRAL_HT20_NUM_BINS 56 + +enum ath_fft_sample_type { + ATH_FFT_SAMPLE_HT20 = 0 +}; + +struct fft_sample_tlv { + u8 type; /* see ath_fft_sample */ + u16 length; + /* type dependent data follows */ +} __attribute__((packed)); + +struct fft_sample_ht20 { + struct fft_sample_tlv tlv; + + u8 __alignment; + + u16 freq; + s8 rssi; + s8 noise; + + u16 max_magnitude; + u8 max_index; + u8 bitmap_weight; + + u64 tsf; + + u16 data[SPECTRAL_HT20_NUM_BINS]; +} __attribute__((packed)); + + +struct scanresult { + struct fft_sample_ht20 sample; + struct scanresult *next; +}; + +#endif /* __FFT_EVAL_H__ */ From owner-svn-src-user@FreeBSD.ORG Mon Dec 31 07:03:21 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B72107E; Mon, 31 Dec 2012 07:03:21 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 90C588FC12; Mon, 31 Dec 2012 07:03:21 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBV73LAI079584; Mon, 31 Dec 2012 07:03:21 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBV73KW5079579; Mon, 31 Dec 2012 07:03:20 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201212310703.qBV73KW5079579@svn.freebsd.org> From: Adrian Chadd Date: Mon, 31 Dec 2012 07:03:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r244896 - user/adrian/ath_radar_stuff/src/spectral_fft X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2012 07:03:21 -0000 Author: adrian Date: Mon Dec 31 07:03:20 2012 New Revision: 244896 URL: http://svnweb.freebsd.org/changeset/base/244896 Log: Break out the parsing code into fft_linux.c. This (hopefully) will let me implement a FreeBSD-format version of this. Added: user/adrian/ath_radar_stuff/src/spectral_fft/fft_linux.c user/adrian/ath_radar_stuff/src/spectral_fft/fft_linux.h Modified: user/adrian/ath_radar_stuff/src/spectral_fft/Makefile user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c Modified: user/adrian/ath_radar_stuff/src/spectral_fft/Makefile ============================================================================== --- user/adrian/ath_radar_stuff/src/spectral_fft/Makefile Mon Dec 31 06:53:03 2012 (r244895) +++ user/adrian/ath_radar_stuff/src/spectral_fft/Makefile Mon Dec 31 07:03:20 2012 (r244896) @@ -1,6 +1,6 @@ PROG= fft_eval -SRCS= fft_eval.c +SRCS= fft_eval.c fft_linux.c CFLAGS+= -I/usr/local/include -L/usr/local/lib Modified: user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c ============================================================================== --- user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c Mon Dec 31 06:53:03 2012 (r244895) +++ user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c Mon Dec 31 07:03:20 2012 (r244896) @@ -31,6 +31,7 @@ #include #include "fft_eval.h" +#include "fft_linux.h" #define WIDTH 1600 #define HEIGHT 650 @@ -276,97 +277,6 @@ int draw_picture(int highlight, int star return highlight_freq; } -/* read_file - reads an file into a big buffer and returns it - * - * @fname: file name - * - * returns the buffer with the files content - */ -char *read_file(char *fname, size_t *size) -{ - FILE *fp; - char *buf = NULL; - size_t ret; - - fp = fopen(fname, "r"); - - if (!fp) - return NULL; - - *size = 0; - while (!feof(fp)) { - - buf = realloc(buf, *size + 4097); - if (!buf) - return NULL; - - ret = fread(buf + *size, 1, 4096, fp); - *size += ret; - } - fclose(fp); - - buf[*size] = 0; - - return buf; -} - -/* - * read_scandata - reads the fft scandata and compiles a linked list of datasets - * - * @fname: file name - * - * returns 0 on success, -1 on error. - */ -int read_scandata(char *fname) -{ - char *pos, *scandata; - size_t len, sample_len; - struct scanresult *result; - struct fft_sample_tlv *tlv; - struct scanresult *tail = result_list; - - scandata = read_file(fname, &len); - if (!scandata) - return -1; - - pos = scandata; - - while (pos - scandata < len) { - tlv = (struct fft_sample_tlv *) pos; - sample_len = sizeof(*tlv) + tlv->length; - pos += sample_len; - if (tlv->type != ATH_FFT_SAMPLE_HT20) { - fprintf(stderr, "unknown sample type (%d)\n", tlv->type); - continue; - } - - if (sample_len != sizeof(result->sample)) { - fprintf(stderr, "wrong sample length (have %d, expected %d)\n", sample_len, sizeof(result->sample)); - continue; - } - - result = malloc(sizeof(*result)); - if (!result) - continue; - - memset(result, 0, sizeof(*result)); - memcpy(&result->sample, tlv, sizeof(result->sample)); - fprintf(stderr, "copy %d bytes\n", sizeof(result->sample)); - - if (tail) - tail->next = result; - else - result_list = result; - - tail = result; - - scanresults_n++; - } - - fprintf(stderr, "read %d scan results\n", scanresults_n); - return 0; -} - /* * graphics_main - sets up the data and holds the mainloop. * @@ -485,7 +395,8 @@ int main(int argc, char *argv[]) fprintf(stderr, "WARNING: Experimental Software! Don't trust anything you see. :)\n"); fprintf(stderr, "\n"); - if (read_scandata(argv[1]) < 0) { + scanresults_n = read_scandata_linux(argv[1], &result_list); + if (scanresults_n < 0) { fprintf(stderr, "Couldn't read scanfile ...\n"); usage(argc, argv); return -1; Added: user/adrian/ath_radar_stuff/src/spectral_fft/fft_linux.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/ath_radar_stuff/src/spectral_fft/fft_linux.c Mon Dec 31 07:03:20 2012 (r244896) @@ -0,0 +1,130 @@ +/* + * Copyright (C) 2012 Simon Wunderlich + * Copyright (C) 2012 Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ + +/* + * This program has been created to aid open source spectrum + * analyzer development for Qualcomm/Atheros AR92xx and AR93xx + * based chipsets. + */ + +#include +#include +#include +#include +#include + +#include "fft_eval.h" + +#include "fft_linux.h" + +/* read_file - reads an file into a big buffer and returns it + * + * @fname: file name + * + * returns the buffer with the files content + */ +static char * +read_file(char *fname, size_t *size) +{ + FILE *fp; + char *buf = NULL; + size_t ret; + + fp = fopen(fname, "r"); + + if (!fp) + return NULL; + + *size = 0; + while (!feof(fp)) { + + buf = realloc(buf, *size + 4097); + if (!buf) + return NULL; + + ret = fread(buf + *size, 1, 4096, fp); + *size += ret; + } + fclose(fp); + + buf[*size] = 0; + + return buf; +} + +/* + * read_scandata - reads the fft scandata and compiles a linked list of datasets + * + * @fname: file name + * + * returns 0 on success, -1 on error. + */ +int +read_scandata_linux(char *fname, struct scanresult **result_list) +{ + int scanresults_n = 0; + char *pos, *scandata; + size_t len, sample_len; + struct scanresult *result; + struct fft_sample_tlv *tlv; + struct scanresult *tail = *result_list; + + scandata = read_file(fname, &len); + if (!scandata) + return -1; + + pos = scandata; + + while (pos - scandata < len) { + tlv = (struct fft_sample_tlv *) pos; + sample_len = sizeof(*tlv) + tlv->length; + pos += sample_len; + if (tlv->type != ATH_FFT_SAMPLE_HT20) { + fprintf(stderr, "unknown sample type (%d)\n", tlv->type); + continue; + } + + if (sample_len != sizeof(result->sample)) { + fprintf(stderr, "wrong sample length (have %d, expected %d)\n", sample_len, sizeof(result->sample)); + continue; + } + + result = malloc(sizeof(*result)); + if (!result) + continue; + + memset(result, 0, sizeof(*result)); + memcpy(&result->sample, tlv, sizeof(result->sample)); + fprintf(stderr, "copy %d bytes\n", sizeof(result->sample)); + + if (tail) + tail->next = result; + else + (*result_list) = result; + + tail = result; + + scanresults_n++; + } + + fprintf(stderr, "read %d scan results\n", scanresults_n); + return (scanresults_n); +} + Added: user/adrian/ath_radar_stuff/src/spectral_fft/fft_linux.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/ath_radar_stuff/src/spectral_fft/fft_linux.h Mon Dec 31 07:03:20 2012 (r244896) @@ -0,0 +1,6 @@ +#ifndef __FFT_LINUX_H__ +#define __FFT_LINUX_H__ + +extern int read_scandata_linux(char *fname, struct scanresult **result_list); + +#endif From owner-svn-src-user@FreeBSD.ORG Mon Dec 31 07:30:08 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 72828A0A; Mon, 31 Dec 2012 07:30:08 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 574938FC0A; Mon, 31 Dec 2012 07:30:08 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBV7U8Ci083766; Mon, 31 Dec 2012 07:30:08 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBV7U7mc083760; Mon, 31 Dec 2012 07:30:07 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201212310730.qBV7U7mc083760@svn.freebsd.org> From: Adrian Chadd Date: Mon, 31 Dec 2012 07:30:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r244897 - user/adrian/ath_radar_stuff/src/spectral_fft X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2012 07:30:08 -0000 Author: adrian Date: Mon Dec 31 07:30:07 2012 New Revision: 244897 URL: http://svnweb.freebsd.org/changeset/base/244897 Log: Add freeBSD support for this. Added: user/adrian/ath_radar_stuff/src/spectral_fft/fft_freebsd.c user/adrian/ath_radar_stuff/src/spectral_fft/fft_freebsd.h Modified: user/adrian/ath_radar_stuff/src/spectral_fft/Makefile user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c Modified: user/adrian/ath_radar_stuff/src/spectral_fft/Makefile ============================================================================== --- user/adrian/ath_radar_stuff/src/spectral_fft/Makefile Mon Dec 31 07:03:20 2012 (r244896) +++ user/adrian/ath_radar_stuff/src/spectral_fft/Makefile Mon Dec 31 07:30:07 2012 (r244897) @@ -1,10 +1,10 @@ PROG= fft_eval -SRCS= fft_eval.c fft_linux.c +SRCS= fft_eval.c fft_linux.c fft_freebsd.c -CFLAGS+= -I/usr/local/include -L/usr/local/lib +CFLAGS+= -I/usr/local/include -L/usr/local/lib -I../../lib/ -L../../lib/libradarpkt -LDADD+= -lSDL -lSDL_ttf +LDADD+= -lSDL -lSDL_ttf -lradarpkt -lpcap NO_MAN= 1 Modified: user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c ============================================================================== --- user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c Mon Dec 31 07:03:20 2012 (r244896) +++ user/adrian/ath_radar_stuff/src/spectral_fft/fft_eval.c Mon Dec 31 07:30:07 2012 (r244897) @@ -32,6 +32,7 @@ #include "fft_eval.h" #include "fft_linux.h" +#include "fft_freebsd.h" #define WIDTH 1600 #define HEIGHT 650 @@ -395,7 +396,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "WARNING: Experimental Software! Don't trust anything you see. :)\n"); fprintf(stderr, "\n"); - scanresults_n = read_scandata_linux(argv[1], &result_list); + scanresults_n = read_scandata_freebsd(argv[1], &result_list); if (scanresults_n < 0) { fprintf(stderr, "Couldn't read scanfile ...\n"); usage(argc, argv); Added: user/adrian/ath_radar_stuff/src/spectral_fft/fft_freebsd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/ath_radar_stuff/src/spectral_fft/fft_freebsd.c Mon Dec 31 07:30:07 2012 (r244897) @@ -0,0 +1,286 @@ +#include +#include +#include +#include +#include /* for ntohl etc */ + +#include + +#include "net80211/ieee80211.h" +#include "net80211/ieee80211_radiotap.h" + +#include "libradarpkt/pkt.h" +#include "libradarpkt/ar5212_radar.h" +#include "libradarpkt/ar5416_radar.h" +#include "libradarpkt/ar9280_radar.h" + +#include "fft_eval.h" +#include "fft_freebsd.h" + +/* + * XXX ew, static variables + */ +int n_spectral_samples = 0; +struct scanresult **result_head; +struct scanresult *result_tail; + +/* + * Compile up a rule that's bound to be useful - it only matches on + * radar errors. + * + * tcpdump -ni wlan0 -y IEEE802_11_RADIO -x -X -s0 -v -ve \ + * 'radio[73] == 0x2 && (radio[72] == 5 || radio[72] == 24) + */ + +#define PKTRULE "radio[73] == 0x2 && (radio[72] == 5 || radio[72] == 24)" + +static int +pkt_compile(pcap_t *p, struct bpf_program *fp) +{ + if (pcap_compile(p, fp, PKTRULE, 1, 0) != 0) + return 0; + return 1; +} + +static void +pkt_handle_single(struct radar_entry *re) +{ + int i, j; + struct scanresult *result; + + for (i = 0; i < re->re_num_spectral_entries; i++) { + result = malloc(sizeof(*result)); + if (result == NULL) { + /* Skip on malloc failure */ + warn("%s: malloc", __func__); + continue; + } + + /* Fill out the result, assuming HT20 for now */ + result->sample.tlv.type = ATH_FFT_SAMPLE_HT20; + result->sample.tlv.length = sizeof(result->sample); /* XXX right? */ + + result->sample.freq = re->re_freq; + result->sample.rssi = re->re_rssi; + result->sample.noise = -95; /* XXX extract from header */ + result->sample.max_magnitude = re->re_spectral_entries[i].pri.max_magnitude; + result->sample.max_index = re->re_spectral_entries[i].pri.max_index; + result->sample.bitmap_weight = re->re_spectral_entries[i].pri.bitmap_weight; + /* XXX no max_exp? */ + result->sample.tsf = re->re_timestamp; + /* XXX 56 = numspectralbins */ + for (j = 0; j < 56; j++) { + result->sample.data[j] = re->re_spectral_entries[i].pri.bins[j].raw_mag; + } + + /* add it to the list */ + if (result_tail) + result_tail->next = result; + else + (*result_head) = result; + result_tail = result; + n_spectral_samples++; + } +} + +static void +pkt_print(struct radar_entry *re) +{ + printf("ts: %llu, freq=%u, rssi=%d, dur=%d, nsamples=%d\n", + re->re_timestamp, + re->re_freq, + re->re_rssi, + re->re_dur, + re->re_num_spectral_entries); +} + +void +pkt_handle(int chip, const char *pkt, int len) +{ + struct ieee80211_radiotap_header *rh; + uint8_t rssi, nf; + struct radar_entry re; + int r; + + /* XXX assume it's a radiotap frame */ + rh = (struct ieee80211_radiotap_header *) pkt; + + if (rh->it_version != 0) { + printf("%s: incorrect version (%d)\n", __func__, + rh->it_version); + return; + } + +#if 0 + /* XXX short frames? */ + if (len < 73) { + printf("%s: short frame (%d bytes)\n", __func__, len); + return; + } +#endif + +#if 0 + printf("%s: len=%d, present=0x%08x\n", + __func__, + (rh->it_len), /* XXX why aren't these endian-converted? */ + (rh->it_present)); +#endif + +#if 0 + /* + * XXX local hack - enable the radar checking + * XXX by assuming byte 72 is the radar status code. + */ + if (pkt[72] != 5 && pkt[72] != 24) { + printf("%s: not a radar error (code %d)?!\n", + __func__, + pkt[72]); + return; + } +#endif + if (chip == CHIP_AR5212) + r = ar5212_radar_decode(rh, pkt + rh->it_len, len - rh->it_len, + &re); + else if (chip == CHIP_AR5416) + r = ar5416_radar_decode(rh, pkt + rh->it_len, len - rh->it_len, + &re); + else if (chip == CHIP_AR9280) + r = ar9280_radar_decode(rh, pkt + rh->it_len, len - rh->it_len, + &re); + + /* XXX do something about it */ + if (r) { + pkt_print(&re); + pkt_handle_single(&re); + } +} + +static pcap_t * +open_offline(const char *fname) +{ + pcap_t *p; + char errbuf[PCAP_ERRBUF_SIZE]; + + p = pcap_open_offline(fname, errbuf); + if (p == NULL) { + printf("pcap_create failed: %s\n", errbuf); + return (NULL); + } + + return (p); +} + +static pcap_t * +open_online(const char *ifname) +{ + pcap_t *p; + char errbuf[PCAP_ERRBUF_SIZE]; + struct bpf_program fp; + + p = pcap_open_live(ifname, 65536, 1, 1000, errbuf); + if (! p) { + err(1, "pcap_create: %s\n", errbuf); + return (NULL); + } + + if (pcap_set_datalink(p, DLT_IEEE802_11_RADIO) != 0) { + pcap_perror(p, "pcap_set_datalink"); + return (NULL); + } + + /* XXX pcap_is_swapped() ? */ + + if (! pkt_compile(p, &fp)) { + pcap_perror(p, "pkg_compile compile error\n"); + return (NULL); + } + + if (pcap_setfilter(p, &fp) != 0) { + printf("pcap_setfilter failed\n"); + return (NULL); + } + + return (p); +} + +static void +usage(const char *progname) +{ + + printf("Usage: %s \n", + progname); +} + +int +open_device(const char *dev_str, const char *chip_str, const char *mode) +{ + char *dev; + pcap_t * p; + const char *fname; + const unsigned char *pkt; + struct pcap_pkthdr *hdr; + int len, r; + int chip = 0; + + if (strcmp(chip_str, "ar5212") == 0) { + chip = CHIP_AR5212; + } else if (strcmp(chip_str, "ar5416") == 0) { + chip = CHIP_AR5416; + } else if (strcmp(chip_str, "ar9280") == 0) { + chip = CHIP_AR9280; + } else { + usage("main"); + exit(255); + } + + /* XXX verify */ + fname = dev_str; + + if (strcmp(mode, "file") == 0) { + p = open_offline(fname); + } else if (strcmp(mode, "if") == 0) { + p = open_online(fname); + } else { + usage("main"); + exit(255); + } + + if (p == NULL) + exit(255); + + /* + * Iterate over frames, looking for radiotap frames + * which have PHY errors. + * + * XXX We should compile a filter for this, but the + * XXX access method is a non-standard hack atm. + */ + while ((r = pcap_next_ex(p, &hdr, &pkt)) >= 0) { +#if 0 + printf("capture: len=%d, caplen=%d\n", + hdr->len, hdr->caplen); +#endif + if (r > 0) + pkt_handle(chip, pkt, hdr->caplen); + } + + pcap_close(p); + + /* XXX for now */ + return (0); +} + +int +read_scandata_freebsd(char *fname, struct scanresult **result) +{ + + /* XXX for now, return/do nothing */ + + n_spectral_samples = 0; + result_head = result; + result_tail = (*result); + + (void) open_device(fname, "ar9280", "file"); + + return n_spectral_samples; +} Added: user/adrian/ath_radar_stuff/src/spectral_fft/fft_freebsd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/adrian/ath_radar_stuff/src/spectral_fft/fft_freebsd.h Mon Dec 31 07:30:07 2012 (r244897) @@ -0,0 +1,6 @@ +#ifndef __FFT_FREEBSD_H__ +#define __FFT_FREEBSD_H__ + +extern int read_scandata_freebsd(char *fname, struct scanresult **result); + +#endif From owner-svn-src-user@FreeBSD.ORG Mon Dec 31 07:50:03 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D5257D30; Mon, 31 Dec 2012 07:50:03 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BACD98FC0A; Mon, 31 Dec 2012 07:50:03 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBV7o38D086643; Mon, 31 Dec 2012 07:50:03 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBV7o3Z3086641; Mon, 31 Dec 2012 07:50:03 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201212310750.qBV7o3Z3086641@svn.freebsd.org> From: Adrian Chadd Date: Mon, 31 Dec 2012 07:50:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r244898 - user/adrian/ath_radar_stuff/lib/libradarpkt X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2012 07:50:03 -0000 Author: adrian Date: Mon Dec 31 07:50:02 2012 New Revision: 244898 URL: http://svnweb.freebsd.org/changeset/base/244898 Log: Begin fleshing out support to parse HT20 spectral scan samples. These haven't yet even remotely been verified as correct; please don't try to use it. The frequency is hard-coded; I need to decode ic_freq. Also, it's assuming HT20 format; I need to decode the MCS channel flags from the radiotap header to determine whether it's a HT20 or HT40 channel (and subsequent channel configuration for pri/ext frequencies.) Modified: user/adrian/ath_radar_stuff/lib/libradarpkt/ar9280_radar.c user/adrian/ath_radar_stuff/lib/libradarpkt/pkt.h Modified: user/adrian/ath_radar_stuff/lib/libradarpkt/ar9280_radar.c ============================================================================== --- user/adrian/ath_radar_stuff/lib/libradarpkt/ar9280_radar.c Mon Dec 31 07:30:07 2012 (r244897) +++ user/adrian/ath_radar_stuff/lib/libradarpkt/ar9280_radar.c Mon Dec 31 07:50:02 2012 (r244898) @@ -45,11 +45,164 @@ #include "pkt.h" #include "ar9280_radar.h" +/* Relevant on Merlin and later */ +#define CH_SPECTRAL_EVENT 0x10 /* Relevant for Sowl and later */ #define EXT_CH_RADAR_EARLY_FOUND 0x04 #define EXT_CH_RADAR_FOUND 0x02 #define PRI_CH_RADAR_FOUND 0x01 +#define AR9280_SPECTRAL_SAMPLE_SIZE_HT20 60 +#define AR9280_SPECTRAL_SAMPLE_SIZE_HT40 135 + +/* + * GPLed snippet from Zefir on the linux-wireless list; rewrite this + * soon! + */ +#if 0 +/* + * In my system the post-processed FFT raw data is transferred via a netlink + * interface to a spectral_proxy, that forwards it to a connected host for real-time + * inspection and visualization. + + * The interpretation of the data is as follows: the reported values are given as + * magnitudes, which need to be scaled and converted to absolute power values based + * on the packets noise floor and RSSI values as follows: + * bin_sum = 10*log(sum[i=1..56](b(i)^2) + * power(i) = noise_floor + RSSI + 10*log(b(i)^2) - bin_sum + + * The code fragment to convert magnitude to absolute power values looks like this + * (assuming you transferred the FFT and magnitude data to user space): +*/ +bool +convert_data(struct spectral_ht20_msg *msg) +{ + uint8_t *bin_pwr = msg->bin; + uint8_t *dc_pwr = msg->bin + SPECTRAL_NUM_BINS / 2; + int pwr_count = SPECTRAL_NUM_BINS; + int8_t rssi = msg->rssi; + int8_t max_scale = 1 << msg->max_exp; + int16_t max_mag = msg->max_magnitude; + int i; + int nf0 = msg->noise_floor; + + float bsum = 0.0; + + // DC value is invalid -> interpolate + *dc_pwr = (dc_pwr[-1] + dc_pwr[1]) / 2; + + for (i = 0; i < pwr_count; i++) + bsum += (bin_pwr[i] * max_scale) * (bin_pwr[i] * max_scale); + bsum = log10f(bsum) * 10; + + for (i = 0; i < pwr_count; i++) { + float pwr_val; + int16_t val = bin_pwr[i]; + + if (val == 0) + val = 1; + + pwr_val = 20 * log10f((float) val * max_scale); + pwr_val += nf0 + rssi - bsum; + + val = pwr_val; + bin_pwr[i] = val; + } + return true; +} +#endif + +/* XXX why do we need this? */ +static int8_t +fix_max_index(uint8_t max_index) +{ + int8_t maxindex = max_index; + if (max_index > 32) + maxindex |= 0xe0; + else + maxindex &= ~0xe0; + maxindex += 29; + return maxindex; +} + +static int +ar9280_radar_spectral_decode_ht20(struct ieee80211_radiotap_header *rh, + const unsigned char *pkt, int len, struct radar_entry *re, + int cur_sample) +{ + int i; + struct radar_fft_entry *fe; + + if (len < AR9280_SPECTRAL_SAMPLE_SIZE_HT20) { + return (-1); + } + + fe = &re->re_spectral_entries[cur_sample]; + + /* Decode the bitmap weight, magnitude, max index */ + + fe->pri.max_magnitude = + (pkt[57] << 2) | + ((pkt[56] & 0xc0) >> 6) | + ((pkt[58] & 0x03) << 10); + fe->pri.bitmap_weight = pkt[56] & 0x3f; + fe->pri.max_index = fix_max_index(pkt[58] & 0x3f); + fe->max_exp = pkt[59] & 0x0f; + + /* Decode each bin - the dBm calculation will come later */ + for (i = 0; i < 56; i++) { + fe->pri.bins[i].raw_mag = pkt[i]; + fe->pri.bins[i].adj_mag = fe->pri.bins[i].raw_mag << fe->max_exp; + } + + /* Return OK */ + return (0); +} + +/* + * Decode a spectral scan frame, complete with whatever + * hilarity / bugs ensue. + * + * The known quirks: + * + * + The MAC may corrupt a frame - inserting, deleting + * and/or realigning things. + * + The FFT data can terminate at any time; there's no + * guarantee that we'll get a complete frame. + * + * Let's not handle these for now; we'll just tinker with this + * in the future. + */ +static int +ar9280_radar_spectral_decode(struct ieee80211_radiotap_header *rh, + const unsigned char *pkt, int len, struct radar_entry *re) +{ + int i; + const unsigned char *fr = pkt; + int fr_len = len; + + + for (i = 0; i < MAX_SPECTRAL_SCAN_SAMPLES_PER_PKT; i++) { + /* HT20 or HT40? */ + /* XXX hard-code HT20 */ + if (ar9280_radar_spectral_decode_ht20(rh, fr, fr_len, re, i) != 0) { + break; + } + fr_len -= AR9280_SPECTRAL_SAMPLE_SIZE_HT20; + fr += AR9280_SPECTRAL_SAMPLE_SIZE_HT20; + if (fr_len < 0) + break; + } + +// printf(" Spectral: %d samples\n", i); + re->re_num_spectral_entries = i; + + return (0); +} + +/* + * Decode a normal radar frame. + */ int ar9280_radar_decode(struct ieee80211_radiotap_header *rh, const unsigned char *pkt, int len, struct radar_entry *re) @@ -93,10 +246,11 @@ ar9280_radar_decode(struct ieee80211_rad printf(", pri/ext rssi: %d/%d", pri_rssi, ext_rssi); printf(" pri: %u", pkt[len - 3] & 0xff); printf(" ext: %u", pkt[len - 2] & 0xff); - printf(" flags: %s %s %s\n", + printf(" flags: %s %s %s %s\n", pkt[len - 1] & PRI_CH_RADAR_FOUND ? "pri" : "", pkt[len - 1] & EXT_CH_RADAR_FOUND ? "ext" : "", - pkt[len - 1] & EXT_CH_RADAR_EARLY_FOUND ? "extearly" : "" + pkt[len - 1] & EXT_CH_RADAR_EARLY_FOUND ? "extearly" : "", + pkt[len - 1] & CH_SPECTRAL_EVENT ? "spectral" : "" ); #endif @@ -124,8 +278,13 @@ ar9280_radar_decode(struct ieee80211_rad re->re_timestamp = tsf; re->re_rssi = pri_rssi; /* XXX extension rssi? */ re->re_dur = pkt[len - 3]; /* XXX extension duration? */ - re->re_freq = 0; + re->re_freq = 2412; /* XXX DO this! */ + re->re_num_spectral_entries = 0; /* XXX flags? */ + if (pkt[len - 1] & CH_SPECTRAL_EVENT) { + (void) ar9280_radar_spectral_decode(rh, pkt, len - 3, re); + } + return(1); } Modified: user/adrian/ath_radar_stuff/lib/libradarpkt/pkt.h ============================================================================== --- user/adrian/ath_radar_stuff/lib/libradarpkt/pkt.h Mon Dec 31 07:30:07 2012 (r244897) +++ user/adrian/ath_radar_stuff/lib/libradarpkt/pkt.h Mon Dec 31 07:50:02 2012 (r244898) @@ -35,6 +35,31 @@ extern "C" { #endif +#define PKT_NUM_BINS 64 + +#define MAX_SPECTRAL_SCAN_SAMPLES_PER_PKT 64 + +struct radar_fft_bin { + int32_t dBm; + int32_t adj_mag; + uint8_t raw_mag; /* original magnitude */ + uint8_t bitmap; /* whether this is strong/weak */ + uint8_t pad[2]; +}; + +struct radar_fft_entry { + int is_ht40; /* 1=HT40, 0=HT20 */ + + struct { + struct radar_fft_bin bins[PKT_NUM_BINS]; + uint8_t max_index; + uint8_t bitmap_weight; + uint16_t max_magnitude; + } pri, ext; + + uint8_t max_exp; +}; + struct radar_entry { uint64_t re_timestamp; uint32_t re_freq; @@ -45,6 +70,10 @@ struct radar_entry { */ int32_t re_rssi; uint32_t re_dur; + + /* XXX make these optional at some point */ + int re_num_spectral_entries; + struct radar_fft_entry re_spectral_entries[MAX_SPECTRAL_SCAN_SAMPLES_PER_PKT]; }; #ifdef __cplusplus From owner-svn-src-user@FreeBSD.ORG Mon Dec 31 18:28:39 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0FE7EB8E; Mon, 31 Dec 2012 18:28:39 +0000 (UTC) (envelope-from mr.kodiak@gmail.com) Received: from mail-ie0-f176.google.com (mail-ie0-f176.google.com [209.85.223.176]) by mx1.freebsd.org (Postfix) with ESMTP id A25C78FC13; Mon, 31 Dec 2012 18:28:38 +0000 (UTC) Received: by mail-ie0-f176.google.com with SMTP id 13so15226494iea.35 for ; Mon, 31 Dec 2012 10:28:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type; bh=XGzvIG7UnTmJNMbV9LKosKN+rG1H61VucE6P0x+V2lw=; b=eryyAdtapp7oOv1uoF7LeGUY6OtRRyhDow2qgXTvCG94VU7dm/nVE672C2JWHV9Vxs mICdrviVrN/Cy4ECjO6SYOtblDwEpPuvg2zYy5W2RTzEBO1x+xXTv89OSj/a9NyfzopP kGJy0lWPXuwtm18qBgJW6ZCMFHeYLOt9zfzs9ubebLtoJG/uN7wYbu7NuomJikUObFRB /UHmbgddvKCIi7DVU451IMeSqU+utg25n5Dpw4xKHKlQauQKpi3WqRRoB3QAqSUe/3vB uICVZB9ioG67ZL2fVo34gG1vk8I4G0wasOgRVtSRGTGEf1MvwShanlLaKxePx4fFGTsp KXtg== Received: by 10.50.219.169 with SMTP id pp9mr35395333igc.46.1356978512697; Mon, 31 Dec 2012 10:28:32 -0800 (PST) MIME-Version: 1.0 Sender: mr.kodiak@gmail.com Received: by 10.64.142.198 with HTTP; Mon, 31 Dec 2012 10:28:02 -0800 (PST) In-Reply-To: References: <201212282218.qBSMIfX2015054@svn.freebsd.org> <20121228223259.GX82219@kib.kiev.ua> <20121228231649.GZ82219@kib.kiev.ua> <20121229150107.GC82219@kib.kiev.ua> <20121229160355.GD82219@kib.kiev.ua> From: Bryan Venteicher Date: Mon, 31 Dec 2012 12:28:02 -0600 X-Google-Sender-Auth: lKoz1Gt_VKeRi9DwQNa14QDBNGg Message-ID: Subject: Re: svn commit: r244793 - in user/attilio/membarclean/dev: drm drm2 netmap virtio To: attilio@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 Cc: src-committers@freebsd.org, svn-src-user@freebsd.org X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2012 18:28:39 -0000 On Sun, Dec 30, 2012 at 7:33 PM, Attilio Rao wrote: > On Sun, Dec 30, 2012 at 9:00 PM, Bryan Venteicher wrote: >> On Sat, Dec 29, 2012 at 10:37 AM, Attilio Rao wrote: >>> On Sat, Dec 29, 2012 at 5:03 PM, Konstantin Belousov >>> wrote: >>>> On Sat, Dec 29, 2012 at 07:13:57AM -0800, Attilio Rao wrote: >>>>> On Sat, Dec 29, 2012 at 7:01 AM, Konstantin Belousov >>>>> wrote: >>>>> > On Fri, Dec 28, 2012 at 11:34:39PM +0000, Attilio Rao wrote: >>>>> >> On Fri, Dec 28, 2012 at 11:16 PM, Konstantin Belousov >>>>> >> wrote: >>>>> >> > On Fri, Dec 28, 2012 at 10:55:47PM +0000, Attilio Rao wrote: >>>>> >> >> On Fri, Dec 28, 2012 at 10:32 PM, Konstantin Belousov >>>>> >> >> wrote: >>>>> >> >> > On Fri, Dec 28, 2012 at 10:18:41PM +0000, Attilio Rao wrote: >>>>> >> >> >> Author: attilio >>>>> >> >> >> Date: Fri Dec 28 22:18:41 2012 >>>>> >> >> >> New Revision: 244793 >>>>> >> >> >> URL: http://svnweb.freebsd.org/changeset/base/244793 >>>>> >> >> >> >>>>> >> >> >> Log: >>>>> >> >> >> - Remove rmb() usage from netmap and replace it with intended operation >>>>> >> >> >> to do actual memory fetching reads. >>>>> >> >> >> - GC unused DRM_WRITEMEMORYBARRIER() from drm and drm2. >>>>> >> >> >> - Use atomic_load_acq_*() in virtio and drm2 in places that don't need >>>>> >> >> >> to use rmb(). >>>>> >> >> >> >>>>> >> >> >> All these changes remove completely rmb() from MI code, with the >>>>> >> >> >> exception of cxgbe which will be hammered in a followup commit. >>>>> >> >> >> >>>>> >> >> >> Modified: >>>>> >> >> >> user/attilio/membarclean/dev/drm/drmP.h >>>>> >> >> >> user/attilio/membarclean/dev/drm2/drmP.h >>>>> >> >> >> user/attilio/membarclean/dev/drm2/drm_atomic.h >>>>> >> >> >> user/attilio/membarclean/dev/drm2/drm_irq.c >>>>> >> >> >> user/attilio/membarclean/dev/netmap/netmap.c >>>>> >> >> >> user/attilio/membarclean/dev/virtio/virtqueue.c >>>>> >> >> >> >>>>> >> >> >> Modified: user/attilio/membarclean/dev/drm/drmP.h >>>>> >> >> >> ============================================================================== >>>>> >> >> >> --- user/attilio/membarclean/dev/drm/drmP.h Fri Dec 28 22:06:50 2012 (r244792) >>>>> >> >> >> +++ user/attilio/membarclean/dev/drm/drmP.h Fri Dec 28 22:18:41 2012 (r244793) >>>>> >> >> >> @@ -241,11 +241,9 @@ typedef u_int32_t u32; >>>>> >> >> >> typedef u_int16_t u16; >>>>> >> >> >> typedef u_int8_t u8; >>>>> >> >> >> >>>>> >> >> >> -/* DRM_READMEMORYBARRIER() prevents reordering of reads. >>>>> >> >> >> - * DRM_WRITEMEMORYBARRIER() prevents reordering of writes. >>>>> >> >> >> +/* DRM_WRITEMEMORYBARRIER() prevents reordering of writes. >>>>> >> >> >> * DRM_MEMORYBARRIER() prevents reordering of reads and writes. >>>>> >> >> >> */ >>>>> >> >> >> -#define DRM_READMEMORYBARRIER() rmb() >>>>> >> >> >> #define DRM_WRITEMEMORYBARRIER() wmb() >>>>> >> >> >> #define DRM_MEMORYBARRIER() mb() >>>>> >> >> >> >>>>> >> >> >> >>>>> >> >> >> Modified: user/attilio/membarclean/dev/drm2/drmP.h >>>>> >> >> >> ============================================================================== >>>>> >> >> >> --- user/attilio/membarclean/dev/drm2/drmP.h Fri Dec 28 22:06:50 2012 (r244792) >>>>> >> >> >> +++ user/attilio/membarclean/dev/drm2/drmP.h Fri Dec 28 22:18:41 2012 (r244793) >>>>> >> >> >> @@ -263,11 +263,9 @@ typedef int32_t s32; >>>>> >> >> >> typedef int16_t s16; >>>>> >> >> >> typedef int8_t s8; >>>>> >> >> >> >>>>> >> >> >> -/* DRM_READMEMORYBARRIER() prevents reordering of reads. >>>>> >> >> >> - * DRM_WRITEMEMORYBARRIER() prevents reordering of writes. >>>>> >> >> >> +/* DRM_WRITEMEMORYBARRIER() prevents reordering of writes. >>>>> >> >> >> * DRM_MEMORYBARRIER() prevents reordering of reads and writes. >>>>> >> >> >> */ >>>>> >> >> >> -#define DRM_READMEMORYBARRIER() rmb() >>>>> >> >> >> #define DRM_WRITEMEMORYBARRIER() wmb() >>>>> >> >> >> #define DRM_MEMORYBARRIER() mb() >>>>> >> >> >> >>>>> >> >> >> >>>>> >> >> >> Modified: user/attilio/membarclean/dev/drm2/drm_atomic.h >>>>> >> >> >> ============================================================================== >>>>> >> >> >> --- user/attilio/membarclean/dev/drm2/drm_atomic.h Fri Dec 28 22:06:50 2012 (r244792) >>>>> >> >> >> +++ user/attilio/membarclean/dev/drm2/drm_atomic.h Fri Dec 28 22:18:41 2012 (r244793) >>>>> >> >> >> @@ -38,6 +38,7 @@ typedef u_int32_t atomic_t; >>>>> >> >> >> >>>>> >> >> >> #define atomic_set(p, v) (*(p) = (v)) >>>>> >> >> >> #define atomic_read(p) (*(p)) >>>>> >> >> >> +#define atomic_read_acq(p) atomic_load_acq_int(p) >>>>> >> >> >> #define atomic_inc(p) atomic_add_int(p, 1) >>>>> >> >> >> #define atomic_dec(p) atomic_subtract_int(p, 1) >>>>> >> >> >> #define atomic_add(n, p) atomic_add_int(p, n) >>>>> >> >> >> >>>>> >> >> >> Modified: user/attilio/membarclean/dev/drm2/drm_irq.c >>>>> >> >> >> ============================================================================== >>>>> >> >> >> --- user/attilio/membarclean/dev/drm2/drm_irq.c Fri Dec 28 22:06:50 2012 (r244792) >>>>> >> >> >> +++ user/attilio/membarclean/dev/drm2/drm_irq.c Fri Dec 28 22:18:41 2012 (r244793) >>>>> >> >> >> @@ -701,8 +701,7 @@ u32 drm_vblank_count_and_time(struct drm >>>>> >> >> >> do { >>>>> >> >> >> cur_vblank = atomic_read(&dev->_vblank_count[crtc]); >>>>> >> >> >> *vblanktime = vblanktimestamp(dev, crtc, cur_vblank); >>>>> >> >> >> - rmb(); >>>>> >> >> >> - } while (cur_vblank != atomic_read(&dev->_vblank_count[crtc])); >>>>> >> >> >> + } while (cur_vblank != atomic_read_acq(&dev->_vblank_count[crtc])); >>>>> >> >> >> >>>>> >> >> >> return cur_vblank; >>>>> >> >> >> } >>>>> >> >> > >>>>> >> >> > The drm/drm2 is the contributed code, maintained outside the tree, and I >>>>> >> >> > explicitely decided to keep the original approach. I will appreciate if >>>>> >> >> > this would be left as it is. >>>>> >> >> >>>>> >> >> Aren't the stubs in atomic FreeBSD specific? >>>>> >> >> So it does rely on some sort of Linux layer emulation? >>>>> >> >> Right now my target is to get rid of rmb() and wmb() and garbage >>>>> >> >> collect them. If drm2 is Linux specific and needs to stay that way I >>>>> >> >> will make a different patch. >>>>> >> > >>>>> >> > *mb() are the Linux KPI, and almost any non-trivial ported driver >>>>> >> > depends on them. The mess which we already have in tree with the >>>>> >> > duplicated and sometimes wrong definitions of the barries is because we >>>>> >> > get this compat functions too late, and the driver authors added them >>>>> >> > locally. >>>>> >> > >>>>> >> > The functions should stay there, and their usage in the ported drivers too. >>>>> >> > Otherwise, the mess will reappear and continue to spread. >>>>> >> >>>>> >> I don't agree with "the functions should stay there" just for your >>>>> >> premise: they are not a FreeBSD KPI and they should be defined in >>>>> >> atomic.h. They violate our atomic/membar model and they are only >>>>> >> useful for Linux-feature emulation purposes. More importantly, they >>>>> >> are mostly wrong and the requirements are niether clear or precise >>>>> >> because they makes just no sense in FreeBSD. >>>>> > In what way they are wrong ? >>>>> > >>>>> > I am fine with removing them from the machine/atomic.h and putting >>>>> > under any other namespace, even into machine/never_use_the_linuxisms.h. >>>>> > But driver authors must not be forced to reimplement the same KPI >>>>> > Nth time. >>>>> >>>>> This is fine. >>>>> They are wrong because Linux requirements about write memory barriers >>>>> are different than our _rel barriers and their requirements about read >>>>> memory barriers are different than our _acq barriers. >>>>> Per-Linux doc, infact, their write barriers only serialize over other >>>>> pre-stores while their read barriers only serialize over post-loads. >>>>> FreeBSD serializes over pre-stores/loads (for _rel) and >>>>> post-stores/loads (for _acq). >>>> Yes, but this does not make Linux-style rmb/wmb barriers incompatible with >>>> the FreeBSD acq/rel barriers. They pairs have obviously different >>>> semantic, they are not interchangable, but there is nothing new to state. >>>> I do not see how the rmb/wmb can be claimed incompatible or wrong. >>>> They are only different. >>> >>> As first thing they are undocumented in our world. Second thing they >>> are different by freebsd philosophy. And I hardly believe all drivers >>> developer understands this nit differences between freebsd _rel/_acq >>> and wmb()/acq(), leaving alone architecture porters. >>> >>>>> >>>>> Having the wmb() and rmb() in linux compat stub, that all the drivers >>>>> can reuse, is a perfectly acceptable compromise. >>>>> However such layer doesn't exist nowadays. I think there were some >>>>> resistence in the past about implementing it, because people were >>>>> freightened that drivers weren't going to be ported natively to >>>>> FreeBSD anymore. However for simple stuff like membars this should not >>>>> withstand. >>>> Ok. >>>> >>>>> >>>>> > BTW, did you looked at the lib/libc/sys/__vdso_gettimeofday.c:binuptime() ? >>>>> > >>>>> >> >>>>> >> My current plan is to just keep mb() at the atomic-FreeBSD level and >>>>> >> get rid of the others. >>>> Still, there are situations where FreeBSD implementation does not work, >>>> see above example from libc. >>> >>> I still need to look into it, but there are also other cases, like the >>> virtio ones, where we want to get _rel or _acq semantic for smaller >>> than int read and writes. I think I will make a followup soon on all >>> the cases where the wmb() and rmb() are used, try to see where our >>> initial model is failing, if any, and try to formalize the situation >>> some more. This is a first attempt. >>> But supporting wmb() and rmb() at the architecture level only because >>> "Linux does it" is wrong. If they belong to a compat layer, it is >>> acceptable. >>> >> >> For VirtIO, I think I would be fine with reverting r240427 to make >> everything just straight mb()'s, and then #ifdef'ing atomic(9) for >> those arch's with 16-bit support. > > Can you take care of doing so? I don't plan any immediate action on > this item in the next weeks so any help will be appreciated. > At least add some comments saying while the wmb(), rmb() are used > would be helpful in understanding what are the constraints in general. > I'm currently swamped with work, but should be able take care of it in the next few weeks. > Attilio > > > -- > Peace can only be achieved by understanding - A. Einstein