b43: HT-PHY: implement spurious tone avoidance

On N-PHY it's also done after TX power fix, so it was easy to spot.
Unfortunately the MMIO logs I have from ndsiwrapper include channels
1-12 only, so enabling code for 13 and 14 is just a N-PHY-based guess.

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/phy_ht.c b/drivers/net/wireless/b43/phy_ht.c
index 72356148f6898503db94e62dcf5acd13c09b0290..558f77c393e0e43e50b5d347a4dbd13e0d4a167c 100644 (file)
--- a/drivers/net/wireless/b43/phy_ht.c
+++ b/drivers/net/wireless/b43/phy_ht.c
@@ -285,6 +285,24 @@ static void b43_phy_ht_tx_power_fix(struct b43_wldev *dev)
  * Channel switching ops.
  **************************************************/
 
+static void b43_phy_ht_spur_avoid(struct b43_wldev *dev,
+                                 struct ieee80211_channel *new_channel)
+{
+       struct bcma_device *core = dev->dev->bdev;
+       int spuravoid = 0;
+
+       /* Check for 13 and 14 is just a guess, we don't have enough logs. */
+       if (new_channel->hw_value == 13 || new_channel->hw_value == 14)
+               spuravoid = 1;
+       bcma_core_pll_ctl(core, B43_BCMA_CLKCTLST_PHY_PLL_REQ, 0, false);
+       bcma_pmu_spuravoid_pllupdate(&core->bus->drv_cc, spuravoid);
+       bcma_core_pll_ctl(core,
+                         B43_BCMA_CLKCTLST_80211_PLL_REQ |
+                         B43_BCMA_CLKCTLST_PHY_PLL_REQ,
+                         B43_BCMA_CLKCTLST_80211_PLL_ST |
+                         B43_BCMA_CLKCTLST_PHY_PLL_ST, false);
+}
+
 static void b43_phy_ht_channel_setup(struct b43_wldev *dev,
                                const struct b43_phy_ht_channeltab_e_phy *e,
                                struct ieee80211_channel *new_channel)
@@ -318,6 +336,8 @@ static void b43_phy_ht_channel_setup(struct b43_wldev *dev,
        if (1) /* TODO: On N it's for early devices only, what about HT? */
                b43_phy_ht_tx_power_fix(dev);
 
+       b43_phy_ht_spur_avoid(dev, new_channel);
+
        b43_phy_write(dev, 0x017e, 0x3830);
 }