summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2011-05-11 02:10:59 +0200
committerJohn W. Linville <linville@tuxdriver.com>2011-05-11 20:50:42 +0200
commit0fd82eafe3aa70937905b7e19e256409ae48477e (patch)
tree034dfaa99d0724b27604265d8ce17b27ea1f9fd5
parentssb: move ssb_commit_settings and export it (diff)
downloadlinux-0fd82eafe3aa70937905b7e19e256409ae48477e.tar.xz
linux-0fd82eafe3aa70937905b7e19e256409ae48477e.zip
b43: implement timeouts workaround
Documented in: <4DCA7E40.9070709@lwfinger.net> Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/b43/main.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 1e6a2add2aaf..a96e05a8ef7e 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4221,7 +4221,18 @@ static void b43_bluetooth_coext_disable(struct b43_wldev *dev)
static void b43_imcfglo_timeouts_workaround(struct b43_wldev *dev)
{
- /* TODO: implement 80211 core workaround here */
+ struct ssb_bus *bus = dev->dev->bus;
+ u32 tmp;
+
+ if ((bus->chip_id == 0x4311 && bus->chip_rev == 2) ||
+ (bus->chip_id == 0x4312)) {
+ tmp = ssb_read32(dev->dev, SSB_IMCFGLO);
+ tmp &= ~SSB_IMCFGLO_REQTO;
+ tmp &= ~SSB_IMCFGLO_SERTO;
+ tmp |= 0x3;
+ ssb_write32(dev->dev, SSB_IMCFGLO, tmp);
+ ssb_commit_settings(bus);
+ }
}
static void b43_set_synth_pu_delay(struct b43_wldev *dev, bool idle)