Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73d07a39 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

b43: N-PHY: split workarounds into per-PHY-ver functions 



Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 44f4008b

drivers/net/wireless/b43/phy_n.c

+157 −143
Original line number Diff line number Diff line
@@ -1428,34 +1428,13 @@ static void b43_nphy_gain_ctrl_workarounds(struct b43_wldev *dev) 
	}

}



/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/Workarounds */

static void b43_nphy_workarounds(struct b43_wldev *dev)

static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)

{

	struct ssb_sprom *sprom = dev->dev->bus_sprom;

	struct b43_phy *phy = &dev->phy;

	struct b43_phy_n *nphy = phy->n;



	u8 events1[7] = { 0x0, 0x1, 0x2, 0x8, 0x4, 0x5, 0x3 };

	u8 delays1[7] = { 0x8, 0x6, 0x6, 0x2, 0x4, 0x3C, 0x1 };



	u8 events2[7] = { 0x0, 0x3, 0x5, 0x4, 0x2, 0x1, 0x8 };

	u8 delays2[7] = { 0x8, 0x6, 0x2, 0x4, 0x4, 0x6, 0x1 };



	u16 tmp16;

	u32 tmp32;



	if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ)

		b43_nphy_classifier(dev, 1, 0);

	else

		b43_nphy_classifier(dev, 1, 1);



	if (nphy->hang_avoid)

		b43_nphy_stay_in_carrier_search(dev, 1);



	b43_phy_set(dev, B43_NPHY_IQFLIP,

		    B43_NPHY_IQFLIP_ADC1 | B43_NPHY_IQFLIP_ADC2);



	if (dev->phy.rev >= 3) {

	tmp32 = b43_ntab_read(dev, B43_NTAB32(30, 0));

	tmp32 &= 0xffffff;

	b43_ntab_write(dev, B43_NTAB32(30, 0), tmp32);
@@ -1532,7 +1511,20 @@ static void b43_nphy_workarounds(struct b43_wldev *dev) 
	b43_phy_write(dev, 0x22D, 0x0357);

	b43_phy_write(dev, 0x22E, 0x0317);

	b43_phy_write(dev, 0x22F, 0x02D7);

	} else {

}



static void b43_nphy_workarounds_rev1_2(struct b43_wldev *dev)

{

	struct ssb_sprom *sprom = dev->dev->bus_sprom;

	struct b43_phy *phy = &dev->phy;

	struct b43_phy_n *nphy = phy->n;



	u8 events1[7] = { 0x0, 0x1, 0x2, 0x8, 0x4, 0x5, 0x3 };

	u8 delays1[7] = { 0x8, 0x6, 0x6, 0x2, 0x4, 0x3C, 0x1 };



	u8 events2[7] = { 0x0, 0x3, 0x5, 0x4, 0x2, 0x1, 0x8 };

	u8 delays2[7] = { 0x8, 0x6, 0x2, 0x4, 0x4, 0x6, 0x1 };



	if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ &&

	    nphy->band5g_pwrgain) {

		b43_radio_mask(dev, B2055_C1_TX_RF_SPARE, ~0x8);
@@ -1603,6 +1595,28 @@ static void b43_nphy_workarounds(struct b43_wldev *dev) 
				B43_NPHY_FINERX2_CGC_DECGC);

}



/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/Workarounds */

static void b43_nphy_workarounds(struct b43_wldev *dev)

{

	struct b43_phy *phy = &dev->phy;

	struct b43_phy_n *nphy = phy->n;



	if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ)

		b43_nphy_classifier(dev, 1, 0);

	else

		b43_nphy_classifier(dev, 1, 1);



	if (nphy->hang_avoid)

		b43_nphy_stay_in_carrier_search(dev, 1);



	b43_phy_set(dev, B43_NPHY_IQFLIP,

		    B43_NPHY_IQFLIP_ADC1 | B43_NPHY_IQFLIP_ADC2);



	if (dev->phy.rev >= 3)

		b43_nphy_workarounds_rev3plus(dev);

	else

		b43_nphy_workarounds_rev1_2(dev);



	if (nphy->hang_avoid)

		b43_nphy_stay_in_carrier_search(dev, 0);

}