linux-toradex.git/drivers, branch v2.6.33.5

Revert "ath9k: fix lockdep warning when unloading module" on stable kernels

2010-05-26T21:32:12+00:00

Johannes' patch 34e8950 titled:

	mac80211: allow station add/remove to sleep

changed the way mac80211 adds and removes peers. The new
sta_add() / sta_remove() callbacks allowed the driver callbacks
to sleep. Johannes also ported ath9k to use sta_add() / sta_remove()
via the patch 4ca7786 titled:

	ath9k: convert to new station add/remove callbacks

but this patch forgot to address a change in locking issue which
Ming Lei eventually found on his 2.6.33-wl #12 build. The 2.6.33-wl
build includes code for the 802.11 subsystem for 2.6.34 though so did
already have the above two patches (ath9k_sta_remove() on his trace),
the 2.6.33 kernel did not however have these two patches. Ming eventually
cured his lockdep warnign via the patch a9f042c titled:

	ath9k: fix lockdep warning when unloading module

This went in to 2.6.34 and although it was not marked as a stable
fix it did get trickled down and applied on both 2.6.33 and 2.6.32.

In review, the culprits:

	mac80211: allow station add/remove to sleep
git describe --contains 34e895075e21be3e21e71d6317440d1ee7969ad0
v2.6.34-rc1~233^2~49^2~107

	ath9k: convert to new station add/remove callbacks
git describe --contains 4ca778605cfec53d8a689f0b57babb93b030c784
v2.6.34-rc1~233^2~49^2~10

	ath9k: fix lockdep warning when unloading module

This last one trickled down to 2.6.33 (OK), 2.6.33 (invalid) and 2.6.32 (invalid).

git describe --contains a9f042cbe5284f34ccff15f3084477e11b39b17b
v2.6.34-rc2~48^2~77^2~7
git describe --contains 0524bcfa80f1fffb4e1fe18a0a28900869a58a7c
v2.6.33.2~125
git describe --contains 0dcc9985f34aef3c60bffab3dfc7f7ba3748f35a
v2.6.32.11~79

The patch titled "ath9k: fix lockdep warning when unloading module"
should be reverted on both 2.6.33 and 2.6.32 as it is invalid and
actually ended up causing the following warning:

ADDRCONF(NETDEV_CHANGE): wlan31: link becomes ready
phy0: WMM queue=2 aci=0 acm=0 aifs=3 cWmin=15 cWmax=1023 txop=0
phy0: WMM queue=3 aci=1 acm=0 aifs=7 cWmin=15 cWmax=1023 txop=0
phy0: WMM queue=1 aci=2 acm=0 aifs=2 cWmin=7 cWmax=15 txop=94
phy0: WMM queue=0 aci=3 acm=0 aifs=2 cWmin=3 cWmax=7 txop=47
phy0: device now idle
------------[ cut here ]------------
WARNING: at kernel/softirq.c:143 local_bh_enable_ip+0x7b/0xa0()
Hardware name: 7660A14
Modules linked in: ath9k(-) mac80211 ath cfg80211 
Pid: 2003, comm: rmmod Not tainted 2.6.32.11 #6
Call Trace:
 [] warn_slowpath_common+0x78/0xb0
 [] warn_slowpath_null+0xf/0x20
 [] local_bh_enable_ip+0x7b/0xa0
 [] _spin_unlock_bh+0x14/0x20
 [] ath_tx_node_cleanup+0x185/0x1b0 [ath9k]
 [] ath9k_sta_notify+0x57/0xb0 [ath9k]
 [] __sta_info_unlink+0x15a/0x260 [mac80211]
 [] sta_info_unlink+0x38/0x60 [mac80211]
 [] ieee80211_set_disassoc+0x1ae/0x210 [mac80211]
 [] ieee80211_mgd_deauth+0x109/0x110 [mac80211]
 [] ieee80211_deauth+0x19/0x20 [mac80211]
 [] __cfg80211_mlme_deauth+0xee/0x130 [cfg80211]
 [] ? init_object+0x50/0x90
 [] __cfg80211_disconnect+0x159/0x1d0 [cfg80211]
 [] cfg80211_netdev_notifier_call+0x10f/0x450 [cfg80211]
 [] notifier_call_chain+0x47/0x90
 [] raw_notifier_call_chain+0x11/0x20
 [] call_netdevice_notifiers+0x16/0x20
 [] dev_close+0x4d/0xa0
 [] rollback_registered+0x48/0x120
 [] unregister_netdevice+0x1d/0x70
 [] ieee80211_remove_interfaces+0x84/0xc0 [mac80211]
 [] ieee80211_unregister_hw+0x42/0xf0 [mac80211]
 [] ath_detach+0x8e/0x180 [ath9k]
 [] ath_cleanup+0x11/0x50 [ath9k]
 [] ath_pci_remove+0x1c/0x20 [ath9k]
 [] pci_device_remove+0x32/0x60
 [] __device_release_driver+0x53/0xb0
 [] driver_detach+0xc8/0xd0
 [] bus_remove_driver+0x85/0xe0
 [] driver_unregister+0x5a/0x90
 [] pci_unregister_driver+0x40/0xb0
 [] ath_pci_exit+0x10/0x20 [ath9k]
 [] ath9k_exit+0x9/0x2a [ath9k]
 [] sys_delete_module+0x1a8/0x270
 [] ? up_read+0x9/0x10
 [] system_call_fastpath+0x16/0x1b
