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>

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 1e6a2add2aafece98735fc4c205c1299cac17919..a96e05a8ef7e39f1c8bfeb90ffe946ecbb35d8ac 100644 (file)
--- 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)