Bob Copeland bb007554fe ath5k: fix cycle counter inconsistent locking ... ath5k_reset is called from process context and takes the cc_lock with plain spin_lock(), but cc_lock can also be taken from tasklets in softirq context. Thus we need to at least use spin_lock_bh. This fixes the following lockdep warning: [ 19.967874] sky2 0000:01:00.0: eth0: enabling interface [ 19.982761] ieee80211 phy0: device now idle [ 20.904809] NET: Registered protocol family 17 [ 21.243857] ieee80211 phy0: device no longer idle - scanning [ 21.404343] [ 21.404346] ================================= [ 21.404450] [ INFO: inconsistent lock state ] [ 21.404518] 2.6.37-rc7-wl+ #242 [ 21.404582] --------------------------------- [ 21.404650] inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage. [ 21.404721] kworker/u:4/982 [HC0[0]:SC1[3]:HE1:SE0] takes: [ 21.404792] (&(&common->cc_lock)->rlock){+.?...}, at: [<f8115780>] ath5k_ani_calibration+0x29/0x5d9 [ath5k] [ 21.405011] {SOFTIRQ-ON-W} state was registered at: [ 21.405011] [<c105cadd>] __lock_acquire+0x62f/0x13c1 [ 21.405011] [<c105d944>] lock_acquire+0xd5/0xf1 [ 21.405011] [<c12c978d>] _raw_spin_lock+0x45/0x72 [ 21.405011] [<f8111533>] ath5k_reset+0x2c0/0x349 [ath5k] [ 21.405011] [<f8111a7a>] ath5k_start+0xb8/0x139 [ath5k] [ 21.405011] [<f849c714>] ieee80211_do_open+0x13f/0x819 [mac80211] [ 21.405011] [<f849ce51>] ieee80211_open+0x63/0x66 [mac80211] [ 21.405011] [<c1258b2e>] __dev_open+0x8d/0xb6 [ 21.405011] [<c1255c64>] __dev_change_flags+0x9d/0x114 [ 21.405011] [<c1258a75>] dev_change_flags+0x18/0x44 [ 21.405011] [<c1262990>] do_setlink+0x23f/0x521 [ 21.405011] [<c1262d58>] rtnl_setlink+0xe6/0xea [ 21.405011] [<c126347c>] rtnetlink_rcv_msg+0x18a/0x1a0 [ 21.405011] [<c126d5f0>] netlink_rcv_skb+0x35/0x7b [ 21.405011] [<c12632eb>] rtnetlink_rcv+0x20/0x27 [ 21.405011] [<c126d370>] netlink_unicast+0x1bb/0x21e [ 21.405011] [<c126db21>] netlink_sendmsg+0x23b/0x288 [ 21.405011] [<c124823c>] sock_sendmsg+0xac/0xc4 [ 21.405011] [<c1248680>] sys_sendmsg+0x152/0x1a2 [ 21.405011] [<c1249b0d>] sys_socketcall+0x214/0x275 [ 21.405011] [<c10029d0>] sysenter_do_call+0x12/0x36 [ 21.405011] irq event stamp: 138032 [ 21.405011] hardirqs last enabled at (138032): [<c12ca252>] _raw_spin_unlock_irqrestore+0x3b/0x5e [ 21.405011] hardirqs last disabled at (138031): [<c12c98cc>] _raw_spin_lock_irqsave+0x18/0x7e [ 21.405011] softirqs last enabled at (138024): [<f84a570e>] ieee80211_tx_skb+0x47/0x49 [mac80211] [ 21.405011] softirqs last disabled at (138027): [<c100452b>] do_softirq+0x63/0xb4 [ 21.405011] [ 21.405011] other info that might help us debug this: [ 21.405011] 3 locks held by kworker/u:4/982: [ 21.405011] #0: (name){+.+.+.}, at: [<c1046158>] process_one_work+0x1b8/0x41b [ 21.405011] #1: ((&(&local->scan_work)->work)){+.+.+.}, at: [<c1046158>] process_one_work+0x1b8/0x41b [ 21.405011] #2: (&local->mtx){+.+.+.}, at: [<f84920fb>] ieee80211_scan_work+0x32/0x4a4 [mac80211] [ 21.405011] [ 21.405011] stack backtrace: [ 21.405011] Pid: 982, comm: kworker/u:4 Not tainted 2.6.37-rc7-wl+ #242 [ 21.405011] Call Trace: [ 21.405011] [<c12c6e68>] ? printk+0x1d/0x25 [ 21.405011] [<c105a742>] print_usage_bug+0x181/0x18b [ 21.405011] [<c105b196>] ? check_usage_forwards+0x0/0xb6 [ 21.405011] [<c105a9ec>] mark_lock+0x2a0/0x4aa [ 21.405011] [<c1059f6d>] ? trace_hardirqs_off+0xb/0xd [ 21.405011] [<c105ca68>] __lock_acquire+0x5ba/0x13c1 [ 21.405011] [<c1059eed>] ? trace_hardirqs_off_caller+0x18/0x8d [ 21.405011] [<c1059f6d>] ? trace_hardirqs_off+0xb/0xd [ 21.405011] [<c1050411>] ? local_clock+0x2c/0x4f [ 21.405011] [<c1059e00>] ? save_trace+0x2/0xa0 [ 21.405011] [<c105ac39>] ? mark_held_locks+0x43/0x5b [ 21.405011] [<c12ca252>] ? _raw_spin_unlock_irqrestore+0x3b/0x5e [ 21.405011] [<f8115780>] ? ath5k_ani_calibration+0x29/0x5d9 [ath5k] [ 21.405011] [<c105d944>] lock_acquire+0xd5/0xf1 [ 21.405011] [<f8115780>] ? ath5k_ani_calibration+0x29/0x5d9 [ath5k] [ 21.405011] [<c12c9b1a>] _raw_spin_lock_bh+0x4a/0x77 [ 21.405011] [<f8115780>] ? ath5k_ani_calibration+0x29/0x5d9 [ath5k] [ 21.405011] [<f8115780>] ath5k_ani_calibration+0x29/0x5d9 [ath5k] [ 21.405011] [<c105ac39>] ? mark_held_locks+0x43/0x5b [ 21.405011] [<f8113496>] ath5k_tasklet_ani+0x1d/0x27 [ath5k] [ 21.405011] [<c1037304>] tasklet_action+0x96/0x137 [ 21.405011] [<c10379b5>] __do_softirq+0xde/0x1c3 [ 21.405011] [<c10b0cef>] ? arch_get_unmapped_area_topdown+0x3b/0x127 [ 21.405011] [<c10378d7>] ? __do_softirq+0x0/0x1c3 [ 21.405011] <IRQ> [<c1036dee>] ? irq_exit+0x3d/0x49 [ 21.405011] [<c1003b4f>] ? do_IRQ+0x98/0xac [ 21.405011] [<c1002eee>] ? common_interrupt+0x2e/0x34 [ 21.405011] [<c103007b>] ? sys_unshare+0x57/0x226 [ 21.405011] [<c1047fee>] ? queue_delayed_work+0x1/0x27 [ 21.405011] [<f84a83a0>] ? ieee80211_queue_delayed_work+0x2e/0x33 [mac80211] [ 21.405011] [<f8492528>] ? ieee80211_scan_work+0x45f/0x4a4 [mac80211] [ 21.405011] [<c104620e>] ? process_one_work+0x26e/0x41b [ 21.405011] [<c1046158>] ? process_one_work+0x1b8/0x41b [ 21.405011] [<f84920c9>] ? ieee80211_scan_work+0x0/0x4a4 [mac80211] [ 21.405011] [<c10466b6>] ? worker_thread+0x18a/0x2a5 [ 21.405011] [<c12ca25e>] ? _raw_spin_unlock_irqrestore+0x47/0x5e [ 21.405011] [<c104652c>] ? worker_thread+0x0/0x2a5 [ 21.405011] [<c104abe7>] ? kthread+0x67/0x6c [ 21.405011] [<c104ab80>] ? kthread+0x0/0x6c [ 21.405011] [<c1002efa>] ? kernel_thread_helper+0x6/0x10 Signed-off-by: Bob Copeland <me@bobcopeland.com> Acked-by: Bruno Randolf <br1@einfach.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>		2011-01-04 14:35:12 -05:00
..
accessibility
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-10-26 17:28:37 -07:00
amba
ata	ATA: pata_octeon_cf: Use I/O clock rate for timing calculations.	2010-10-29 19:08:41 +01:00
atm	drivers/atm/eni.c: Remove multiple uses of KERN_<level>	2010-10-26 11:35:37 -07:00
auxdisplay
base	Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6	2010-10-29 15:09:56 -07:00
block	Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2010-10-28 17:11:17 -07:00
bluetooth	Bluetooth: add NULL pointer check in HCI	2010-12-08 13:22:22 -02:00
cdrom	cdrom: gdrom: ctrl_in/outX to __raw_read/writeX conversion.	2010-10-27 14:33:39 +09:00
char	audit: Call tty_audit_push_task() outside preempt disabled	2010-10-30 08:45:25 -04:00
clocksource
connector	connector: remove lazy workqueue creation	2010-10-24 14:20:01 -07:00
cpufreq	[CPUFREQ] add sampling_down_factor tunable to improve ondemand performance	2010-10-22 11:44:47 -04:00
cpuidle
crypto	replace nested max/min macros with {max,min}3 macro	2010-10-26 16:52:12 -07:00
dca
dio
dma	drivers/dma/Kconfig: add part number for Topcliff.	2010-10-29 14:14:02 -07:00
edac	Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core	2010-10-26 10:13:48 -07:00
eisa
firewire	Merge branch 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2010-10-25 08:05:29 -07:00
firmware	dmi: log board, system, and BIOS information	2010-10-27 18:03:05 -07:00
gpio	gpio: Add VIA VX855 GPIO driver	2010-10-29 00:29:51 +02:00
gpu	Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2010-10-27 20:37:06 -07:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-10-25 07:59:01 -07:00
hwmon	hwmon: (it87) Add support for the IT8721F/IT8758E	2010-10-28 20:31:51 +02:00
i2c	i2c-i801: Add PCI idents for Patsburg 'IDF' SMBus controllers	2010-10-31 21:07:00 +01:00
ide	ide: clean up timed out request handling	2010-10-26 10:17:30 -07:00
idle	Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6	2010-10-26 17:28:07 -07:00
ieee802154
infiniband	convert get_sb_single() users	2010-10-29 04:16:28 -04:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-10-31 21:02:39 -04:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-30 18:42:58 -07:00
leds	leds: Remove auto blink in 88pm860x	2010-10-29 00:29:44 +02:00
lguest
macintosh	Move ams driver to macintosh	2010-10-28 20:31:50 +02:00
mca
md	md: tidy up device searches in read_balance.	2010-10-29 16:40:33 +11:00
media	Input: ir-keytable - fix uninitialized variable warning	2010-10-31 21:05:43 -04:00
memstick
message	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2010-10-22 17:34:15 -07:00
mfd	mfd: Fix a memory leak when unload mc13xxx-core module	2010-10-29 00:30:43 +02:00
misc	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb	2010-10-29 11:49:38 -07:00
mmc	mfd: Adding twl6030 mmc card detect support for MMC1	2010-10-29 00:29:59 +02:00
mtd	Merge git://git.infradead.org/mtd-2.6	2010-10-30 08:31:35 -07:00
net	ath5k: fix cycle counter inconsistent locking	2011-01-04 14:35:12 -05:00
nubus
of	of/mips: Cleanup some include directives/files.	2010-10-21 11:10:11 -06:00
oprofile	Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-10-30 11:43:26 -07:00
parisc	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6	2010-10-28 09:24:14 -07:00
parport	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
pci	Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2010-10-28 17:11:17 -07:00
pcmcia	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
platform	Remove duplicate includes from many files	2010-10-27 18:03:18 -07:00
pnp	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-10-26 17:28:37 -07:00
power	power: Revert "power_supply: Mark twl4030_charger as broken"	2010-10-29 00:30:44 +02:00
pps
ps3
rapidio	rapidio: fix destructive port EM initialization for Tsi568	2010-10-27 18:03:16 -07:00
regulator	regulator: max8998 BUCK1/2 voltage change with use of GPIOs	2010-10-29 00:30:15 +02:00
rtc	rtc: Add support for the rtc found in the MC13892 PMIC	2010-10-29 00:30:01 +02:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2010-10-31 20:43:12 -04:00
sbus	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-10-25 08:19:14 -07:00
scsi	[SCSI] pmcraid: add support for set timestamp command and other fixes	2010-10-29 12:03:01 -05:00
serial	Merge branch 'for-linus' of git://www.jni.nu/cris	2010-11-01 07:53:19 -04:00
sfi
sh	sh: intc: switch irq_desc iteration to new active IRQ iterator.	2010-10-28 11:36:31 +09:00
sn
spi	Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6	2010-11-01 07:50:43 -04:00
ssb	ssb: Use pci_is_pcie()	2010-12-22 15:43:26 -05:00
staging	Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2010-10-31 21:03:23 -04:00
tc
telephony	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2010-10-22 10:52:56 -07:00
thermal
uio	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-29 14:17:12 -07:00
uwb	uwb: Remove the WLP subsystem and drivers	2010-10-25 14:03:45 +01:00
vhost	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
video	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-10-30 08:26:25 -07:00
virtio
vlynq
w1	w1: don't allow arbitrary users to remove w1 devices	2010-10-27 18:03:17 -07:00
watchdog	WATCHDOG: octeon-wdt: Use I/O clock rate for timing calculations.	2010-10-29 19:08:42 +01:00
xen	convert get_sb_single() users	2010-10-29 04:16:28 -04:00
zorro	zorro: Fix device_register() error handling	2010-10-22 09:43:25 +02:00
Kconfig
Makefile	Merge branch 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2010-10-25 08:05:29 -07:00