2008-11-28 16:49:02 +00:00
|
|
|
/*
|
2009-03-13 03:37:23 +00:00
|
|
|
* Copyright (c) 2008-2009 Atheros Communications Inc.
|
2008-11-28 16:49:02 +00:00
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, and/or distribute this software for any
|
|
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
|
|
* copyright notice and this permission notice appear in all copies.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 08:04:11 +00:00
|
|
|
#include <linux/slab.h>
|
2009-03-06 08:57:39 +00:00
|
|
|
#include <asm/unaligned.h>
|
|
|
|
|
2009-02-09 07:56:54 +00:00
|
|
|
#include "ath9k.h"
|
2008-11-28 16:49:02 +00:00
|
|
|
|
2009-09-24 03:06:59 +00:00
|
|
|
#define REG_WRITE_D(_ah, _reg, _val) \
|
|
|
|
ath9k_hw_common(_ah)->ops->write((_ah), (_val), (_reg))
|
|
|
|
#define REG_READ_D(_ah, _reg) \
|
|
|
|
ath9k_hw_common(_ah)->ops->read((_ah), (_reg))
|
|
|
|
|
2008-11-28 16:51:08 +00:00
|
|
|
static int ath9k_debugfs_open(struct inode *inode, struct file *file)
|
|
|
|
{
|
|
|
|
file->private_data = inode->i_private;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-11-23 21:33:27 +00:00
|
|
|
#ifdef CONFIG_ATH_DEBUG
|
|
|
|
|
2009-05-27 12:48:29 +00:00
|
|
|
static ssize_t read_file_debug(struct file *file, char __user *user_buf,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ath_softc *sc = file->private_data;
|
2009-09-13 09:42:02 +00:00
|
|
|
struct ath_common *common = ath9k_hw_common(sc->sc_ah);
|
2009-05-27 12:48:29 +00:00
|
|
|
char buf[32];
|
2009-06-02 13:58:55 +00:00
|
|
|
unsigned int len;
|
|
|
|
|
2010-05-14 13:24:37 +00:00
|
|
|
len = sprintf(buf, "0x%08x\n", common->debug_mask);
|
2009-05-27 12:48:29 +00:00
|
|
|
return simple_read_from_buffer(user_buf, count, ppos, buf, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ath_softc *sc = file->private_data;
|
2009-09-13 09:42:02 +00:00
|
|
|
struct ath_common *common = ath9k_hw_common(sc->sc_ah);
|
2009-05-27 12:48:29 +00:00
|
|
|
unsigned long mask;
|
|
|
|
char buf[32];
|
2009-06-02 13:58:55 +00:00
|
|
|
ssize_t len;
|
|
|
|
|
|
|
|
len = min(count, sizeof(buf) - 1);
|
|
|
|
if (copy_from_user(buf, user_buf, len))
|
2010-05-14 13:25:39 +00:00
|
|
|
return -EFAULT;
|
2009-06-02 13:58:55 +00:00
|
|
|
|
|
|
|
buf[len] = '\0';
|
|
|
|
if (strict_strtoul(buf, 0, &mask))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2009-09-13 09:42:02 +00:00
|
|
|
common->debug_mask = mask;
|
2009-05-27 12:48:29 +00:00
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct file_operations fops_debug = {
|
|
|
|
.read = read_file_debug,
|
|
|
|
.write = write_file_debug,
|
|
|
|
.open = ath9k_debugfs_open,
|
llseek: automatically add .llseek fop
All file_operations should get a .llseek operation so we can make
nonseekable_open the default for future file operations without a
.llseek pointer.
The three cases that we can automatically detect are no_llseek, seq_lseek
and default_llseek. For cases where we can we can automatically prove that
the file offset is always ignored, we use noop_llseek, which maintains
the current behavior of not returning an error from a seek.
New drivers should normally not use noop_llseek but instead use no_llseek
and call nonseekable_open at open time. Existing drivers can be converted
to do the same when the maintainer knows for certain that no user code
relies on calling seek on the device file.
The generated code is often incorrectly indented and right now contains
comments that clarify for each added line why a specific variant was
chosen. In the version that gets submitted upstream, the comments will
be gone and I will manually fix the indentation, because there does not
seem to be a way to do that using coccinelle.
Some amount of new code is currently sitting in linux-next that should get
the same modifications, which I will do at the end of the merge window.
Many thanks to Julia Lawall for helping me learn to write a semantic
patch that does all this.
===== begin semantic patch =====
// This adds an llseek= method to all file operations,
// as a preparation for making no_llseek the default.
//
// The rules are
// - use no_llseek explicitly if we do nonseekable_open
// - use seq_lseek for sequential files
// - use default_llseek if we know we access f_pos
// - use noop_llseek if we know we don't access f_pos,
// but we still want to allow users to call lseek
//
@ open1 exists @
identifier nested_open;
@@
nested_open(...)
{
<+...
nonseekable_open(...)
...+>
}
@ open exists@
identifier open_f;
identifier i, f;
identifier open1.nested_open;
@@
int open_f(struct inode *i, struct file *f)
{
<+...
(
nonseekable_open(...)
|
nested_open(...)
)
...+>
}
@ read disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ read_no_fpos disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
... when != off
}
@ write @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ write_no_fpos @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
... when != off
}
@ fops0 @
identifier fops;
@@
struct file_operations fops = {
...
};
@ has_llseek depends on fops0 @
identifier fops0.fops;
identifier llseek_f;
@@
struct file_operations fops = {
...
.llseek = llseek_f,
...
};
@ has_read depends on fops0 @
identifier fops0.fops;
identifier read_f;
@@
struct file_operations fops = {
...
.read = read_f,
...
};
@ has_write depends on fops0 @
identifier fops0.fops;
identifier write_f;
@@
struct file_operations fops = {
...
.write = write_f,
...
};
@ has_open depends on fops0 @
identifier fops0.fops;
identifier open_f;
@@
struct file_operations fops = {
...
.open = open_f,
...
};
// use no_llseek if we call nonseekable_open
////////////////////////////////////////////
@ nonseekable1 depends on !has_llseek && has_open @
identifier fops0.fops;
identifier nso ~= "nonseekable_open";
@@
struct file_operations fops = {
... .open = nso, ...
+.llseek = no_llseek, /* nonseekable */
};
@ nonseekable2 depends on !has_llseek @
identifier fops0.fops;
identifier open.open_f;
@@
struct file_operations fops = {
... .open = open_f, ...
+.llseek = no_llseek, /* open uses nonseekable */
};
// use seq_lseek for sequential files
/////////////////////////////////////
@ seq depends on !has_llseek @
identifier fops0.fops;
identifier sr ~= "seq_read";
@@
struct file_operations fops = {
... .read = sr, ...
+.llseek = seq_lseek, /* we have seq_read */
};
// use default_llseek if there is a readdir
///////////////////////////////////////////
@ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier readdir_e;
@@
// any other fop is used that changes pos
struct file_operations fops = {
... .readdir = readdir_e, ...
+.llseek = default_llseek, /* readdir is present */
};
// use default_llseek if at least one of read/write touches f_pos
/////////////////////////////////////////////////////////////////
@ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read.read_f;
@@
// read fops use offset
struct file_operations fops = {
... .read = read_f, ...
+.llseek = default_llseek, /* read accesses f_pos */
};
@ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write.write_f;
@@
// write fops use offset
struct file_operations fops = {
... .write = write_f, ...
+ .llseek = default_llseek, /* write accesses f_pos */
};
// Use noop_llseek if neither read nor write accesses f_pos
///////////////////////////////////////////////////////////
@ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
identifier write_no_fpos.write_f;
@@
// write fops use offset
struct file_operations fops = {
...
.write = write_f,
.read = read_f,
...
+.llseek = noop_llseek, /* read and write both use no f_pos */
};
@ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write_no_fpos.write_f;
@@
struct file_operations fops = {
... .write = write_f, ...
+.llseek = noop_llseek, /* write uses no f_pos */
};
@ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
@@
struct file_operations fops = {
... .read = read_f, ...
+.llseek = noop_llseek, /* read uses no f_pos */
};
@ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
@@
struct file_operations fops = {
...
+.llseek = noop_llseek, /* no read or write fn */
};
===== End semantic patch =====
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Julia Lawall <julia@diku.dk>
Cc: Christoph Hellwig <hch@infradead.org>
2010-08-15 16:52:59 +00:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.llseek = default_llseek,
|
2009-05-27 12:48:29 +00:00
|
|
|
};
|
|
|
|
|
2009-11-23 21:33:27 +00:00
|
|
|
#endif
|
|
|
|
|
2010-01-29 22:22:26 +00:00
|
|
|
#define DMA_BUF_LEN 1024
|
|
|
|
|
2010-05-11 15:23:01 +00:00
|
|
|
static ssize_t read_file_tx_chainmask(struct file *file, char __user *user_buf,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ath_softc *sc = file->private_data;
|
|
|
|
struct ath_common *common = ath9k_hw_common(sc->sc_ah);
|
|
|
|
char buf[32];
|
|
|
|
unsigned int len;
|
|
|
|
|
2010-05-14 13:24:37 +00:00
|
|
|
len = sprintf(buf, "0x%08x\n", common->tx_chainmask);
|
2010-05-11 15:23:01 +00:00
|
|
|
return simple_read_from_buffer(user_buf, count, ppos, buf, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t write_file_tx_chainmask(struct file *file, const char __user *user_buf,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ath_softc *sc = file->private_data;
|
|
|
|
struct ath_common *common = ath9k_hw_common(sc->sc_ah);
|
|
|
|
unsigned long mask;
|
|
|
|
char buf[32];
|
|
|
|
ssize_t len;
|
|
|
|
|
|
|
|
len = min(count, sizeof(buf) - 1);
|
|
|
|
if (copy_from_user(buf, user_buf, len))
|
2010-05-14 13:25:39 +00:00
|
|
|
return -EFAULT;
|
2010-05-11 15:23:01 +00:00
|
|
|
|
|
|
|
buf[len] = '\0';
|
|
|
|
if (strict_strtoul(buf, 0, &mask))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
common->tx_chainmask = mask;
|
|
|
|
sc->sc_ah->caps.tx_chainmask = mask;
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct file_operations fops_tx_chainmask = {
|
|
|
|
.read = read_file_tx_chainmask,
|
|
|
|
.write = write_file_tx_chainmask,
|
|
|
|
.open = ath9k_debugfs_open,
|
llseek: automatically add .llseek fop
All file_operations should get a .llseek operation so we can make
nonseekable_open the default for future file operations without a
.llseek pointer.
The three cases that we can automatically detect are no_llseek, seq_lseek
and default_llseek. For cases where we can we can automatically prove that
the file offset is always ignored, we use noop_llseek, which maintains
the current behavior of not returning an error from a seek.
New drivers should normally not use noop_llseek but instead use no_llseek
and call nonseekable_open at open time. Existing drivers can be converted
to do the same when the maintainer knows for certain that no user code
relies on calling seek on the device file.
The generated code is often incorrectly indented and right now contains
comments that clarify for each added line why a specific variant was
chosen. In the version that gets submitted upstream, the comments will
be gone and I will manually fix the indentation, because there does not
seem to be a way to do that using coccinelle.
Some amount of new code is currently sitting in linux-next that should get
the same modifications, which I will do at the end of the merge window.
Many thanks to Julia Lawall for helping me learn to write a semantic
patch that does all this.
===== begin semantic patch =====
// This adds an llseek= method to all file operations,
// as a preparation for making no_llseek the default.
//
// The rules are
// - use no_llseek explicitly if we do nonseekable_open
// - use seq_lseek for sequential files
// - use default_llseek if we know we access f_pos
// - use noop_llseek if we know we don't access f_pos,
// but we still want to allow users to call lseek
//
@ open1 exists @
identifier nested_open;
@@
nested_open(...)
{
<+...
nonseekable_open(...)
...+>
}
@ open exists@
identifier open_f;
identifier i, f;
identifier open1.nested_open;
@@
int open_f(struct inode *i, struct file *f)
{
<+...
(
nonseekable_open(...)
|
nested_open(...)
)
...+>
}
@ read disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ read_no_fpos disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
... when != off
}
@ write @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ write_no_fpos @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
... when != off
}
@ fops0 @
identifier fops;
@@
struct file_operations fops = {
...
};
@ has_llseek depends on fops0 @
identifier fops0.fops;
identifier llseek_f;
@@
struct file_operations fops = {
...
.llseek = llseek_f,
...
};
@ has_read depends on fops0 @
identifier fops0.fops;
identifier read_f;
@@
struct file_operations fops = {
...
.read = read_f,
...
};
@ has_write depends on fops0 @
identifier fops0.fops;
identifier write_f;
@@
struct file_operations fops = {
...
.write = write_f,
...
};
@ has_open depends on fops0 @
identifier fops0.fops;
identifier open_f;
@@
struct file_operations fops = {
...
.open = open_f,
...
};
// use no_llseek if we call nonseekable_open
////////////////////////////////////////////
@ nonseekable1 depends on !has_llseek && has_open @
identifier fops0.fops;
identifier nso ~= "nonseekable_open";
@@
struct file_operations fops = {
... .open = nso, ...
+.llseek = no_llseek, /* nonseekable */
};
@ nonseekable2 depends on !has_llseek @
identifier fops0.fops;
identifier open.open_f;
@@
struct file_operations fops = {
... .open = open_f, ...
+.llseek = no_llseek, /* open uses nonseekable */
};
// use seq_lseek for sequential files
/////////////////////////////////////
@ seq depends on !has_llseek @
identifier fops0.fops;
identifier sr ~= "seq_read";
@@
struct file_operations fops = {
... .read = sr, ...
+.llseek = seq_lseek, /* we have seq_read */
};
// use default_llseek if there is a readdir
///////////////////////////////////////////
@ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier readdir_e;
@@
// any other fop is used that changes pos
struct file_operations fops = {
... .readdir = readdir_e, ...
+.llseek = default_llseek, /* readdir is present */
};
// use default_llseek if at least one of read/write touches f_pos
/////////////////////////////////////////////////////////////////
@ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read.read_f;
@@
// read fops use offset
struct file_operations fops = {
... .read = read_f, ...
+.llseek = default_llseek, /* read accesses f_pos */
};
@ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write.write_f;
@@
// write fops use offset
struct file_operations fops = {
... .write = write_f, ...
+ .llseek = default_llseek, /* write accesses f_pos */
};
// Use noop_llseek if neither read nor write accesses f_pos
///////////////////////////////////////////////////////////
@ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
identifier write_no_fpos.write_f;
@@
// write fops use offset
struct file_operations fops = {
...
.write = write_f,
.read = read_f,
...
+.llseek = noop_llseek, /* read and write both use no f_pos */
};
@ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write_no_fpos.write_f;
@@
struct file_operations fops = {
... .write = write_f, ...
+.llseek = noop_llseek, /* write uses no f_pos */
};
@ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
@@
struct file_operations fops = {
... .read = read_f, ...
+.llseek = noop_llseek, /* read uses no f_pos */
};
@ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
@@
struct file_operations fops = {
...
+.llseek = noop_llseek, /* no read or write fn */
};
===== End semantic patch =====
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Julia Lawall <julia@diku.dk>
Cc: Christoph Hellwig <hch@infradead.org>
2010-08-15 16:52:59 +00:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.llseek = default_llseek,
|
2010-05-11 15:23:01 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static ssize_t read_file_rx_chainmask(struct file *file, char __user *user_buf,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ath_softc *sc = file->private_data;
|
|
|
|
struct ath_common *common = ath9k_hw_common(sc->sc_ah);
|
|
|
|
char buf[32];
|
|
|
|
unsigned int len;
|
|
|
|
|
2010-05-14 13:24:37 +00:00
|
|
|
len = sprintf(buf, "0x%08x\n", common->rx_chainmask);
|
2010-05-11 15:23:01 +00:00
|
|
|
return simple_read_from_buffer(user_buf, count, ppos, buf, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t write_file_rx_chainmask(struct file *file, const char __user *user_buf,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ath_softc *sc = file->private_data;
|
|
|
|
struct ath_common *common = ath9k_hw_common(sc->sc_ah);
|
|
|
|
unsigned long mask;
|
|
|
|
char buf[32];
|
|
|
|
ssize_t len;
|
|
|
|
|
|
|
|
len = min(count, sizeof(buf) - 1);
|
|
|
|
if (copy_from_user(buf, user_buf, len))
|
2010-05-14 13:25:39 +00:00
|
|
|
return -EFAULT;
|
2010-05-11 15:23:01 +00:00
|
|
|
|
|
|
|
buf[len] = '\0';
|
|
|
|
if (strict_strtoul(buf, 0, &mask))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
common->rx_chainmask = mask;
|
|
|
|
sc->sc_ah->caps.rx_chainmask = mask;
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct file_operations fops_rx_chainmask = {
|
|
|
|
.read = read_file_rx_chainmask,
|
|
|
|
.write = write_file_rx_chainmask,
|
|
|
|
.open = ath9k_debugfs_open,
|
llseek: automatically add .llseek fop
All file_operations should get a .llseek operation so we can make
nonseekable_open the default for future file operations without a
.llseek pointer.
The three cases that we can automatically detect are no_llseek, seq_lseek
and default_llseek. For cases where we can we can automatically prove that
the file offset is always ignored, we use noop_llseek, which maintains
the current behavior of not returning an error from a seek.
New drivers should normally not use noop_llseek but instead use no_llseek
and call nonseekable_open at open time. Existing drivers can be converted
to do the same when the maintainer knows for certain that no user code
relies on calling seek on the device file.
The generated code is often incorrectly indented and right now contains
comments that clarify for each added line why a specific variant was
chosen. In the version that gets submitted upstream, the comments will
be gone and I will manually fix the indentation, because there does not
seem to be a way to do that using coccinelle.
Some amount of new code is currently sitting in linux-next that should get
the same modifications, which I will do at the end of the merge window.
Many thanks to Julia Lawall for helping me learn to write a semantic
patch that does all this.
===== begin semantic patch =====
// This adds an llseek= method to all file operations,
// as a preparation for making no_llseek the default.
//
// The rules are
// - use no_llseek explicitly if we do nonseekable_open
// - use seq_lseek for sequential files
// - use default_llseek if we know we access f_pos
// - use noop_llseek if we know we don't access f_pos,
// but we still want to allow users to call lseek
//
@ open1 exists @
identifier nested_open;
@@
nested_open(...)
{
<+...
nonseekable_open(...)
...+>
}
@ open exists@
identifier open_f;
identifier i, f;
identifier open1.nested_open;
@@
int open_f(struct inode *i, struct file *f)
{
<+...
(
nonseekable_open(...)
|
nested_open(...)
)
...+>
}
@ read disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ read_no_fpos disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
... when != off
}
@ write @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ write_no_fpos @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
... when != off
}
@ fops0 @
identifier fops;
@@
struct file_operations fops = {
...
};
@ has_llseek depends on fops0 @
identifier fops0.fops;
identifier llseek_f;
@@
struct file_operations fops = {
...
.llseek = llseek_f,
...
};
@ has_read depends on fops0 @
identifier fops0.fops;
identifier read_f;
@@
struct file_operations fops = {
...
.read = read_f,
...
};
@ has_write depends on fops0 @
identifier fops0.fops;
identifier write_f;
@@
struct file_operations fops = {
...
.write = write_f,
...
};
@ has_open depends on fops0 @
identifier fops0.fops;
identifier open_f;
@@
struct file_operations fops = {
...
.open = open_f,
...
};
// use no_llseek if we call nonseekable_open
////////////////////////////////////////////
@ nonseekable1 depends on !has_llseek && has_open @
identifier fops0.fops;
identifier nso ~= "nonseekable_open";
@@
struct file_operations fops = {
... .open = nso, ...
+.llseek = no_llseek, /* nonseekable */
};
@ nonseekable2 depends on !has_llseek @
identifier fops0.fops;
identifier open.open_f;
@@
struct file_operations fops = {
... .open = open_f, ...
+.llseek = no_llseek, /* open uses nonseekable */
};
// use seq_lseek for sequential files
/////////////////////////////////////
@ seq depends on !has_llseek @
identifier fops0.fops;
identifier sr ~= "seq_read";
@@
struct file_operations fops = {
... .read = sr, ...
+.llseek = seq_lseek, /* we have seq_read */
};
// use default_llseek if there is a readdir
///////////////////////////////////////////
@ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier readdir_e;
@@
// any other fop is used that changes pos
struct file_operations fops = {
... .readdir = readdir_e, ...
+.llseek = default_llseek, /* readdir is present */
};
// use default_llseek if at least one of read/write touches f_pos
/////////////////////////////////////////////////////////////////
@ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read.read_f;
@@
// read fops use offset
struct file_operations fops = {
... .read = read_f, ...
+.llseek = default_llseek, /* read accesses f_pos */
};
@ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write.write_f;
@@
// write fops use offset
struct file_operations fops = {
... .write = write_f, ...
+ .llseek = default_llseek, /* write accesses f_pos */
};
// Use noop_llseek if neither read nor write accesses f_pos
///////////////////////////////////////////////////////////
@ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
identifier write_no_fpos.write_f;
@@
// write fops use offset
struct file_operations fops = {
...
.write = write_f,
.read = read_f,
...
+.llseek = noop_llseek, /* read and write both use no f_pos */
};
@ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write_no_fpos.write_f;
@@
struct file_operations fops = {
... .write = write_f, ...
+.llseek = noop_llseek, /* write uses no f_pos */
};
@ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
@@
struct file_operations fops = {
... .read = read_f, ...
+.llseek = noop_llseek, /* read uses no f_pos */
};
@ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
@@
struct file_operations fops = {
...
+.llseek = noop_llseek, /* no read or write fn */
};
===== End semantic patch =====
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Julia Lawall <julia@diku.dk>
Cc: Christoph Hellwig <hch@infradead.org>
2010-08-15 16:52:59 +00:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.llseek = default_llseek,
|
2010-05-11 15:23:01 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2008-11-28 16:51:08 +00:00
|
|
|
static ssize_t read_file_dma(struct file *file, char __user *user_buf,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ath_softc *sc = file->private_data;
|
2009-02-09 07:57:12 +00:00
|
|
|
struct ath_hw *ah = sc->sc_ah;
|
2010-01-29 22:22:26 +00:00
|
|
|
char *buf;
|
|
|
|
int retval;
|
2008-11-28 16:51:08 +00:00
|
|
|
unsigned int len = 0;
|
|
|
|
u32 val[ATH9K_NUM_DMA_DEBUG_REGS];
|
|
|
|
int i, qcuOffset = 0, dcuOffset = 0;
|
|
|
|
u32 *qcuBase = &val[0], *dcuBase = &val[4];
|
|
|
|
|
2010-01-29 22:22:26 +00:00
|
|
|
buf = kmalloc(DMA_BUF_LEN, GFP_KERNEL);
|
|
|
|
if (!buf)
|
2010-05-14 13:25:39 +00:00
|
|
|
return -ENOMEM;
|
2010-01-29 22:22:26 +00:00
|
|
|
|
2009-08-26 05:41:57 +00:00
|
|
|
ath9k_ps_wakeup(sc);
|
|
|
|
|
2009-09-24 03:06:59 +00:00
|
|
|
REG_WRITE_D(ah, AR_MACMISC,
|
2008-11-28 16:51:08 +00:00
|
|
|
((AR_MACMISC_DMA_OBS_LINE_8 << AR_MACMISC_DMA_OBS_S) |
|
|
|
|
(AR_MACMISC_MISC_OBS_BUS_1 <<
|
|
|
|
AR_MACMISC_MISC_OBS_BUS_MSB_S)));
|
|
|
|
|
2010-01-29 22:22:26 +00:00
|
|
|
len += snprintf(buf + len, DMA_BUF_LEN - len,
|
2008-11-28 16:51:08 +00:00
|
|
|
"Raw DMA Debug values:\n");
|
|
|
|
|
|
|
|
for (i = 0; i < ATH9K_NUM_DMA_DEBUG_REGS; i++) {
|
|
|
|
if (i % 4 == 0)
|
2010-01-29 22:22:26 +00:00
|
|
|
len += snprintf(buf + len, DMA_BUF_LEN - len, "\n");
|
2008-11-28 16:51:08 +00:00
|
|
|
|
2009-09-24 03:06:59 +00:00
|
|
|
val[i] = REG_READ_D(ah, AR_DMADBG_0 + (i * sizeof(u32)));
|
2010-01-29 22:22:26 +00:00
|
|
|
len += snprintf(buf + len, DMA_BUF_LEN - len, "%d: %08x ",
|
2008-11-28 16:51:08 +00:00
|
|
|
i, val[i]);
|
|
|
|
}
|
|
|
|
|
2010-01-29 22:22:26 +00:00
|
|
|
len += snprintf(buf + len, DMA_BUF_LEN - len, "\n\n");
|
|
|
|
len += snprintf(buf + len, DMA_BUF_LEN - len,
|
2008-11-28 16:51:08 +00:00
|
|
|
"Num QCU: chain_st fsp_ok fsp_st DCU: chain_st\n");
|
|
|
|
|
|
|
|
for (i = 0; i < ATH9K_NUM_QUEUES; i++, qcuOffset += 4, dcuOffset += 5) {
|
|
|
|
if (i == 8) {
|
|
|
|
qcuOffset = 0;
|
|
|
|
qcuBase++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i == 6) {
|
|
|
|
dcuOffset = 0;
|
|
|
|
dcuBase++;
|
|
|
|
}
|
|
|
|
|
2010-01-29 22:22:26 +00:00
|
|
|
len += snprintf(buf + len, DMA_BUF_LEN - len,
|
2008-11-28 16:51:08 +00:00
|
|
|
"%2d %2x %1x %2x %2x\n",
|
|
|
|
i, (*qcuBase & (0x7 << qcuOffset)) >> qcuOffset,
|
|
|
|
(*qcuBase & (0x8 << qcuOffset)) >> (qcuOffset + 3),
|
|
|
|
val[2] & (0x7 << (i * 3)) >> (i * 3),
|
|
|
|
(*dcuBase & (0x1f << dcuOffset)) >> dcuOffset);
|
|
|
|
}
|
|
|
|
|
2010-01-29 22:22:26 +00:00
|
|
|
len += snprintf(buf + len, DMA_BUF_LEN - len, "\n");
|
2008-11-28 16:51:08 +00:00
|
|
|
|
2010-01-29 22:22:26 +00:00
|
|
|
len += snprintf(buf + len, DMA_BUF_LEN - len,
|
2008-11-28 16:51:08 +00:00
|
|
|
"qcu_stitch state: %2x qcu_fetch state: %2x\n",
|
|
|
|
(val[3] & 0x003c0000) >> 18, (val[3] & 0x03c00000) >> 22);
|
2010-01-29 22:22:26 +00:00
|
|
|
len += snprintf(buf + len, DMA_BUF_LEN - len,
|
2008-11-28 16:51:08 +00:00
|
|
|
"qcu_complete state: %2x dcu_complete state: %2x\n",
|
|
|
|
(val[3] & 0x1c000000) >> 26, (val[6] & 0x3));
|
2010-01-29 22:22:26 +00:00
|
|
|
len += snprintf(buf + len, DMA_BUF_LEN - len,
|
2008-11-28 16:51:08 +00:00
|
|
|
"dcu_arb state: %2x dcu_fp state: %2x\n",
|
|
|
|
(val[5] & 0x06000000) >> 25, (val[5] & 0x38000000) >> 27);
|
2010-01-29 22:22:26 +00:00
|
|
|
len += snprintf(buf + len, DMA_BUF_LEN - len,
|
2008-11-28 16:51:08 +00:00
|
|
|
"chan_idle_dur: %3d chan_idle_dur_valid: %1d\n",
|
|
|
|
(val[6] & 0x000003fc) >> 2, (val[6] & 0x00000400) >> 10);
|
2010-01-29 22:22:26 +00:00
|
|
|
len += snprintf(buf + len, DMA_BUF_LEN - len,
|
2008-11-28 16:51:08 +00:00
|
|
|
"txfifo_valid_0: %1d txfifo_valid_1: %1d\n",
|
|
|
|
(val[6] & 0x00000800) >> 11, (val[6] & 0x00001000) >> 12);
|
2010-01-29 22:22:26 +00:00
|
|
|
len += snprintf(buf + len, DMA_BUF_LEN - len,
|
2008-11-28 16:51:08 +00:00
|
|
|
"txfifo_dcu_num_0: %2d txfifo_dcu_num_1: %2d\n",
|
|
|
|
(val[6] & 0x0001e000) >> 13, (val[6] & 0x001e0000) >> 17);
|
|
|
|
|
2010-03-24 18:46:30 +00:00
|
|
|
len += snprintf(buf + len, DMA_BUF_LEN - len, "pcu observe: 0x%x\n",
|
2009-09-24 03:06:59 +00:00
|
|
|
REG_READ_D(ah, AR_OBS_BUS_1));
|
2010-01-29 22:22:26 +00:00
|
|
|
len += snprintf(buf + len, DMA_BUF_LEN - len,
|
2010-03-24 18:46:30 +00:00
|
|
|
"AR_CR: 0x%x\n", REG_READ_D(ah, AR_CR));
|
2008-11-28 16:51:08 +00:00
|
|
|
|
2009-08-26 05:41:57 +00:00
|
|
|
ath9k_ps_restore(sc);
|
|
|
|
|
2010-05-14 13:24:37 +00:00
|
|
|
if (len > DMA_BUF_LEN)
|
|
|
|
len = DMA_BUF_LEN;
|
|
|
|
|
2010-01-29 22:22:26 +00:00
|
|
|
retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
|
|
|
|
kfree(buf);
|
|
|
|
return retval;
|
2008-11-28 16:51:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static const struct file_operations fops_dma = {
|
|
|
|
.read = read_file_dma,
|
|
|
|
.open = ath9k_debugfs_open,
|
llseek: automatically add .llseek fop
All file_operations should get a .llseek operation so we can make
nonseekable_open the default for future file operations without a
.llseek pointer.
The three cases that we can automatically detect are no_llseek, seq_lseek
and default_llseek. For cases where we can we can automatically prove that
the file offset is always ignored, we use noop_llseek, which maintains
the current behavior of not returning an error from a seek.
New drivers should normally not use noop_llseek but instead use no_llseek
and call nonseekable_open at open time. Existing drivers can be converted
to do the same when the maintainer knows for certain that no user code
relies on calling seek on the device file.
The generated code is often incorrectly indented and right now contains
comments that clarify for each added line why a specific variant was
chosen. In the version that gets submitted upstream, the comments will
be gone and I will manually fix the indentation, because there does not
seem to be a way to do that using coccinelle.
Some amount of new code is currently sitting in linux-next that should get
the same modifications, which I will do at the end of the merge window.
Many thanks to Julia Lawall for helping me learn to write a semantic
patch that does all this.
===== begin semantic patch =====
// This adds an llseek= method to all file operations,
// as a preparation for making no_llseek the default.
//
// The rules are
// - use no_llseek explicitly if we do nonseekable_open
// - use seq_lseek for sequential files
// - use default_llseek if we know we access f_pos
// - use noop_llseek if we know we don't access f_pos,
// but we still want to allow users to call lseek
//
@ open1 exists @
identifier nested_open;
@@
nested_open(...)
{
<+...
nonseekable_open(...)
...+>
}
@ open exists@
identifier open_f;
identifier i, f;
identifier open1.nested_open;
@@
int open_f(struct inode *i, struct file *f)
{
<+...
(
nonseekable_open(...)
|
nested_open(...)
)
...+>
}
@ read disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ read_no_fpos disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
... when != off
}
@ write @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ write_no_fpos @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
... when != off
}
@ fops0 @
identifier fops;
@@
struct file_operations fops = {
...
};
@ has_llseek depends on fops0 @
identifier fops0.fops;
identifier llseek_f;
@@
struct file_operations fops = {
...
.llseek = llseek_f,
...
};
@ has_read depends on fops0 @
identifier fops0.fops;
identifier read_f;
@@
struct file_operations fops = {
...
.read = read_f,
...
};
@ has_write depends on fops0 @
identifier fops0.fops;
identifier write_f;
@@
struct file_operations fops = {
...
.write = write_f,
...
};
@ has_open depends on fops0 @
identifier fops0.fops;
identifier open_f;
@@
struct file_operations fops = {
...
.open = open_f,
...
};
// use no_llseek if we call nonseekable_open
////////////////////////////////////////////
@ nonseekable1 depends on !has_llseek && has_open @
identifier fops0.fops;
identifier nso ~= "nonseekable_open";
@@
struct file_operations fops = {
... .open = nso, ...
+.llseek = no_llseek, /* nonseekable */
};
@ nonseekable2 depends on !has_llseek @
identifier fops0.fops;
identifier open.open_f;
@@
struct file_operations fops = {
... .open = open_f, ...
+.llseek = no_llseek, /* open uses nonseekable */
};
// use seq_lseek for sequential files
/////////////////////////////////////
@ seq depends on !has_llseek @
identifier fops0.fops;
identifier sr ~= "seq_read";
@@
struct file_operations fops = {
... .read = sr, ...
+.llseek = seq_lseek, /* we have seq_read */
};
// use default_llseek if there is a readdir
///////////////////////////////////////////
@ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier readdir_e;
@@
// any other fop is used that changes pos
struct file_operations fops = {
... .readdir = readdir_e, ...
+.llseek = default_llseek, /* readdir is present */
};
// use default_llseek if at least one of read/write touches f_pos
/////////////////////////////////////////////////////////////////
@ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read.read_f;
@@
// read fops use offset
struct file_operations fops = {
... .read = read_f, ...
+.llseek = default_llseek, /* read accesses f_pos */
};
@ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write.write_f;
@@
// write fops use offset
struct file_operations fops = {
... .write = write_f, ...
+ .llseek = default_llseek, /* write accesses f_pos */
};
// Use noop_llseek if neither read nor write accesses f_pos
///////////////////////////////////////////////////////////
@ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
identifier write_no_fpos.write_f;
@@
// write fops use offset
struct file_operations fops = {
...
.write = write_f,
.read = read_f,
...
+.llseek = noop_llseek, /* read and write both use no f_pos */
};
@ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write_no_fpos.write_f;
@@
struct file_operations fops = {
... .write = write_f, ...
+.llseek = noop_llseek, /* write uses no f_pos */
};
@ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
@@
struct file_operations fops = {
... .read = read_f, ...
+.llseek = noop_llseek, /* read uses no f_pos */
};
@ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
@@
struct file_operations fops = {
...
+.llseek = noop_llseek, /* no read or write fn */
};
===== End semantic patch =====
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Julia Lawall <julia@diku.dk>
Cc: Christoph Hellwig <hch@infradead.org>
2010-08-15 16:52:59 +00:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.llseek = default_llseek,
|
2008-11-28 16:51:08 +00:00
|
|
|
};
|
|
|
|
|
2008-12-07 16:12:44 +00:00
|
|
|
|
|
|
|
void ath_debug_stat_interrupt(struct ath_softc *sc, enum ath9k_int status)
|
|
|
|
{
|
|
|
|
if (status)
|
2009-02-09 07:57:03 +00:00
|
|
|
sc->debug.stats.istats.total++;
|
2010-04-15 21:39:30 +00:00
|
|
|
if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
|
|
|
|
if (status & ATH9K_INT_RXLP)
|
|
|
|
sc->debug.stats.istats.rxlp++;
|
|
|
|
if (status & ATH9K_INT_RXHP)
|
|
|
|
sc->debug.stats.istats.rxhp++;
|
2010-05-13 17:33:44 +00:00
|
|
|
if (status & ATH9K_INT_BB_WATCHDOG)
|
|
|
|
sc->debug.stats.istats.bb_watchdog++;
|
2010-04-15 21:39:30 +00:00
|
|
|
} else {
|
|
|
|
if (status & ATH9K_INT_RX)
|
|
|
|
sc->debug.stats.istats.rxok++;
|
|
|
|
}
|
2008-12-07 16:12:44 +00:00
|
|
|
if (status & ATH9K_INT_RXEOL)
|
2009-02-09 07:57:03 +00:00
|
|
|
sc->debug.stats.istats.rxeol++;
|
2008-12-07 16:12:44 +00:00
|
|
|
if (status & ATH9K_INT_RXORN)
|
2009-02-09 07:57:03 +00:00
|
|
|
sc->debug.stats.istats.rxorn++;
|
2008-12-07 16:12:44 +00:00
|
|
|
if (status & ATH9K_INT_TX)
|
2009-02-09 07:57:03 +00:00
|
|
|
sc->debug.stats.istats.txok++;
|
2008-12-07 16:12:44 +00:00
|
|
|
if (status & ATH9K_INT_TXURN)
|
2009-02-09 07:57:03 +00:00
|
|
|
sc->debug.stats.istats.txurn++;
|
2008-12-07 16:12:44 +00:00
|
|
|
if (status & ATH9K_INT_MIB)
|
2009-02-09 07:57:03 +00:00
|
|
|
sc->debug.stats.istats.mib++;
|
2008-12-07 16:12:44 +00:00
|
|
|
if (status & ATH9K_INT_RXPHY)
|
2009-02-09 07:57:03 +00:00
|
|
|
sc->debug.stats.istats.rxphyerr++;
|
2008-12-07 16:12:44 +00:00
|
|
|
if (status & ATH9K_INT_RXKCM)
|
2009-02-09 07:57:03 +00:00
|
|
|
sc->debug.stats.istats.rx_keycache_miss++;
|
2008-12-07 16:12:44 +00:00
|
|
|
if (status & ATH9K_INT_SWBA)
|
2009-02-09 07:57:03 +00:00
|
|
|
sc->debug.stats.istats.swba++;
|
2008-12-07 16:12:44 +00:00
|
|
|
if (status & ATH9K_INT_BMISS)
|
2009-02-09 07:57:03 +00:00
|
|
|
sc->debug.stats.istats.bmiss++;
|
2008-12-07 16:12:44 +00:00
|
|
|
if (status & ATH9K_INT_BNR)
|
2009-02-09 07:57:03 +00:00
|
|
|
sc->debug.stats.istats.bnr++;
|
2008-12-07 16:12:44 +00:00
|
|
|
if (status & ATH9K_INT_CST)
|
2009-02-09 07:57:03 +00:00
|
|
|
sc->debug.stats.istats.cst++;
|
2008-12-07 16:12:44 +00:00
|
|
|
if (status & ATH9K_INT_GTT)
|
2009-02-09 07:57:03 +00:00
|
|
|
sc->debug.stats.istats.gtt++;
|
2008-12-07 16:12:44 +00:00
|
|
|
if (status & ATH9K_INT_TIM)
|
2009-02-09 07:57:03 +00:00
|
|
|
sc->debug.stats.istats.tim++;
|
2008-12-07 16:12:44 +00:00
|
|
|
if (status & ATH9K_INT_CABEND)
|
2009-02-09 07:57:03 +00:00
|
|
|
sc->debug.stats.istats.cabend++;
|
2008-12-07 16:12:44 +00:00
|
|
|
if (status & ATH9K_INT_DTIMSYNC)
|
2009-02-09 07:57:03 +00:00
|
|
|
sc->debug.stats.istats.dtimsync++;
|
2008-12-07 16:12:44 +00:00
|
|
|
if (status & ATH9K_INT_DTIM)
|
2009-02-09 07:57:03 +00:00
|
|
|
sc->debug.stats.istats.dtim++;
|
2008-12-07 16:12:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ath_softc *sc = file->private_data;
|
|
|
|
char buf[512];
|
|
|
|
unsigned int len = 0;
|
|
|
|
|
2010-04-15 21:39:30 +00:00
|
|
|
if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
|
|
|
"%8s: %10u\n", "RXLP", sc->debug.stats.istats.rxlp);
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
|
|
|
"%8s: %10u\n", "RXHP", sc->debug.stats.istats.rxhp);
|
2010-05-13 17:33:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
|
|
|
"%8s: %10u\n", "WATCHDOG",
|
|
|
|
sc->debug.stats.istats.bb_watchdog);
|
2010-04-15 21:39:30 +00:00
|
|
|
} else {
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
|
|
|
"%8s: %10u\n", "RX", sc->debug.stats.istats.rxok);
|
|
|
|
}
|
2008-12-07 16:12:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2009-02-09 07:57:03 +00:00
|
|
|
"%8s: %10u\n", "RXEOL", sc->debug.stats.istats.rxeol);
|
2008-12-07 16:12:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2009-02-09 07:57:03 +00:00
|
|
|
"%8s: %10u\n", "RXORN", sc->debug.stats.istats.rxorn);
|
2008-12-07 16:12:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2009-02-09 07:57:03 +00:00
|
|
|
"%8s: %10u\n", "TX", sc->debug.stats.istats.txok);
|
2008-12-07 16:12:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2009-02-09 07:57:03 +00:00
|
|
|
"%8s: %10u\n", "TXURN", sc->debug.stats.istats.txurn);
|
2008-12-07 16:12:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2009-02-09 07:57:03 +00:00
|
|
|
"%8s: %10u\n", "MIB", sc->debug.stats.istats.mib);
|
2008-12-07 16:12:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2009-02-09 07:57:03 +00:00
|
|
|
"%8s: %10u\n", "RXPHY", sc->debug.stats.istats.rxphyerr);
|
2008-12-07 16:12:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2009-02-09 07:57:03 +00:00
|
|
|
"%8s: %10u\n", "RXKCM", sc->debug.stats.istats.rx_keycache_miss);
|
2008-12-07 16:12:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2009-02-09 07:57:03 +00:00
|
|
|
"%8s: %10u\n", "SWBA", sc->debug.stats.istats.swba);
|
2008-12-07 16:12:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2009-02-09 07:57:03 +00:00
|
|
|
"%8s: %10u\n", "BMISS", sc->debug.stats.istats.bmiss);
|
2008-12-07 16:12:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2009-02-09 07:57:03 +00:00
|
|
|
"%8s: %10u\n", "BNR", sc->debug.stats.istats.bnr);
|
2008-12-07 16:12:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2009-02-09 07:57:03 +00:00
|
|
|
"%8s: %10u\n", "CST", sc->debug.stats.istats.cst);
|
2008-12-07 16:12:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2009-02-09 07:57:03 +00:00
|
|
|
"%8s: %10u\n", "GTT", sc->debug.stats.istats.gtt);
|
2008-12-07 16:12:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2009-02-09 07:57:03 +00:00
|
|
|
"%8s: %10u\n", "TIM", sc->debug.stats.istats.tim);
|
2008-12-07 16:12:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2009-02-09 07:57:03 +00:00
|
|
|
"%8s: %10u\n", "CABEND", sc->debug.stats.istats.cabend);
|
2008-12-07 16:12:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2009-02-09 07:57:03 +00:00
|
|
|
"%8s: %10u\n", "DTIMSYNC", sc->debug.stats.istats.dtimsync);
|
2008-12-07 16:12:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2009-02-09 07:57:03 +00:00
|
|
|
"%8s: %10u\n", "DTIM", sc->debug.stats.istats.dtim);
|
2008-12-07 16:12:44 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2009-02-09 07:57:03 +00:00
|
|
|
"%8s: %10u\n", "TOTAL", sc->debug.stats.istats.total);
|
2008-12-07 16:12:44 +00:00
|
|
|
|
2010-05-14 13:24:37 +00:00
|
|
|
if (len > sizeof(buf))
|
|
|
|
len = sizeof(buf);
|
|
|
|
|
2008-12-07 16:12:44 +00:00
|
|
|
return simple_read_from_buffer(user_buf, count, ppos, buf, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct file_operations fops_interrupt = {
|
|
|
|
.read = read_file_interrupt,
|
|
|
|
.open = ath9k_debugfs_open,
|
llseek: automatically add .llseek fop
All file_operations should get a .llseek operation so we can make
nonseekable_open the default for future file operations without a
.llseek pointer.
The three cases that we can automatically detect are no_llseek, seq_lseek
and default_llseek. For cases where we can we can automatically prove that
the file offset is always ignored, we use noop_llseek, which maintains
the current behavior of not returning an error from a seek.
New drivers should normally not use noop_llseek but instead use no_llseek
and call nonseekable_open at open time. Existing drivers can be converted
to do the same when the maintainer knows for certain that no user code
relies on calling seek on the device file.
The generated code is often incorrectly indented and right now contains
comments that clarify for each added line why a specific variant was
chosen. In the version that gets submitted upstream, the comments will
be gone and I will manually fix the indentation, because there does not
seem to be a way to do that using coccinelle.
Some amount of new code is currently sitting in linux-next that should get
the same modifications, which I will do at the end of the merge window.
Many thanks to Julia Lawall for helping me learn to write a semantic
patch that does all this.
===== begin semantic patch =====
// This adds an llseek= method to all file operations,
// as a preparation for making no_llseek the default.
//
// The rules are
// - use no_llseek explicitly if we do nonseekable_open
// - use seq_lseek for sequential files
// - use default_llseek if we know we access f_pos
// - use noop_llseek if we know we don't access f_pos,
// but we still want to allow users to call lseek
//
@ open1 exists @
identifier nested_open;
@@
nested_open(...)
{
<+...
nonseekable_open(...)
...+>
}
@ open exists@
identifier open_f;
identifier i, f;
identifier open1.nested_open;
@@
int open_f(struct inode *i, struct file *f)
{
<+...
(
nonseekable_open(...)
|
nested_open(...)
)
...+>
}
@ read disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ read_no_fpos disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
... when != off
}
@ write @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ write_no_fpos @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
... when != off
}
@ fops0 @
identifier fops;
@@
struct file_operations fops = {
...
};
@ has_llseek depends on fops0 @
identifier fops0.fops;
identifier llseek_f;
@@
struct file_operations fops = {
...
.llseek = llseek_f,
...
};
@ has_read depends on fops0 @
identifier fops0.fops;
identifier read_f;
@@
struct file_operations fops = {
...
.read = read_f,
...
};
@ has_write depends on fops0 @
identifier fops0.fops;
identifier write_f;
@@
struct file_operations fops = {
...
.write = write_f,
...
};
@ has_open depends on fops0 @
identifier fops0.fops;
identifier open_f;
@@
struct file_operations fops = {
...
.open = open_f,
...
};
// use no_llseek if we call nonseekable_open
////////////////////////////////////////////
@ nonseekable1 depends on !has_llseek && has_open @
identifier fops0.fops;
identifier nso ~= "nonseekable_open";
@@
struct file_operations fops = {
... .open = nso, ...
+.llseek = no_llseek, /* nonseekable */
};
@ nonseekable2 depends on !has_llseek @
identifier fops0.fops;
identifier open.open_f;
@@
struct file_operations fops = {
... .open = open_f, ...
+.llseek = no_llseek, /* open uses nonseekable */
};
// use seq_lseek for sequential files
/////////////////////////////////////
@ seq depends on !has_llseek @
identifier fops0.fops;
identifier sr ~= "seq_read";
@@
struct file_operations fops = {
... .read = sr, ...
+.llseek = seq_lseek, /* we have seq_read */
};
// use default_llseek if there is a readdir
///////////////////////////////////////////
@ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier readdir_e;
@@
// any other fop is used that changes pos
struct file_operations fops = {
... .readdir = readdir_e, ...
+.llseek = default_llseek, /* readdir is present */
};
// use default_llseek if at least one of read/write touches f_pos
/////////////////////////////////////////////////////////////////
@ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read.read_f;
@@
// read fops use offset
struct file_operations fops = {
... .read = read_f, ...
+.llseek = default_llseek, /* read accesses f_pos */
};
@ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write.write_f;
@@
// write fops use offset
struct file_operations fops = {
... .write = write_f, ...
+ .llseek = default_llseek, /* write accesses f_pos */
};
// Use noop_llseek if neither read nor write accesses f_pos
///////////////////////////////////////////////////////////
@ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
identifier write_no_fpos.write_f;
@@
// write fops use offset
struct file_operations fops = {
...
.write = write_f,
.read = read_f,
...
+.llseek = noop_llseek, /* read and write both use no f_pos */
};
@ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write_no_fpos.write_f;
@@
struct file_operations fops = {
... .write = write_f, ...
+.llseek = noop_llseek, /* write uses no f_pos */
};
@ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
@@
struct file_operations fops = {
... .read = read_f, ...
+.llseek = noop_llseek, /* read uses no f_pos */
};
@ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
@@
struct file_operations fops = {
...
+.llseek = noop_llseek, /* no read or write fn */
};
===== End semantic patch =====
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Julia Lawall <julia@diku.dk>
Cc: Christoph Hellwig <hch@infradead.org>
2010-08-15 16:52:59 +00:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.llseek = default_llseek,
|
2008-12-07 16:12:44 +00:00
|
|
|
};
|
|
|
|
|
2009-03-03 17:23:40 +00:00
|
|
|
static const char * ath_wiphy_state_str(enum ath_wiphy_state state)
|
|
|
|
{
|
|
|
|
switch (state) {
|
|
|
|
case ATH_WIPHY_INACTIVE:
|
|
|
|
return "INACTIVE";
|
|
|
|
case ATH_WIPHY_ACTIVE:
|
|
|
|
return "ACTIVE";
|
|
|
|
case ATH_WIPHY_PAUSING:
|
|
|
|
return "PAUSING";
|
|
|
|
case ATH_WIPHY_PAUSED:
|
|
|
|
return "PAUSED";
|
|
|
|
case ATH_WIPHY_SCAN:
|
|
|
|
return "SCAN";
|
|
|
|
}
|
|
|
|
return "?";
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t read_file_wiphy(struct file *file, char __user *user_buf,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ath_softc *sc = file->private_data;
|
2010-10-01 09:55:05 +00:00
|
|
|
struct ath_wiphy *aphy = sc->pri_wiphy;
|
|
|
|
struct ieee80211_channel *chan = aphy->hw->conf.channel;
|
2009-03-03 17:23:40 +00:00
|
|
|
char buf[512];
|
|
|
|
unsigned int len = 0;
|
|
|
|
int i;
|
|
|
|
u8 addr[ETH_ALEN];
|
2010-09-14 19:46:04 +00:00
|
|
|
u32 tmp;
|
2009-03-03 17:23:40 +00:00
|
|
|
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
|
|
|
"primary: %s (%s chan=%d ht=%d)\n",
|
|
|
|
wiphy_name(sc->pri_wiphy->hw->wiphy),
|
|
|
|
ath_wiphy_state_str(sc->pri_wiphy->state),
|
2010-10-01 09:55:05 +00:00
|
|
|
ieee80211_frequency_to_channel(chan->center_freq),
|
|
|
|
aphy->chan_is_ht);
|
2009-03-03 17:23:40 +00:00
|
|
|
|
2009-09-24 03:06:59 +00:00
|
|
|
put_unaligned_le32(REG_READ_D(sc->sc_ah, AR_STA_ID0), addr);
|
|
|
|
put_unaligned_le16(REG_READ_D(sc->sc_ah, AR_STA_ID1) & 0xffff, addr + 4);
|
2009-03-03 17:23:40 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
|
|
|
"addr: %pM\n", addr);
|
2009-09-24 03:06:59 +00:00
|
|
|
put_unaligned_le32(REG_READ_D(sc->sc_ah, AR_BSSMSKL), addr);
|
|
|
|
put_unaligned_le16(REG_READ_D(sc->sc_ah, AR_BSSMSKU) & 0xffff, addr + 4);
|
2009-03-03 17:23:40 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
|
|
|
"addrmask: %pM\n", addr);
|
2010-09-14 19:46:04 +00:00
|
|
|
tmp = ath9k_hw_getrxfilter(sc->sc_ah);
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
|
|
|
"rfilt: 0x%x", tmp);
|
|
|
|
if (tmp & ATH9K_RX_FILTER_UCAST)
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len, " UCAST");
|
|
|
|
if (tmp & ATH9K_RX_FILTER_MCAST)
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len, " MCAST");
|
|
|
|
if (tmp & ATH9K_RX_FILTER_BCAST)
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len, " BCAST");
|
|
|
|
if (tmp & ATH9K_RX_FILTER_CONTROL)
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len, " CONTROL");
|
|
|
|
if (tmp & ATH9K_RX_FILTER_BEACON)
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len, " BEACON");
|
|
|
|
if (tmp & ATH9K_RX_FILTER_PROM)
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len, " PROM");
|
|
|
|
if (tmp & ATH9K_RX_FILTER_PROBEREQ)
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len, " PROBEREQ");
|
|
|
|
if (tmp & ATH9K_RX_FILTER_PHYERR)
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len, " PHYERR");
|
|
|
|
if (tmp & ATH9K_RX_FILTER_MYBEACON)
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len, " MYBEACON");
|
|
|
|
if (tmp & ATH9K_RX_FILTER_COMP_BAR)
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len, " COMP_BAR");
|
|
|
|
if (tmp & ATH9K_RX_FILTER_PSPOLL)
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len, " PSPOLL");
|
|
|
|
if (tmp & ATH9K_RX_FILTER_PHYRADAR)
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len, " PHYRADAR");
|
|
|
|
if (tmp & ATH9K_RX_FILTER_MCAST_BCAST_ALL)
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len, " MCAST_BCAST_ALL\n");
|
|
|
|
else
|
|
|
|
len += snprintf(buf + len, sizeof(buf) - len, "\n");
|
|
|
|
|
|
|
|
/* Put variable-length stuff down here, and check for overflows. */
|
2009-03-03 17:23:40 +00:00
|
|
|
for (i = 0; i < sc->num_sec_wiphy; i++) {
|
2010-10-15 20:27:49 +00:00
|
|
|
struct ath_wiphy *aphy_tmp = sc->sec_wiphy[i];
|
|
|
|
if (aphy_tmp == NULL)
|
2009-03-03 17:23:40 +00:00
|
|
|
continue;
|
2010-10-15 20:27:49 +00:00
|
|
|
chan = aphy_tmp->hw->conf.channel;
|
2009-03-03 17:23:40 +00:00
|
|
|
len += snprintf(buf + len, sizeof(buf) - len,
|
2010-10-01 09:55:05 +00:00
|
|
|
"secondary: %s (%s chan=%d ht=%d)\n",
|
2010-10-15 20:27:49 +00:00
|
|
|
wiphy_name(aphy_tmp->hw->wiphy),
|
|
|
|
ath_wiphy_state_str(aphy_tmp->state),
|
2010-10-01 09:55:05 +00:00
|
|
|
ieee80211_frequency_to_channel(chan->center_freq),
|
2010-10-15 20:27:49 +00:00
|
|
|
aphy_tmp->chan_is_ht);
|
2009-03-03 17:23:40 +00:00
|
|
|
}
|
2010-05-14 13:24:37 +00:00
|
|
|
if (len > sizeof(buf))
|
|
|
|
len = sizeof(buf);
|
|
|
|
|
2009-03-03 17:23:40 +00:00
|
|
|
return simple_read_from_buffer(user_buf, count, ppos, buf, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ath_wiphy * get_wiphy(struct ath_softc *sc, const char *name)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
if (strcmp(name, wiphy_name(sc->pri_wiphy->hw->wiphy)) == 0)
|
|
|
|
return sc->pri_wiphy;
|
|
|
|
for (i = 0; i < sc->num_sec_wiphy; i++) {
|
|
|
|
struct ath_wiphy *aphy = sc->sec_wiphy[i];
|
|
|
|
if (aphy && strcmp(name, wiphy_name(aphy->hw->wiphy)) == 0)
|
|
|
|
return aphy;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int del_wiphy(struct ath_softc *sc, const char *name)
|
|
|
|
{
|
|
|
|
struct ath_wiphy *aphy = get_wiphy(sc, name);
|
|
|
|
if (!aphy)
|
|
|
|
return -ENOENT;
|
|
|
|
return ath9k_wiphy_del(aphy);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int pause_wiphy(struct ath_softc *sc, const char *name)
|
|
|
|
{
|
|
|
|
struct ath_wiphy *aphy = get_wiphy(sc, name);
|
|
|
|
if (!aphy)
|
|
|
|
return -ENOENT;
|
|
|
|
return ath9k_wiphy_pause(aphy);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int unpause_wiphy(struct ath_softc *sc, const char *name)
|
|
|
|
{
|
|
|
|
struct ath_wiphy *aphy = get_wiphy(sc, name);
|
|
|
|
if (!aphy)
|
|
|
|
return -ENOENT;
|
|
|
|
return ath9k_wiphy_unpause(aphy);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int select_wiphy(struct ath_softc *sc, const char *name)
|
|
|
|
{
|
|
|
|
struct ath_wiphy *aphy = get_wiphy(sc, name);
|
|
|
|
if (!aphy)
|
|
|
|
return -ENOENT;
|
|
|
|
return ath9k_wiphy_select(aphy);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int schedule_wiphy(struct ath_softc *sc, const char *msec)
|
|
|
|
{
|
|
|
|
ath9k_wiphy_set_scheduler(sc, simple_strtoul(msec, NULL, 0));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t write_file_wiphy(struct file *file, const char __user *user_buf,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ath_softc *sc = file->private_data;
|
|
|
|
char buf[50];
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
len = min(count, sizeof(buf) - 1);
|
|
|
|
if (copy_from_user(buf, user_buf, len))
|
|
|
|
return -EFAULT;
|
|
|
|
buf[len] = '\0';
|
|
|
|
if (len > 0 && buf[len - 1] == '\n')
|
|
|
|
buf[len - 1] = '\0';
|
|
|
|
|
|
|
|
if (strncmp(buf, "add", 3) == 0) {
|
|
|
|
int res = ath9k_wiphy_add(sc);
|
|
|
|
if (res < 0)
|
|
|
|
return res;
|
|
|
|
} else if (strncmp(buf, "del=", 4) == 0) {
|
|
|
|
int res = del_wiphy(sc, buf + 4);
|
|
|
|
if (res < 0)
|
|
|
|
return res;
|
|
|
|
} else if (strncmp(buf, "pause=", 6) == 0) {
|
|
|
|
int res = pause_wiphy(sc, buf + 6);
|
|
|
|
if (res < 0)
|
|
|
|
return res;
|
|
|
|
} else if (strncmp(buf, "unpause=", 8) == 0) {
|
|
|
|
int res = unpause_wiphy(sc, buf + 8);
|
|
|
|
if (res < 0)
|
|
|
|
return res;
|
|
|
|
} else if (strncmp(buf, "select=", 7) == 0) {
|
|
|
|
int res = select_wiphy(sc, buf + 7);
|
|
|
|
if (res < 0)
|
|
|
|
return res;
|
|
|
|
} else if (strncmp(buf, "schedule=", 9) == 0) {
|
|
|
|
int res = schedule_wiphy(sc, buf + 9);
|
|
|
|
if (res < 0)
|
|
|
|
return res;
|
|
|
|
} else
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct file_operations fops_wiphy = {
|
|
|
|
.read = read_file_wiphy,
|
|
|
|
.write = write_file_wiphy,
|
|
|
|
.open = ath9k_debugfs_open,
|
llseek: automatically add .llseek fop
All file_operations should get a .llseek operation so we can make
nonseekable_open the default for future file operations without a
.llseek pointer.
The three cases that we can automatically detect are no_llseek, seq_lseek
and default_llseek. For cases where we can we can automatically prove that
the file offset is always ignored, we use noop_llseek, which maintains
the current behavior of not returning an error from a seek.
New drivers should normally not use noop_llseek but instead use no_llseek
and call nonseekable_open at open time. Existing drivers can be converted
to do the same when the maintainer knows for certain that no user code
relies on calling seek on the device file.
The generated code is often incorrectly indented and right now contains
comments that clarify for each added line why a specific variant was
chosen. In the version that gets submitted upstream, the comments will
be gone and I will manually fix the indentation, because there does not
seem to be a way to do that using coccinelle.
Some amount of new code is currently sitting in linux-next that should get
the same modifications, which I will do at the end of the merge window.
Many thanks to Julia Lawall for helping me learn to write a semantic
patch that does all this.
===== begin semantic patch =====
// This adds an llseek= method to all file operations,
// as a preparation for making no_llseek the default.
//
// The rules are
// - use no_llseek explicitly if we do nonseekable_open
// - use seq_lseek for sequential files
// - use default_llseek if we know we access f_pos
// - use noop_llseek if we know we don't access f_pos,
// but we still want to allow users to call lseek
//
@ open1 exists @
identifier nested_open;
@@
nested_open(...)
{
<+...
nonseekable_open(...)
...+>
}
@ open exists@
identifier open_f;
identifier i, f;
identifier open1.nested_open;
@@
int open_f(struct inode *i, struct file *f)
{
<+...
(
nonseekable_open(...)
|
nested_open(...)
)
...+>
}
@ read disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ read_no_fpos disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
... when != off
}
@ write @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ write_no_fpos @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
... when != off
}
@ fops0 @
identifier fops;
@@
struct file_operations fops = {
...
};
@ has_llseek depends on fops0 @
identifier fops0.fops;
identifier llseek_f;
@@
struct file_operations fops = {
...
.llseek = llseek_f,
...
};
@ has_read depends on fops0 @
identifier fops0.fops;
identifier read_f;
@@
struct file_operations fops = {
...
.read = read_f,
...
};
@ has_write depends on fops0 @
identifier fops0.fops;
identifier write_f;
@@
struct file_operations fops = {
...
.write = write_f,
...
};
@ has_open depends on fops0 @
identifier fops0.fops;
identifier open_f;
@@
struct file_operations fops = {
...
.open = open_f,
...
};
// use no_llseek if we call nonseekable_open
////////////////////////////////////////////
@ nonseekable1 depends on !has_llseek && has_open @
identifier fops0.fops;
identifier nso ~= "nonseekable_open";
@@
struct file_operations fops = {
... .open = nso, ...
+.llseek = no_llseek, /* nonseekable */
};
@ nonseekable2 depends on !has_llseek @
identifier fops0.fops;
identifier open.open_f;
@@
struct file_operations fops = {
... .open = open_f, ...
+.llseek = no_llseek, /* open uses nonseekable */
};
// use seq_lseek for sequential files
/////////////////////////////////////
@ seq depends on !has_llseek @
identifier fops0.fops;
identifier sr ~= "seq_read";
@@
struct file_operations fops = {
... .read = sr, ...
+.llseek = seq_lseek, /* we have seq_read */
};
// use default_llseek if there is a readdir
///////////////////////////////////////////
@ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier readdir_e;
@@
// any other fop is used that changes pos
struct file_operations fops = {
... .readdir = readdir_e, ...
+.llseek = default_llseek, /* readdir is present */
};
// use default_llseek if at least one of read/write touches f_pos
/////////////////////////////////////////////////////////////////
@ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read.read_f;
@@
// read fops use offset
struct file_operations fops = {
... .read = read_f, ...
+.llseek = default_llseek, /* read accesses f_pos */
};
@ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write.write_f;
@@
// write fops use offset
struct file_operations fops = {
... .write = write_f, ...
+ .llseek = default_llseek, /* write accesses f_pos */
};
// Use noop_llseek if neither read nor write accesses f_pos
///////////////////////////////////////////////////////////
@ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
identifier write_no_fpos.write_f;
@@
// write fops use offset
struct file_operations fops = {
...
.write = write_f,
.read = read_f,
...
+.llseek = noop_llseek, /* read and write both use no f_pos */
};
@ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write_no_fpos.write_f;
@@
struct file_operations fops = {
... .write = write_f, ...
+.llseek = noop_llseek, /* write uses no f_pos */
};
@ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
@@
struct file_operations fops = {
... .read = read_f, ...
+.llseek = noop_llseek, /* read uses no f_pos */
};
@ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
@@
struct file_operations fops = {
...
+.llseek = noop_llseek, /* no read or write fn */
};
===== End semantic patch =====
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Julia Lawall <julia@diku.dk>
Cc: Christoph Hellwig <hch@infradead.org>
2010-08-15 16:52:59 +00:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.llseek = default_llseek,
|
2009-03-03 17:23:40 +00:00
|
|
|
};
|
|
|
|
|
2009-07-27 06:38:16 +00:00
|
|
|
#define PR(str, elem) \
|
|
|
|
do { \
|
|
|
|
len += snprintf(buf + len, size - len, \
|
|
|
|
"%s%13u%11u%10u%10u\n", str, \
|
2010-11-07 13:59:39 +00:00
|
|
|
sc->debug.stats.txstats[WME_AC_BE].elem, \
|
|
|
|
sc->debug.stats.txstats[WME_AC_BK].elem, \
|
|
|
|
sc->debug.stats.txstats[WME_AC_VI].elem, \
|
|
|
|
sc->debug.stats.txstats[WME_AC_VO].elem); \
|
2009-07-27 06:38:16 +00:00
|
|
|
} while(0)
|
|
|
|
|
|
|
|
static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ath_softc *sc = file->private_data;
|
|
|
|
char *buf;
|
|
|
|
unsigned int len = 0, size = 2048;
|
|
|
|
ssize_t retval = 0;
|
|
|
|
|
|
|
|
buf = kzalloc(size, GFP_KERNEL);
|
|
|
|
if (buf == NULL)
|
2010-05-14 13:25:39 +00:00
|
|
|
return -ENOMEM;
|
2009-07-27 06:38:16 +00:00
|
|
|
|
|
|
|
len += sprintf(buf, "%30s %10s%10s%10s\n\n", "BE", "BK", "VI", "VO");
|
|
|
|
|
|
|
|
PR("MPDUs Queued: ", queued);
|
|
|
|
PR("MPDUs Completed: ", completed);
|
|
|
|
PR("Aggregates: ", a_aggr);
|
|
|
|
PR("AMPDUs Queued: ", a_queued);
|
|
|
|
PR("AMPDUs Completed:", a_completed);
|
|
|
|
PR("AMPDUs Retried: ", a_retries);
|
|
|
|
PR("AMPDUs XRetried: ", a_xretries);
|
|
|
|
PR("FIFO Underrun: ", fifo_underrun);
|
|
|
|
PR("TXOP Exceeded: ", xtxop);
|
|
|
|
PR("TXTIMER Expiry: ", timer_exp);
|
|
|
|
PR("DESC CFG Error: ", desc_cfg_err);
|
|
|
|
PR("DATA Underrun: ", data_underrun);
|
|
|
|
PR("DELIM Underrun: ", delim_underrun);
|
2010-10-01 19:26:30 +00:00
|
|
|
PR("TX-Pkts-All: ", tx_pkts_all);
|
|
|
|
PR("TX-Bytes-All: ", tx_bytes_all);
|
2009-07-27 06:38:16 +00:00
|
|
|
|
2010-05-14 13:24:37 +00:00
|
|
|
if (len > size)
|
|
|
|
len = size;
|
|
|
|
|
2009-07-27 06:38:16 +00:00
|
|
|
retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
|
|
|
|
kfree(buf);
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2010-11-07 13:59:39 +00:00
|
|
|
void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,
|
|
|
|
struct ath_tx_status *ts)
|
2009-07-27 06:38:16 +00:00
|
|
|
{
|
2010-11-07 13:59:39 +00:00
|
|
|
int qnum = skb_get_queue_mapping(bf->bf_mpdu);
|
|
|
|
|
|
|
|
TX_STAT_INC(qnum, tx_pkts_all);
|
|
|
|
sc->debug.stats.txstats[qnum].tx_bytes_all += bf->bf_mpdu->len;
|
2010-10-01 19:26:30 +00:00
|
|
|
|
2009-07-27 06:38:16 +00:00
|
|
|
if (bf_isampdu(bf)) {
|
|
|
|
if (bf_isxretried(bf))
|
2010-11-07 13:59:39 +00:00
|
|
|
TX_STAT_INC(qnum, a_xretries);
|
2009-07-27 06:38:16 +00:00
|
|
|
else
|
2010-11-07 13:59:39 +00:00
|
|
|
TX_STAT_INC(qnum, a_completed);
|
2009-07-27 06:38:16 +00:00
|
|
|
} else {
|
2010-11-07 13:59:39 +00:00
|
|
|
TX_STAT_INC(qnum, completed);
|
2009-07-27 06:38:16 +00:00
|
|
|
}
|
|
|
|
|
2010-03-30 03:07:11 +00:00
|
|
|
if (ts->ts_status & ATH9K_TXERR_FIFO)
|
2010-11-07 13:59:39 +00:00
|
|
|
TX_STAT_INC(qnum, fifo_underrun);
|
2010-03-30 03:07:11 +00:00
|
|
|
if (ts->ts_status & ATH9K_TXERR_XTXOP)
|
2010-11-07 13:59:39 +00:00
|
|
|
TX_STAT_INC(qnum, xtxop);
|
2010-03-30 03:07:11 +00:00
|
|
|
if (ts->ts_status & ATH9K_TXERR_TIMER_EXPIRED)
|
2010-11-07 13:59:39 +00:00
|
|
|
TX_STAT_INC(qnum, timer_exp);
|
2010-03-30 03:07:11 +00:00
|
|
|
if (ts->ts_flags & ATH9K_TX_DESC_CFG_ERR)
|
2010-11-07 13:59:39 +00:00
|
|
|
TX_STAT_INC(qnum, desc_cfg_err);
|
2010-03-30 03:07:11 +00:00
|
|
|
if (ts->ts_flags & ATH9K_TX_DATA_UNDERRUN)
|
2010-11-07 13:59:39 +00:00
|
|
|
TX_STAT_INC(qnum, data_underrun);
|
2010-03-30 03:07:11 +00:00
|
|
|
if (ts->ts_flags & ATH9K_TX_DELIM_UNDERRUN)
|
2010-11-07 13:59:39 +00:00
|
|
|
TX_STAT_INC(qnum, delim_underrun);
|
2009-07-27 06:38:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static const struct file_operations fops_xmit = {
|
|
|
|
.read = read_file_xmit,
|
|
|
|
.open = ath9k_debugfs_open,
|
llseek: automatically add .llseek fop
All file_operations should get a .llseek operation so we can make
nonseekable_open the default for future file operations without a
.llseek pointer.
The three cases that we can automatically detect are no_llseek, seq_lseek
and default_llseek. For cases where we can we can automatically prove that
the file offset is always ignored, we use noop_llseek, which maintains
the current behavior of not returning an error from a seek.
New drivers should normally not use noop_llseek but instead use no_llseek
and call nonseekable_open at open time. Existing drivers can be converted
to do the same when the maintainer knows for certain that no user code
relies on calling seek on the device file.
The generated code is often incorrectly indented and right now contains
comments that clarify for each added line why a specific variant was
chosen. In the version that gets submitted upstream, the comments will
be gone and I will manually fix the indentation, because there does not
seem to be a way to do that using coccinelle.
Some amount of new code is currently sitting in linux-next that should get
the same modifications, which I will do at the end of the merge window.
Many thanks to Julia Lawall for helping me learn to write a semantic
patch that does all this.
===== begin semantic patch =====
// This adds an llseek= method to all file operations,
// as a preparation for making no_llseek the default.
//
// The rules are
// - use no_llseek explicitly if we do nonseekable_open
// - use seq_lseek for sequential files
// - use default_llseek if we know we access f_pos
// - use noop_llseek if we know we don't access f_pos,
// but we still want to allow users to call lseek
//
@ open1 exists @
identifier nested_open;
@@
nested_open(...)
{
<+...
nonseekable_open(...)
...+>
}
@ open exists@
identifier open_f;
identifier i, f;
identifier open1.nested_open;
@@
int open_f(struct inode *i, struct file *f)
{
<+...
(
nonseekable_open(...)
|
nested_open(...)
)
...+>
}
@ read disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ read_no_fpos disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
... when != off
}
@ write @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ write_no_fpos @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
... when != off
}
@ fops0 @
identifier fops;
@@
struct file_operations fops = {
...
};
@ has_llseek depends on fops0 @
identifier fops0.fops;
identifier llseek_f;
@@
struct file_operations fops = {
...
.llseek = llseek_f,
...
};
@ has_read depends on fops0 @
identifier fops0.fops;
identifier read_f;
@@
struct file_operations fops = {
...
.read = read_f,
...
};
@ has_write depends on fops0 @
identifier fops0.fops;
identifier write_f;
@@
struct file_operations fops = {
...
.write = write_f,
...
};
@ has_open depends on fops0 @
identifier fops0.fops;
identifier open_f;
@@
struct file_operations fops = {
...
.open = open_f,
...
};
// use no_llseek if we call nonseekable_open
////////////////////////////////////////////
@ nonseekable1 depends on !has_llseek && has_open @
identifier fops0.fops;
identifier nso ~= "nonseekable_open";
@@
struct file_operations fops = {
... .open = nso, ...
+.llseek = no_llseek, /* nonseekable */
};
@ nonseekable2 depends on !has_llseek @
identifier fops0.fops;
identifier open.open_f;
@@
struct file_operations fops = {
... .open = open_f, ...
+.llseek = no_llseek, /* open uses nonseekable */
};
// use seq_lseek for sequential files
/////////////////////////////////////
@ seq depends on !has_llseek @
identifier fops0.fops;
identifier sr ~= "seq_read";
@@
struct file_operations fops = {
... .read = sr, ...
+.llseek = seq_lseek, /* we have seq_read */
};
// use default_llseek if there is a readdir
///////////////////////////////////////////
@ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier readdir_e;
@@
// any other fop is used that changes pos
struct file_operations fops = {
... .readdir = readdir_e, ...
+.llseek = default_llseek, /* readdir is present */
};
// use default_llseek if at least one of read/write touches f_pos
/////////////////////////////////////////////////////////////////
@ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read.read_f;
@@
// read fops use offset
struct file_operations fops = {
... .read = read_f, ...
+.llseek = default_llseek, /* read accesses f_pos */
};
@ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write.write_f;
@@
// write fops use offset
struct file_operations fops = {
... .write = write_f, ...
+ .llseek = default_llseek, /* write accesses f_pos */
};
// Use noop_llseek if neither read nor write accesses f_pos
///////////////////////////////////////////////////////////
@ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
identifier write_no_fpos.write_f;
@@
// write fops use offset
struct file_operations fops = {
...
.write = write_f,
.read = read_f,
...
+.llseek = noop_llseek, /* read and write both use no f_pos */
};
@ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write_no_fpos.write_f;
@@
struct file_operations fops = {
... .write = write_f, ...
+.llseek = noop_llseek, /* write uses no f_pos */
};
@ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
@@
struct file_operations fops = {
... .read = read_f, ...
+.llseek = noop_llseek, /* read uses no f_pos */
};
@ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
@@
struct file_operations fops = {
...
+.llseek = noop_llseek, /* no read or write fn */
};
===== End semantic patch =====
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Julia Lawall <julia@diku.dk>
Cc: Christoph Hellwig <hch@infradead.org>
2010-08-15 16:52:59 +00:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.llseek = default_llseek,
|
2009-07-27 06:38:16 +00:00
|
|
|
};
|
2009-03-03 17:23:40 +00:00
|
|
|
|
2010-01-08 05:06:11 +00:00
|
|
|
static ssize_t read_file_recv(struct file *file, char __user *user_buf,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
#define PHY_ERR(s, p) \
|
|
|
|
len += snprintf(buf + len, size - len, "%18s : %10u\n", s, \
|
|
|
|
sc->debug.stats.rxstats.phy_err_stats[p]);
|
|
|
|
|
|
|
|
struct ath_softc *sc = file->private_data;
|
|
|
|
char *buf;
|
|
|
|
unsigned int len = 0, size = 1152;
|
|
|
|
ssize_t retval = 0;
|
|
|
|
|
|
|
|
buf = kzalloc(size, GFP_KERNEL);
|
|
|
|
if (buf == NULL)
|
2010-05-14 13:25:39 +00:00
|
|
|
return -ENOMEM;
|
2010-01-08 05:06:11 +00:00
|
|
|
|
|
|
|
len += snprintf(buf + len, size - len,
|
|
|
|
"%18s : %10u\n", "CRC ERR",
|
|
|
|
sc->debug.stats.rxstats.crc_err);
|
|
|
|
len += snprintf(buf + len, size - len,
|
|
|
|
"%18s : %10u\n", "DECRYPT CRC ERR",
|
|
|
|
sc->debug.stats.rxstats.decrypt_crc_err);
|
|
|
|
len += snprintf(buf + len, size - len,
|
|
|
|
"%18s : %10u\n", "PHY ERR",
|
|
|
|
sc->debug.stats.rxstats.phy_err);
|
|
|
|
len += snprintf(buf + len, size - len,
|
|
|
|
"%18s : %10u\n", "MIC ERR",
|
|
|
|
sc->debug.stats.rxstats.mic_err);
|
|
|
|
len += snprintf(buf + len, size - len,
|
|
|
|
"%18s : %10u\n", "PRE-DELIM CRC ERR",
|
|
|
|
sc->debug.stats.rxstats.pre_delim_crc_err);
|
|
|
|
len += snprintf(buf + len, size - len,
|
|
|
|
"%18s : %10u\n", "POST-DELIM CRC ERR",
|
|
|
|
sc->debug.stats.rxstats.post_delim_crc_err);
|
|
|
|
len += snprintf(buf + len, size - len,
|
|
|
|
"%18s : %10u\n", "DECRYPT BUSY ERR",
|
|
|
|
sc->debug.stats.rxstats.decrypt_busy_err);
|
|
|
|
|
|
|
|
PHY_ERR("UNDERRUN", ATH9K_PHYERR_UNDERRUN);
|
|
|
|
PHY_ERR("TIMING", ATH9K_PHYERR_TIMING);
|
|
|
|
PHY_ERR("PARITY", ATH9K_PHYERR_PARITY);
|
|
|
|
PHY_ERR("RATE", ATH9K_PHYERR_RATE);
|
|
|
|
PHY_ERR("LENGTH", ATH9K_PHYERR_LENGTH);
|
|
|
|
PHY_ERR("RADAR", ATH9K_PHYERR_RADAR);
|
|
|
|
PHY_ERR("SERVICE", ATH9K_PHYERR_SERVICE);
|
|
|
|
PHY_ERR("TOR", ATH9K_PHYERR_TOR);
|
|
|
|
PHY_ERR("OFDM-TIMING", ATH9K_PHYERR_OFDM_TIMING);
|
|
|
|
PHY_ERR("OFDM-SIGNAL-PARITY", ATH9K_PHYERR_OFDM_SIGNAL_PARITY);
|
|
|
|
PHY_ERR("OFDM-RATE", ATH9K_PHYERR_OFDM_RATE_ILLEGAL);
|
|
|
|
PHY_ERR("OFDM-LENGTH", ATH9K_PHYERR_OFDM_LENGTH_ILLEGAL);
|
|
|
|
PHY_ERR("OFDM-POWER-DROP", ATH9K_PHYERR_OFDM_POWER_DROP);
|
|
|
|
PHY_ERR("OFDM-SERVICE", ATH9K_PHYERR_OFDM_SERVICE);
|
|
|
|
PHY_ERR("OFDM-RESTART", ATH9K_PHYERR_OFDM_RESTART);
|
|
|
|
PHY_ERR("FALSE-RADAR-EXT", ATH9K_PHYERR_FALSE_RADAR_EXT);
|
|
|
|
PHY_ERR("CCK-TIMING", ATH9K_PHYERR_CCK_TIMING);
|
|
|
|
PHY_ERR("CCK-HEADER-CRC", ATH9K_PHYERR_CCK_HEADER_CRC);
|
|
|
|
PHY_ERR("CCK-RATE", ATH9K_PHYERR_CCK_RATE_ILLEGAL);
|
|
|
|
PHY_ERR("CCK-SERVICE", ATH9K_PHYERR_CCK_SERVICE);
|
|
|
|
PHY_ERR("CCK-RESTART", ATH9K_PHYERR_CCK_RESTART);
|
|
|
|
PHY_ERR("CCK-LENGTH", ATH9K_PHYERR_CCK_LENGTH_ILLEGAL);
|
|
|
|
PHY_ERR("CCK-POWER-DROP", ATH9K_PHYERR_CCK_POWER_DROP);
|
|
|
|
PHY_ERR("HT-CRC", ATH9K_PHYERR_HT_CRC_ERROR);
|
|
|
|
PHY_ERR("HT-LENGTH", ATH9K_PHYERR_HT_LENGTH_ILLEGAL);
|
|
|
|
PHY_ERR("HT-RATE", ATH9K_PHYERR_HT_RATE_ILLEGAL);
|
|
|
|
|
2010-10-01 19:26:30 +00:00
|
|
|
len += snprintf(buf + len, size - len,
|
|
|
|
"%18s : %10u\n", "RX-Pkts-All",
|
|
|
|
sc->debug.stats.rxstats.rx_pkts_all);
|
|
|
|
len += snprintf(buf + len, size - len,
|
|
|
|
"%18s : %10u\n", "RX-Bytes-All",
|
|
|
|
sc->debug.stats.rxstats.rx_bytes_all);
|
|
|
|
|
2010-05-14 13:24:37 +00:00
|
|
|
if (len > size)
|
|
|
|
len = size;
|
|
|
|
|
2010-01-08 05:06:11 +00:00
|
|
|
retval = simple_read_from_buffer(user_buf, count, ppos, buf, len);
|
|
|
|
kfree(buf);
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
|
|
|
|
#undef PHY_ERR
|
|
|
|
}
|
|
|
|
|
2010-03-30 03:09:27 +00:00
|
|
|
void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs)
|
2010-01-08 05:06:11 +00:00
|
|
|
{
|
|
|
|
#define RX_STAT_INC(c) sc->debug.stats.rxstats.c++
|
|
|
|
#define RX_PHY_ERR_INC(c) sc->debug.stats.rxstats.phy_err_stats[c]++
|
|
|
|
|
|
|
|
u32 phyerr;
|
|
|
|
|
2010-10-01 19:26:30 +00:00
|
|
|
RX_STAT_INC(rx_pkts_all);
|
|
|
|
sc->debug.stats.rxstats.rx_bytes_all += rs->rs_datalen;
|
|
|
|
|
2010-03-30 03:09:27 +00:00
|
|
|
if (rs->rs_status & ATH9K_RXERR_CRC)
|
2010-01-08 05:06:11 +00:00
|
|
|
RX_STAT_INC(crc_err);
|
2010-03-30 03:09:27 +00:00
|
|
|
if (rs->rs_status & ATH9K_RXERR_DECRYPT)
|
2010-01-08 05:06:11 +00:00
|
|
|
RX_STAT_INC(decrypt_crc_err);
|
2010-03-30 03:09:27 +00:00
|
|
|
if (rs->rs_status & ATH9K_RXERR_MIC)
|
2010-01-08 05:06:11 +00:00
|
|
|
RX_STAT_INC(mic_err);
|
2010-03-30 03:09:27 +00:00
|
|
|
if (rs->rs_status & ATH9K_RX_DELIM_CRC_PRE)
|
2010-01-08 05:06:11 +00:00
|
|
|
RX_STAT_INC(pre_delim_crc_err);
|
2010-03-30 03:09:27 +00:00
|
|
|
if (rs->rs_status & ATH9K_RX_DELIM_CRC_POST)
|
2010-01-08 05:06:11 +00:00
|
|
|
RX_STAT_INC(post_delim_crc_err);
|
2010-03-30 03:09:27 +00:00
|
|
|
if (rs->rs_status & ATH9K_RX_DECRYPT_BUSY)
|
2010-01-08 05:06:11 +00:00
|
|
|
RX_STAT_INC(decrypt_busy_err);
|
|
|
|
|
2010-03-30 03:09:27 +00:00
|
|
|
if (rs->rs_status & ATH9K_RXERR_PHY) {
|
2010-01-08 05:06:11 +00:00
|
|
|
RX_STAT_INC(phy_err);
|
2010-03-30 03:09:27 +00:00
|
|
|
phyerr = rs->rs_phyerr & 0x24;
|
2010-01-08 05:06:11 +00:00
|
|
|
RX_PHY_ERR_INC(phyerr);
|
|
|
|
}
|
|
|
|
|
|
|
|
#undef RX_STAT_INC
|
|
|
|
#undef RX_PHY_ERR_INC
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct file_operations fops_recv = {
|
|
|
|
.read = read_file_recv,
|
|
|
|
.open = ath9k_debugfs_open,
|
llseek: automatically add .llseek fop
All file_operations should get a .llseek operation so we can make
nonseekable_open the default for future file operations without a
.llseek pointer.
The three cases that we can automatically detect are no_llseek, seq_lseek
and default_llseek. For cases where we can we can automatically prove that
the file offset is always ignored, we use noop_llseek, which maintains
the current behavior of not returning an error from a seek.
New drivers should normally not use noop_llseek but instead use no_llseek
and call nonseekable_open at open time. Existing drivers can be converted
to do the same when the maintainer knows for certain that no user code
relies on calling seek on the device file.
The generated code is often incorrectly indented and right now contains
comments that clarify for each added line why a specific variant was
chosen. In the version that gets submitted upstream, the comments will
be gone and I will manually fix the indentation, because there does not
seem to be a way to do that using coccinelle.
Some amount of new code is currently sitting in linux-next that should get
the same modifications, which I will do at the end of the merge window.
Many thanks to Julia Lawall for helping me learn to write a semantic
patch that does all this.
===== begin semantic patch =====
// This adds an llseek= method to all file operations,
// as a preparation for making no_llseek the default.
//
// The rules are
// - use no_llseek explicitly if we do nonseekable_open
// - use seq_lseek for sequential files
// - use default_llseek if we know we access f_pos
// - use noop_llseek if we know we don't access f_pos,
// but we still want to allow users to call lseek
//
@ open1 exists @
identifier nested_open;
@@
nested_open(...)
{
<+...
nonseekable_open(...)
...+>
}
@ open exists@
identifier open_f;
identifier i, f;
identifier open1.nested_open;
@@
int open_f(struct inode *i, struct file *f)
{
<+...
(
nonseekable_open(...)
|
nested_open(...)
)
...+>
}
@ read disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ read_no_fpos disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
... when != off
}
@ write @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ write_no_fpos @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
... when != off
}
@ fops0 @
identifier fops;
@@
struct file_operations fops = {
...
};
@ has_llseek depends on fops0 @
identifier fops0.fops;
identifier llseek_f;
@@
struct file_operations fops = {
...
.llseek = llseek_f,
...
};
@ has_read depends on fops0 @
identifier fops0.fops;
identifier read_f;
@@
struct file_operations fops = {
...
.read = read_f,
...
};
@ has_write depends on fops0 @
identifier fops0.fops;
identifier write_f;
@@
struct file_operations fops = {
...
.write = write_f,
...
};
@ has_open depends on fops0 @
identifier fops0.fops;
identifier open_f;
@@
struct file_operations fops = {
...
.open = open_f,
...
};
// use no_llseek if we call nonseekable_open
////////////////////////////////////////////
@ nonseekable1 depends on !has_llseek && has_open @
identifier fops0.fops;
identifier nso ~= "nonseekable_open";
@@
struct file_operations fops = {
... .open = nso, ...
+.llseek = no_llseek, /* nonseekable */
};
@ nonseekable2 depends on !has_llseek @
identifier fops0.fops;
identifier open.open_f;
@@
struct file_operations fops = {
... .open = open_f, ...
+.llseek = no_llseek, /* open uses nonseekable */
};
// use seq_lseek for sequential files
/////////////////////////////////////
@ seq depends on !has_llseek @
identifier fops0.fops;
identifier sr ~= "seq_read";
@@
struct file_operations fops = {
... .read = sr, ...
+.llseek = seq_lseek, /* we have seq_read */
};
// use default_llseek if there is a readdir
///////////////////////////////////////////
@ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier readdir_e;
@@
// any other fop is used that changes pos
struct file_operations fops = {
... .readdir = readdir_e, ...
+.llseek = default_llseek, /* readdir is present */
};
// use default_llseek if at least one of read/write touches f_pos
/////////////////////////////////////////////////////////////////
@ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read.read_f;
@@
// read fops use offset
struct file_operations fops = {
... .read = read_f, ...
+.llseek = default_llseek, /* read accesses f_pos */
};
@ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write.write_f;
@@
// write fops use offset
struct file_operations fops = {
... .write = write_f, ...
+ .llseek = default_llseek, /* write accesses f_pos */
};
// Use noop_llseek if neither read nor write accesses f_pos
///////////////////////////////////////////////////////////
@ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
identifier write_no_fpos.write_f;
@@
// write fops use offset
struct file_operations fops = {
...
.write = write_f,
.read = read_f,
...
+.llseek = noop_llseek, /* read and write both use no f_pos */
};
@ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write_no_fpos.write_f;
@@
struct file_operations fops = {
... .write = write_f, ...
+.llseek = noop_llseek, /* write uses no f_pos */
};
@ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
@@
struct file_operations fops = {
... .read = read_f, ...
+.llseek = noop_llseek, /* read uses no f_pos */
};
@ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
@@
struct file_operations fops = {
...
+.llseek = noop_llseek, /* no read or write fn */
};
===== End semantic patch =====
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Julia Lawall <julia@diku.dk>
Cc: Christoph Hellwig <hch@infradead.org>
2010-08-15 16:52:59 +00:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.llseek = default_llseek,
|
2010-01-08 05:06:11 +00:00
|
|
|
};
|
|
|
|
|
2010-05-11 15:23:02 +00:00
|
|
|
static ssize_t read_file_regidx(struct file *file, char __user *user_buf,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ath_softc *sc = file->private_data;
|
|
|
|
char buf[32];
|
|
|
|
unsigned int len;
|
|
|
|
|
2010-05-14 13:24:37 +00:00
|
|
|
len = sprintf(buf, "0x%08x\n", sc->debug.regidx);
|
2010-05-11 15:23:02 +00:00
|
|
|
return simple_read_from_buffer(user_buf, count, ppos, buf, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t write_file_regidx(struct file *file, const char __user *user_buf,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ath_softc *sc = file->private_data;
|
|
|
|
unsigned long regidx;
|
|
|
|
char buf[32];
|
|
|
|
ssize_t len;
|
|
|
|
|
|
|
|
len = min(count, sizeof(buf) - 1);
|
|
|
|
if (copy_from_user(buf, user_buf, len))
|
2010-05-14 13:25:39 +00:00
|
|
|
return -EFAULT;
|
2010-05-11 15:23:02 +00:00
|
|
|
|
|
|
|
buf[len] = '\0';
|
|
|
|
if (strict_strtoul(buf, 0, ®idx))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
sc->debug.regidx = regidx;
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct file_operations fops_regidx = {
|
|
|
|
.read = read_file_regidx,
|
|
|
|
.write = write_file_regidx,
|
|
|
|
.open = ath9k_debugfs_open,
|
llseek: automatically add .llseek fop
All file_operations should get a .llseek operation so we can make
nonseekable_open the default for future file operations without a
.llseek pointer.
The three cases that we can automatically detect are no_llseek, seq_lseek
and default_llseek. For cases where we can we can automatically prove that
the file offset is always ignored, we use noop_llseek, which maintains
the current behavior of not returning an error from a seek.
New drivers should normally not use noop_llseek but instead use no_llseek
and call nonseekable_open at open time. Existing drivers can be converted
to do the same when the maintainer knows for certain that no user code
relies on calling seek on the device file.
The generated code is often incorrectly indented and right now contains
comments that clarify for each added line why a specific variant was
chosen. In the version that gets submitted upstream, the comments will
be gone and I will manually fix the indentation, because there does not
seem to be a way to do that using coccinelle.
Some amount of new code is currently sitting in linux-next that should get
the same modifications, which I will do at the end of the merge window.
Many thanks to Julia Lawall for helping me learn to write a semantic
patch that does all this.
===== begin semantic patch =====
// This adds an llseek= method to all file operations,
// as a preparation for making no_llseek the default.
//
// The rules are
// - use no_llseek explicitly if we do nonseekable_open
// - use seq_lseek for sequential files
// - use default_llseek if we know we access f_pos
// - use noop_llseek if we know we don't access f_pos,
// but we still want to allow users to call lseek
//
@ open1 exists @
identifier nested_open;
@@
nested_open(...)
{
<+...
nonseekable_open(...)
...+>
}
@ open exists@
identifier open_f;
identifier i, f;
identifier open1.nested_open;
@@
int open_f(struct inode *i, struct file *f)
{
<+...
(
nonseekable_open(...)
|
nested_open(...)
)
...+>
}
@ read disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ read_no_fpos disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
... when != off
}
@ write @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ write_no_fpos @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
... when != off
}
@ fops0 @
identifier fops;
@@
struct file_operations fops = {
...
};
@ has_llseek depends on fops0 @
identifier fops0.fops;
identifier llseek_f;
@@
struct file_operations fops = {
...
.llseek = llseek_f,
...
};
@ has_read depends on fops0 @
identifier fops0.fops;
identifier read_f;
@@
struct file_operations fops = {
...
.read = read_f,
...
};
@ has_write depends on fops0 @
identifier fops0.fops;
identifier write_f;
@@
struct file_operations fops = {
...
.write = write_f,
...
};
@ has_open depends on fops0 @
identifier fops0.fops;
identifier open_f;
@@
struct file_operations fops = {
...
.open = open_f,
...
};
// use no_llseek if we call nonseekable_open
////////////////////////////////////////////
@ nonseekable1 depends on !has_llseek && has_open @
identifier fops0.fops;
identifier nso ~= "nonseekable_open";
@@
struct file_operations fops = {
... .open = nso, ...
+.llseek = no_llseek, /* nonseekable */
};
@ nonseekable2 depends on !has_llseek @
identifier fops0.fops;
identifier open.open_f;
@@
struct file_operations fops = {
... .open = open_f, ...
+.llseek = no_llseek, /* open uses nonseekable */
};
// use seq_lseek for sequential files
/////////////////////////////////////
@ seq depends on !has_llseek @
identifier fops0.fops;
identifier sr ~= "seq_read";
@@
struct file_operations fops = {
... .read = sr, ...
+.llseek = seq_lseek, /* we have seq_read */
};
// use default_llseek if there is a readdir
///////////////////////////////////////////
@ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier readdir_e;
@@
// any other fop is used that changes pos
struct file_operations fops = {
... .readdir = readdir_e, ...
+.llseek = default_llseek, /* readdir is present */
};
// use default_llseek if at least one of read/write touches f_pos
/////////////////////////////////////////////////////////////////
@ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read.read_f;
@@
// read fops use offset
struct file_operations fops = {
... .read = read_f, ...
+.llseek = default_llseek, /* read accesses f_pos */
};
@ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write.write_f;
@@
// write fops use offset
struct file_operations fops = {
... .write = write_f, ...
+ .llseek = default_llseek, /* write accesses f_pos */
};
// Use noop_llseek if neither read nor write accesses f_pos
///////////////////////////////////////////////////////////
@ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
identifier write_no_fpos.write_f;
@@
// write fops use offset
struct file_operations fops = {
...
.write = write_f,
.read = read_f,
...
+.llseek = noop_llseek, /* read and write both use no f_pos */
};
@ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write_no_fpos.write_f;
@@
struct file_operations fops = {
... .write = write_f, ...
+.llseek = noop_llseek, /* write uses no f_pos */
};
@ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
@@
struct file_operations fops = {
... .read = read_f, ...
+.llseek = noop_llseek, /* read uses no f_pos */
};
@ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
@@
struct file_operations fops = {
...
+.llseek = noop_llseek, /* no read or write fn */
};
===== End semantic patch =====
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Julia Lawall <julia@diku.dk>
Cc: Christoph Hellwig <hch@infradead.org>
2010-08-15 16:52:59 +00:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.llseek = default_llseek,
|
2010-05-11 15:23:02 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static ssize_t read_file_regval(struct file *file, char __user *user_buf,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ath_softc *sc = file->private_data;
|
|
|
|
struct ath_hw *ah = sc->sc_ah;
|
|
|
|
char buf[32];
|
|
|
|
unsigned int len;
|
|
|
|
u32 regval;
|
|
|
|
|
|
|
|
regval = REG_READ_D(ah, sc->debug.regidx);
|
2010-05-14 13:24:37 +00:00
|
|
|
len = sprintf(buf, "0x%08x\n", regval);
|
2010-05-11 15:23:02 +00:00
|
|
|
return simple_read_from_buffer(user_buf, count, ppos, buf, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t write_file_regval(struct file *file, const char __user *user_buf,
|
|
|
|
size_t count, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ath_softc *sc = file->private_data;
|
|
|
|
struct ath_hw *ah = sc->sc_ah;
|
|
|
|
unsigned long regval;
|
|
|
|
char buf[32];
|
|
|
|
ssize_t len;
|
|
|
|
|
|
|
|
len = min(count, sizeof(buf) - 1);
|
|
|
|
if (copy_from_user(buf, user_buf, len))
|
2010-05-14 13:25:39 +00:00
|
|
|
return -EFAULT;
|
2010-05-11 15:23:02 +00:00
|
|
|
|
|
|
|
buf[len] = '\0';
|
|
|
|
if (strict_strtoul(buf, 0, ®val))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
REG_WRITE_D(ah, sc->debug.regidx, regval);
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct file_operations fops_regval = {
|
|
|
|
.read = read_file_regval,
|
|
|
|
.write = write_file_regval,
|
|
|
|
.open = ath9k_debugfs_open,
|
llseek: automatically add .llseek fop
All file_operations should get a .llseek operation so we can make
nonseekable_open the default for future file operations without a
.llseek pointer.
The three cases that we can automatically detect are no_llseek, seq_lseek
and default_llseek. For cases where we can we can automatically prove that
the file offset is always ignored, we use noop_llseek, which maintains
the current behavior of not returning an error from a seek.
New drivers should normally not use noop_llseek but instead use no_llseek
and call nonseekable_open at open time. Existing drivers can be converted
to do the same when the maintainer knows for certain that no user code
relies on calling seek on the device file.
The generated code is often incorrectly indented and right now contains
comments that clarify for each added line why a specific variant was
chosen. In the version that gets submitted upstream, the comments will
be gone and I will manually fix the indentation, because there does not
seem to be a way to do that using coccinelle.
Some amount of new code is currently sitting in linux-next that should get
the same modifications, which I will do at the end of the merge window.
Many thanks to Julia Lawall for helping me learn to write a semantic
patch that does all this.
===== begin semantic patch =====
// This adds an llseek= method to all file operations,
// as a preparation for making no_llseek the default.
//
// The rules are
// - use no_llseek explicitly if we do nonseekable_open
// - use seq_lseek for sequential files
// - use default_llseek if we know we access f_pos
// - use noop_llseek if we know we don't access f_pos,
// but we still want to allow users to call lseek
//
@ open1 exists @
identifier nested_open;
@@
nested_open(...)
{
<+...
nonseekable_open(...)
...+>
}
@ open exists@
identifier open_f;
identifier i, f;
identifier open1.nested_open;
@@
int open_f(struct inode *i, struct file *f)
{
<+...
(
nonseekable_open(...)
|
nested_open(...)
)
...+>
}
@ read disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ read_no_fpos disable optional_qualifier exists @
identifier read_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
{
... when != off
}
@ write @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
expression E;
identifier func;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
<+...
(
*off = E
|
*off += E
|
func(..., off, ...)
|
E = *off
)
...+>
}
@ write_no_fpos @
identifier write_f;
identifier f, p, s, off;
type ssize_t, size_t, loff_t;
@@
ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
{
... when != off
}
@ fops0 @
identifier fops;
@@
struct file_operations fops = {
...
};
@ has_llseek depends on fops0 @
identifier fops0.fops;
identifier llseek_f;
@@
struct file_operations fops = {
...
.llseek = llseek_f,
...
};
@ has_read depends on fops0 @
identifier fops0.fops;
identifier read_f;
@@
struct file_operations fops = {
...
.read = read_f,
...
};
@ has_write depends on fops0 @
identifier fops0.fops;
identifier write_f;
@@
struct file_operations fops = {
...
.write = write_f,
...
};
@ has_open depends on fops0 @
identifier fops0.fops;
identifier open_f;
@@
struct file_operations fops = {
...
.open = open_f,
...
};
// use no_llseek if we call nonseekable_open
////////////////////////////////////////////
@ nonseekable1 depends on !has_llseek && has_open @
identifier fops0.fops;
identifier nso ~= "nonseekable_open";
@@
struct file_operations fops = {
... .open = nso, ...
+.llseek = no_llseek, /* nonseekable */
};
@ nonseekable2 depends on !has_llseek @
identifier fops0.fops;
identifier open.open_f;
@@
struct file_operations fops = {
... .open = open_f, ...
+.llseek = no_llseek, /* open uses nonseekable */
};
// use seq_lseek for sequential files
/////////////////////////////////////
@ seq depends on !has_llseek @
identifier fops0.fops;
identifier sr ~= "seq_read";
@@
struct file_operations fops = {
... .read = sr, ...
+.llseek = seq_lseek, /* we have seq_read */
};
// use default_llseek if there is a readdir
///////////////////////////////////////////
@ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier readdir_e;
@@
// any other fop is used that changes pos
struct file_operations fops = {
... .readdir = readdir_e, ...
+.llseek = default_llseek, /* readdir is present */
};
// use default_llseek if at least one of read/write touches f_pos
/////////////////////////////////////////////////////////////////
@ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read.read_f;
@@
// read fops use offset
struct file_operations fops = {
... .read = read_f, ...
+.llseek = default_llseek, /* read accesses f_pos */
};
@ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write.write_f;
@@
// write fops use offset
struct file_operations fops = {
... .write = write_f, ...
+ .llseek = default_llseek, /* write accesses f_pos */
};
// Use noop_llseek if neither read nor write accesses f_pos
///////////////////////////////////////////////////////////
@ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
identifier write_no_fpos.write_f;
@@
// write fops use offset
struct file_operations fops = {
...
.write = write_f,
.read = read_f,
...
+.llseek = noop_llseek, /* read and write both use no f_pos */
};
@ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier write_no_fpos.write_f;
@@
struct file_operations fops = {
... .write = write_f, ...
+.llseek = noop_llseek, /* write uses no f_pos */
};
@ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
identifier read_no_fpos.read_f;
@@
struct file_operations fops = {
... .read = read_f, ...
+.llseek = noop_llseek, /* read uses no f_pos */
};
@ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
identifier fops0.fops;
@@
struct file_operations fops = {
...
+.llseek = noop_llseek, /* no read or write fn */
};
===== End semantic patch =====
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Julia Lawall <julia@diku.dk>
Cc: Christoph Hellwig <hch@infradead.org>
2010-08-15 16:52:59 +00:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.llseek = default_llseek,
|
2010-05-11 15:23:02 +00:00
|
|
|
};
|
|
|
|
|
2009-09-07 11:52:26 +00:00
|
|
|
int ath9k_init_debug(struct ath_hw *ah)
|
2008-11-28 16:49:02 +00:00
|
|
|
{
|
2009-09-28 06:54:40 +00:00
|
|
|
struct ath_common *common = ath9k_hw_common(ah);
|
|
|
|
struct ath_softc *sc = (struct ath_softc *) common->priv;
|
2009-09-07 11:52:26 +00:00
|
|
|
|
2010-11-29 22:13:22 +00:00
|
|
|
sc->debug.debugfs_phy = debugfs_create_dir("ath9k",
|
|
|
|
sc->hw->wiphy->debugfsdir);
|
2009-02-09 07:57:03 +00:00
|
|
|
if (!sc->debug.debugfs_phy)
|
2010-05-11 15:23:00 +00:00
|
|
|
return -ENOMEM;
|
2008-11-28 16:50:23 +00:00
|
|
|
|
2009-11-23 21:33:27 +00:00
|
|
|
#ifdef CONFIG_ATH_DEBUG
|
2010-05-11 15:23:00 +00:00
|
|
|
if (!debugfs_create_file("debug", S_IRUSR | S_IWUSR,
|
|
|
|
sc->debug.debugfs_phy, sc, &fops_debug))
|
2009-05-27 12:48:29 +00:00
|
|
|
goto err;
|
2009-11-23 21:33:27 +00:00
|
|
|
#endif
|
2009-05-27 12:48:29 +00:00
|
|
|
|
2010-05-11 15:23:00 +00:00
|
|
|
if (!debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy,
|
|
|
|
sc, &fops_dma))
|
2008-11-28 16:51:08 +00:00
|
|
|
goto err;
|
|
|
|
|
2010-05-11 15:23:00 +00:00
|
|
|
if (!debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy,
|
|
|
|
sc, &fops_interrupt))
|
2008-12-07 16:12:44 +00:00
|
|
|
goto err;
|
|
|
|
|
2010-05-11 15:23:00 +00:00
|
|
|
if (!debugfs_create_file("wiphy", S_IRUSR | S_IWUSR,
|
|
|
|
sc->debug.debugfs_phy, sc, &fops_wiphy))
|
2009-03-03 17:23:40 +00:00
|
|
|
goto err;
|
|
|
|
|
2010-05-11 15:23:00 +00:00
|
|
|
if (!debugfs_create_file("xmit", S_IRUSR, sc->debug.debugfs_phy,
|
|
|
|
sc, &fops_xmit))
|
2008-11-28 16:51:08 +00:00
|
|
|
goto err;
|
|
|
|
|
2010-05-11 15:23:00 +00:00
|
|
|
if (!debugfs_create_file("recv", S_IRUSR, sc->debug.debugfs_phy,
|
|
|
|
sc, &fops_recv))
|
2008-12-07 16:12:44 +00:00
|
|
|
goto err;
|
|
|
|
|
2010-05-11 15:23:01 +00:00
|
|
|
if (!debugfs_create_file("rx_chainmask", S_IRUSR | S_IWUSR,
|
|
|
|
sc->debug.debugfs_phy, sc, &fops_rx_chainmask))
|
2009-01-30 09:02:09 +00:00
|
|
|
goto err;
|
|
|
|
|
2010-05-11 15:23:01 +00:00
|
|
|
if (!debugfs_create_file("tx_chainmask", S_IRUSR | S_IWUSR,
|
|
|
|
sc->debug.debugfs_phy, sc, &fops_tx_chainmask))
|
2009-03-03 17:23:40 +00:00
|
|
|
goto err;
|
|
|
|
|
2010-05-11 15:23:02 +00:00
|
|
|
if (!debugfs_create_file("regidx", S_IRUSR | S_IWUSR,
|
|
|
|
sc->debug.debugfs_phy, sc, &fops_regidx))
|
2009-07-27 06:38:16 +00:00
|
|
|
goto err;
|
|
|
|
|
2010-05-11 15:23:02 +00:00
|
|
|
if (!debugfs_create_file("regval", S_IRUSR | S_IWUSR,
|
|
|
|
sc->debug.debugfs_phy, sc, &fops_regval))
|
2010-01-08 05:06:11 +00:00
|
|
|
goto err;
|
|
|
|
|
2010-06-12 04:33:56 +00:00
|
|
|
if (!debugfs_create_bool("ignore_extcca", S_IRUSR | S_IWUSR,
|
|
|
|
sc->debug.debugfs_phy, &ah->config.cwm_ignore_extcca))
|
|
|
|
goto err;
|
|
|
|
|
2010-05-11 15:23:02 +00:00
|
|
|
sc->debug.regidx = 0;
|
2008-11-28 16:50:23 +00:00
|
|
|
return 0;
|
|
|
|
err:
|
2010-05-11 15:23:00 +00:00
|
|
|
debugfs_remove_recursive(sc->debug.debugfs_phy);
|
2010-11-29 22:13:22 +00:00
|
|
|
sc->debug.debugfs_phy = NULL;
|
|
|
|
return -ENOMEM;
|
2008-11-28 16:49:02 +00:00
|
|
|
}
|