12 Apr, 2010
1 commit
-
Conflicts:
drivers/net/stmmac/stmmac_main.c
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/wl12xx/wl1271_main.c
drivers/net/wireless/wl12xx/wl1271_spi.c
net/core/ethtool.c
net/mac80211/scan.c
30 Mar, 2010
1 commit
-
…it 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 allmodconfig8. 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>
20 Mar, 2010
1 commit
-
This patch renames the (never officially released) sysfs-knobs
"blocked_hw" and "blocked_sw" to "hard" and "soft", as the hardware vs
software conotation is misleading.It also gets rid of not needed locks around u32-read-access.
Signed-off-by: Florian Mickler
Signed-off-by: John W. Linville
11 Mar, 2010
1 commit
-
This commit introduces two new sysfs knobs.
/sys/class/rfkill/rfkill[0-9]+/blocked_hw: (ro)
hardblock kill state
/sys/class/rfkill/rfkill[0-9]+/blocked_sw: (rw)
softblock kill stateSigned-off-by: Florian Mickler
Signed-off-by: John W. Linville
03 Mar, 2010
1 commit
-
Add support for handling KEY_RFKILL in the rfkill input module. This
simply toggles the state of all rfkill devices. The comment in rfkill.h
is also updated to reflect that RFKILL_TYPE_ALL may be used inside the
kernel.Signed-off-by: Matthew Garrett
Acked-by: Marcel Holtmann
Signed-off-by: John W. Linville
08 Dec, 2009
1 commit
-
net/rfkill/core.c: In function 'rfkill_type_show':
net/rfkill/core.c:610: warning: control may reach end of non-void function 'rfkill_get_type_str' being inlinedA gcc bug, but simple enough to squish.
Cc: John W. Linville
Cc: Johannes Berg
Cc: David S. Miller
Signed-off-by: Andrew Morton
Signed-off-by: John W. Linville
29 Nov, 2009
1 commit
-
Conflicts:
drivers/ieee802154/fakehard.c
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/phy.c
drivers/net/netxen/netxen_nic_init.c
drivers/net/wireless/ath/ath9k/main.c
24 Nov, 2009
2 commits
-
The /dev/rfkill ops don't refer to the module,
so it is possible to unload the module while
file descriptors are open. Fix this oversight.Reported-by: Maxim Levitsky
Cc: stable@kernel.org
Signed-off-by: Johannes Berg
Signed-off-by: John W. Linville
19 Nov, 2009
1 commit
-
Signed-off-by: Marcel Holtmann
Signed-off-by: Janakiram Sistla
Signed-off-by: John W. Linville
05 Oct, 2009
1 commit
-
Signed-off-by: Alexey Dobriyan
Signed-off-by: Linus Torvalds
05 Aug, 2009
1 commit
-
Althoug GPS is a technology w/o transmitting radio
and thus not a primary candidate for rfkill switch,
rfkill gives unified interface point for devices with
wireless technology.The input key is not supplied as it is too be deprecated.
Cc: johannes@sipsolutions.net
Signed-off-by: Tomas Winkler
Acked-by: Marcel Holtmann
Signed-off-by: John W. Linville
24 Jul, 2009
1 commit
-
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
22 Jul, 2009
2 commits
-
The point of this function is to set the software and hardware state at
the same time. When I tried to use it, I found it was only setting the
software state.Signed-off-by: Alan Jenkins
Reviewed-by: Johannes Berg
Signed-off-by: John W. Linville -
Apparently there actually _are_ tools that try to set
this in sysfs even though it wasn't supposed to be used
this way without claiming first. Guess what: now that
I've cleaned it all up it doesn't matter and we can
simply allow setting the soft-block state in sysfs.Signed-off-by: Johannes Berg
Tested-By: Darren Salt
Signed-off-by: John W. Linville
11 Jul, 2009
1 commit
-
We've designed the /dev/rfkill API in a way that we
can increase the event struct by adding members at
the end, should it become necessary. To validate the
events, userspace and the kernel need to have the
proper event size to check for -- when reading from
the other end they need to verify that it's at least
version 1 of the event API, with the current struct
size, so define a constant for that and make the
code a little more 'future proof'.Not that I expect that we'll have to change the event
size any time soon, but it's better to write the code
in a way that lends itself to extending.Due to the current size of the event struct, the code
is currently equivalent, but should the event struct
ever need to be increased the new code might not need
changing.Signed-off-by: Johannes Berg
Signed-off-by: John W. Linville
19 Jun, 2009
3 commits
-
This information allows userspace to implement a hybrid policy where
it can store the rfkill soft-blocked state in platform non-volatile
storage if available, and if not then file-based storage can be used.Some users prefer platform non-volatile storage because of the behaviour
when dual-booting multiple versions of Linux, or if the rfkill setting
is changed in the BIOS setting screens, or if the BIOS responds to
wireless-toggle hotkeys itself before the relevant platform driver has
been loaded.Signed-off-by: Alan Jenkins
Acked-by: Henrique de Moraes Holschuh
Signed-off-by: John W. Linville -
The setting of the "persistent" flag is also made more explicit using
a new rfkill_init_sw_state() function, instead of special-casing
rfkill_set_sw_state() when it is called before registration.Suspend is a bit of a corner case so we try to get away without adding
another hack to rfkill-input - it's going to be removed soon.
If the state does change over suspend, users will simply have to prod
rfkill-input twice in order to toggle the state.Userspace policy agents will be able to implement a more consistent user
experience. For example, they can avoid the above problem if they
toggle devices individually. Then there would be no "global state"
to get out of sync.Currently there are only two rfkill drivers with persistent soft-blocked
state. thinkpad-acpi already checks the software state on resume.
eeepc-laptop will require modification.Signed-off-by: Alan Jenkins
CC: Marcel Holtmann
Acked-by: Henrique de Moraes Holschuh
Signed-off-by: John W. Linville -
If we return after fiddling with the state, userspace will see the
wrong state and rfkill_set_sw_state() won't work until the next call to
rfkill_set_block(). At the moment rfkill_set_block() will always be
called from rfkill_resume(), but this will change in future.Also, presumably the point of this test is to avoid bothering devices
which may be suspended. If we don't want to call set_block(), we
probably don't want to call query() either :-).Signed-off-by: Alan Jenkins
Signed-off-by: John W. Linville
11 Jun, 2009
4 commits
-
Once rfkill-input is disabled, the "global" states will only be used as
default initial states.Since the states will always be the same after resume, we shouldn't
generate events on resume.Signed-off-by: Alan Jenkins
Signed-off-by: John W. Linville -
rfkill_set_global_sw_state() (previously rfkill_set_default()) will no
longer be exported by the rewritten rfkill core.Instead, platform drivers which can provide persistent soft-rfkill state
across power-down/reboot should indicate their initial state by calling
rfkill_set_sw_state() before registration. Otherwise, they will be
initialized to a default value during registration by a set_block call.We remove existing calls to rfkill_set_sw_state() which happen before
registration, since these had no effect in the old model. If these
drivers do have persistent state, the calls can be put back (subject
to testing :-). This affects hp-wmi and acer-wmi.Drivers with persistent state will affect the global state only if
rfkill-input is enabled. This is required, otherwise booting with
wireless soft-blocked and pressing the wireless-toggle key once would
have no apparent effect. This special case will be removed in future
along with rfkill-input, in favour of a more flexible userspace daemon
(see Documentation/feature-removal-schedule.txt).Now rfkill_global_states[n].def is only used to preserve global states
over EPO, it is renamed to ".sav".Signed-off-by: Alan Jenkins
Acked-by: Henrique de Moraes Holschuh
Signed-off-by: John W. Linville -
Now that we added the ioctl, there's no need to ask
the user to configure this. We will keep it enabled
for now, and eventually swap the default to n. Also
let embedded users select it only if they need it.Signed-off-by: Johannes Berg
Signed-off-by: John W. Linville -
It is useful for debugging when we know if something disabled
the in-kernel rfkill input handler.Signed-off-by: Johannes Berg
Acked-by: Marcel Holtmann
Signed-off-by: John W. Linville
04 Jun, 2009
4 commits
-
The rfkill core didn't initialise the poll delayed work
because it assumed that polling was always done by specifying
the poll function. cfg80211, however, would like to start
polling only later, which is a valid use case and easy to
support, so change rfkill to always initialise the poll
delayed work and thus allow starting polling by calling the
rfkill_resume_polling() function after registration.Signed-off-by: Johannes Berg
Signed-off-by: John W. Linville -
Sometimes it is necessary to know how the state is,
and it is easier to query rfkill than keep track of
it somewhere else, so add a function for that. This
could later be expanded to return hard/soft block,
but so far that isn't necessary.Signed-off-by: Johannes Berg
Signed-off-by: John W. Linville -
The new code added by this patch will make rfkill create
a misc character device /dev/rfkill that userspace can use
to control rfkill soft blocks and get status of devices as
well as events when the status changes.Using it is very simple -- when you open it you can read
a number of times to get the initial state, and every
further read blocks (you can poll) on getting the next
event from the kernel. The same structure you read is
also used when writing to it to change the soft block of
a given device, all devices of a given type, or all
devices.This also makes CONFIG_RFKILL_INPUT selectable again in
order to be able to test without it present since its
functionality can now be replaced by userspace entirely
and distros and users may not want the input part of
rfkill interfering with their userspace code. We will
also write a userspace daemon to handle all that and
consequently add the input code to the feature removal
schedule.In order to have rfkilld support both kernels with and
without CONFIG_RFKILL_INPUT (or new kernels after its
eventual removal) we also add an ioctl (that only exists
if rfkill-input is present) to disable rfkill-input.
It is not very efficient, but at least gives the correct
behaviour in all cases.Signed-off-by: Johannes Berg
Acked-by: Marcel Holtmann
Signed-off-by: John W. Linville -
This patch completely rewrites the rfkill core to address
the following deficiencies:* all rfkill drivers need to implement polling where necessary
rather than having one central implementation* updating the rfkill state cannot be done from arbitrary
contexts, forcing drivers to use schedule_work and requiring
lots of code* rfkill drivers need to keep track of soft/hard blocked
internally -- the core should do this* the rfkill API has many unexpected quirks, for example being
asymmetric wrt. alloc/free and register/unregister* rfkill can call back into a driver from within a function the
driver called -- this is prone to deadlocks and generally
should be avoided* rfkill-input pointlessly is a separate module
* drivers need to #ifdef rfkill functions (unless they want to
depend on or select RFKILL) -- rfkill should provide inlines
that do nothing if it isn't compiled in* the rfkill structure is not opaque -- drivers need to initialise
it correctly (lots of sanity checking code required) -- instead
force drivers to pass the right variables to rfkill_alloc()* the documentation is hard to read because it always assumes the
reader is completely clueless and contains way TOO MANY CAPS* the rfkill code needlessly uses a lot of locks and atomic
operations in locked sections* fix LED trigger to actually change the LED when the radio state
changes -- this wasn't done beforeTested-by: Alan Jenkins
Signed-off-by: Henrique de Moraes Holschuh [thinkpad]
Signed-off-by: Johannes Berg
Signed-off-by: John W. Linville
07 May, 2009
1 commit
-
net/rfkill/rfkill.c: In function 'update_rfkill_state':
net/rfkill/rfkill.c:99: error: implicit declaration of function 'rfkill_led_trigger'Caused by
: commit 492301fb5d12e4a77a1010ad2b6f1ed306014123
: Author: Larry Finger
: Date: Thu Apr 9 22:14:19 2009 -0500
:
: rfkill: Fix broken rfkill LED in 2.6.30-rc1Cc: Henrique de Moraes Holschuh
Cc: Ivo van Doorn
Cc: Michael Buesch
Cc: David S. Miller
Cc: Larry Finger
Signed-off-by: Andrew Morton
Signed-off-by: John W. Linville
23 Apr, 2009
3 commits
-
The rfkill system fails to issue a LED trigger event when the rfkill state
changes.Signed-off-by: Larry Finger
Signed-off-by: John W. Linville -
There's a lot of rfkill-input code that cannot ever be
compiled and is useless until somebody needs and tests
it -- therefore remove it.Signed-off-by: Johannes Berg
Signed-off-by: John W. Linville -
Almost all drivers do not support user_claim, so remove it
completely and always report -EOPNOTSUPP to userspace. Since
userspace cannot really drive rfkill _anyway_ (due to the
odd restrictions imposed by the documentation) having this
code is just pointless.Signed-off-by: Johannes Berg
Signed-off-by: John W. Linville
05 Jan, 2009
1 commit
-
commit 4dec9b807be757780ca3611a959ac22c28d292a7 ("rfkill: strip pointless
notifier chain") removed the only user of rfkill_led_trigger() that was not
guarded by #ifdef CONFIG_RFKILL_LEDS. Therefore, move rfkill_led_trigger()
completely inside #ifdef CONFIG_RFKILL_LEDS and avoid the compile time
warning:net/rfkill/rfkill.c:59: warning: 'rfkill_led_trigger' defined but not used
Signed-off-by: Simon Holm Thøgersen
Signed-off-by: David S. Miller
13 Dec, 2008
1 commit
-
No users, so no reason to have it.
Signed-off-by: Johannes Berg
Acked-by: Ivo van Doorn
Signed-off-by: John W. Linville
26 Nov, 2008
2 commits
-
We "optimize" away the get_state() hook call on rfkill_toggle_radio
when doing a forced state change. This means the resume path is not
calling get_state() as it should.Call it manually on the resume handler, as we don't want to mess with
the EPO path by removing the optimization. This has the added benefit
of making it explicit that rfkill->state could have been modified
before we hit the rfkill_toggle_radio() call in the class resume
handler.Signed-off-by: Henrique de Moraes Holschuh
Acked-by: Ivo van Doorn
Cc: Matthew Garrett
Cc: Alan Jenkins
Signed-off-by: John W. Linville -
The rfkill class API requires that the driver connected to a class
call rfkill_force_state() on resume to update the real state of the
rfkill controller, OR that it provides a get_state() hook.This means there is potentially a hidden call in the resume code flow
that changes rfkill->state (i.e. rfkill_force_state()), so the
previous state of the transmitter was being lost.The simplest and most future-proof way to fix this is to explicitly
store the pre-sleep state on the rfkill structure, and restore from
that on resume.Signed-off-by: Henrique de Moraes Holschuh
Acked-by: Ivo van Doorn
Cc: Matthew Garrett
Cc: Alan Jenkins
Signed-off-by: John W. Linville
11 Nov, 2008
1 commit
-
Acked-by: Marcel Holtmann
Acked-by: Greg Kroah-Hartman
Signed-off-by: Kay Sievers
Signed-off-by: David S. Miller
07 Nov, 2008
2 commits
-
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c -
> I'll have a prod at why the [hso] rfkill stuff isn't working next
Ok, I believe this is due to the addition of rfkill_check_duplicity in
rfkill and the fact that test_bit actually returns a negative value
rather than the postive one expected (which is of course equally true).
So when the second WLAN device (the hso device, with the EEE PC WLAN
being the first) comes along rfkill_check_duplicity returns a negative
value and so rfkill_register returns an error. Patch below fixes this
for me.Signed-Off-By: Jonathan McDowell
Acked-by: Henrique de Moraes Holschuh
Signed-off-by: John W. Linville
01 Nov, 2008
2 commits
-
Limit the number of "expensive" rfkill workqueue operations per second, in
order to not hog system resources too much when faced with a rogue source
of rfkill input events.The old rfkill-input code (before it was refactored) had such a limit in
place. It used to drop new events that were past the rate limit. This
behaviour was not implemented as an anti-DoS measure, but rather as an
attempt to work around deficiencies in input device drivers which would
issue multiple KEY_FOO events too soon for a given key FOO (i.e. ones that
do not implement mechanical debouncing properly).However, we can't really expect such issues to be worked around by every
input handler out there, and also by every userspace client of input
devices. It is the input device driver's responsability to do debouncing
instead of spamming the input layer with bogus events.The new limiter code is focused only on anti-DoS behaviour, and tries to
not lose events (instead, it coalesces them when possible).The transmitters are updated once every 200ms, maximum. Care is taken not
to delay a request to _enter_ rfkill transmitter Emergency Power Off (EPO)
mode.If mistriggered (e.g. by a jiffies counter wrap), the code delays processing
*once* by 200ms.Signed-off-by: Henrique de Moraes Holschuh
Cc: Ivo van Doorn
Cc: Dmitry Torokhov
Signed-off-by: John W. Linville -
rfkill_resume() would always restore the rfkill controller state to its
pre-suspend state.Now that we know when we are under EPO, kick the rfkill controller to
SOFT_BLOCKED state instead of to its pre-suspend state when it is resumed
while EPO mode is active.Signed-off-by: Henrique de Moraes Holschuh
Cc: Ivo van Doorn
Signed-off-by: John W. Linville