---[ end trace fad957019ffdd40b ]---
phy0: Removed STA 00:22:6b:56:fd:e8
phy0: Destroyed STA 00:22:6b:56:fd:e8
wlan31: deauthenticating from 00:22:6b:56:fd:e8 by local choice (reason=3)
ath9k 0000:16:00.0: PCI INT A disabled

The original lockdep fixed an issue where due to the new changes
the driver was not disabling the bottom halves but it is incorrect
to do this on the older kernels since IRQs are already disabled.

Cc: Ming Lei 
Cc: Johannes Berg 
Cc: John W. Linville 
Signed-off-by: Luis R. Rodriguez 
Signed-off-by: Greg Kroah-Hartman

iwlwifi: clear all the stop_queue flag after load firmware

2010-05-26T21:32:11+00:00

commit a9e10fb9b1c6ad16e73cf2656951fce3a817611e upstream.

All the queues are awake and ready to use after loading firmware,
for firmware reload case, if any queues was stopped before
reload, mac80211 will wake those queues after restart hardware, so make
sure all the flag used to keep track of the queue status are
reset correctly.

Signed-off-by: Wey-Yi Guy 
Signed-off-by: Reinette Chatre 
Signed-off-by: Greg Kroah-Hartman

iwlwifi: check for aggregation frame and queue

2010-05-26T21:32:11+00:00

commit 45d427001b5eec03cecaacddb53c73af46bb263e upstream.

Error checking for aggregation frames should go into aggregation queue,
if aggregation queue not available, use legacy queue instead.
Also make sure the aggregation queue is available to activate,
if driver and mac80211 is out-of-sync, try to disable the queue and
sync-up with mac80211.

Signed-off-by: Wey-Yi Guy 
Signed-off-by: Reinette Chatre 
Signed-off-by: Greg Kroah-Hartman

drm/i915: Disable FBC on 915GM and 945GM.

2010-05-26T21:32:10+00:00

commit 8d06a1e1e9c69244f08beb7d17146483f9dcd120 upstream.

It is causing hangs after a suspend/resume cycle with the default
powersave=1 module option on these chipsets since 2.6.32-rc.

BugLink: http://bugs.launchpad.net/bugs/492392
Signed-off-by: Robert Hooker 
Acked-by: Jesse Barnes 
Signed-off-by: Eric Anholt 
Signed-off-by: Greg Kroah-Hartman

tty: Fix unbalanced BKL handling in error path

2010-05-26T21:32:07+00:00

commit 77945febbe60a69e9dcab7f49d33a1aa1e436973 upstream.

Arnd noted:

After the "retry_open:" label, we first get the tty_mutex
and then the BKL. However a the end of tty_open, we jump
back to retry_open with the BKL still held. If we run into
this case, the tty_open function will be left with the BKL
still held.

Signed-off-by: Alan Cox 
Acked-by: Arnd Bergmann 
Signed-off-by: Greg Kroah-Hartman

serial: imx.c: fix CTS trigger level lower to avoid lost chars

2010-05-26T21:32:07+00:00

commit 1c5250d6163dac28be3afabdfb6c723f107051b7 upstream.

The imx CTS trigger level is left at its reset value that is 32
chars. Since the RX FIFO has 32 entries, when CTS is raised, the
FIFO already is full. However, some serial port devices first empty
their TX FIFO before stopping when CTS is raised, resulting in lost
chars.

This patch sets the trigger level lower so that other chars arrive
after CTS is raised, there is still room for 16 of them.

Signed-off-by: Valentin Longchamp
Tested-by: Philippe Rétornaz
Acked-by: Wolfram Sang
Signed-off-by: Greg Kroah-Hartman

dasd: fix race between tasklet and dasd_sleep_on

2010-05-26T21:32:06+00:00

commit 1c1e093cbf6d3a7576ba0bd10363362a1c5c74ee upstream.

The various dasd_sleep_on functions use a global wait queue when
waiting for a cqr. The wait condition checks the status and devlist
fields of the cqr to determine if it is safe to continue. This
evaluation may return true, although the tasklet has not finished
processing of the cqr and the callback function has not been called
yet. When the callback is finally called, the data in the cqr may
already be invalid. The sleep_on wait condition needs a safe way to
determine if the tasklet has finished processing. Use the
callback_data field of the cqr to store a token, which is set by
the callback function itself.

Signed-off-by: Stefan Weinhuber 
Signed-off-by: Heiko Carstens 
Signed-off-by: Martin Schwidefsky 
Signed-off-by: Greg Kroah-Hartman

drm/i915: fix non-Ironlake 965 class crashes

2010-05-26T21:32:06+00:00

commit 1918ad77f7f908ed67cf37c505c6ad4ac52f1ecf upstream.

My PIPE_CONTROL fix (just sent via Eric's tree) was buggy; I was
testing a whole set of patches together and missed a conversion to the
new HAS_PIPE_CONTROL macro, which will cause breakage on non-Ironlake
965 class chips.  Fortunately, the fix is trivial and has been tested.

Be sure to use the HAS_PIPE_CONTROL macro in i915_get_gem_seqno, or
we'll end up reading the wrong graphics memory, likely causing hangs,
crashes, or worse.

Reported-by: Zdenek Kabelac 
Reported-by: Toralf Förster 
Tested-by: Toralf Förster 
Signed-off-by: Jesse Barnes 
Signed-off-by: Linus Torvalds 
Signed-off-by: Greg Kroah-Hartman

drm/i915: use PIPE_CONTROL instruction on Ironlake and Sandy Bridge

2010-05-26T21:32:05+00:00

commit e552eb7038a36d9b18860f525aa02875e313fe16 upstream.

Since 965, the hardware has supported the PIPE_CONTROL command, which
provides fine grained GPU cache flushing control.  On recent chipsets,
this instruction is required for reliable interrupt and sequence number
reporting in the driver.

So add support for this instruction, including workarounds, on Ironlake
and Sandy Bridge hardware.

https://bugs.freedesktop.org/show_bug.cgi?id=27108

Signed-off-by: Jesse Barnes 
Tested-by: Chris Wilson 
Signed-off-by: Eric Anholt 
Signed-off-by: Greg Kroah-Hartman

mmc: atmel-mci: remove data error interrupt after xfer

2010-05-26T21:32:05+00:00

commit abc2c9fdf636c4335a8d72ac3c5ae152bca44b68 upstream.

Disable data error interrupts while we are actually recording that there
is not such errors.  This will prevent, in some cases, the warning message
printed at new request queuing (in atmci_start_request()).

Signed-off-by: Nicolas Ferre 
Cc: Haavard Skinnemoen 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds 
Signed-off-by: Greg Kroah-Hartman