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

b43: N-PHY: update TX power fix 



Specs were updated.

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

drivers/net/wireless/b43/phy_n.c

+27 −5
Original line number Diff line number Diff line
@@ -475,7 +475,9 @@ static void b43_nphy_tx_power_fix(struct b43_wldev *dev) 
	if (nphy->hang_avoid)

		b43_nphy_stay_in_carrier_search(dev, 1);



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

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

		txpi[0] = txpi[1] = 30;

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

		txpi[0] = 40;

		txpi[1] = 40;

	} else if (sprom->revision < 4) {
@@ -499,6 +501,9 @@ static void b43_nphy_tx_power_fix(struct b43_wldev *dev) 
			txpi[1] = 91;

		}

	}

	if (dev->phy.rev < 7 &&

	    (txpi[0] < 40 || txpi[0] > 100 || txpi[1] < 40 || txpi[1] > 10))

		txpi[0] = txpi[1] = 91;



	/*

	for (i = 0; i < 2; i++) {
@@ -509,14 +514,30 @@ static void b43_nphy_tx_power_fix(struct b43_wldev *dev) 


	for (i = 0; i < 2; i++) {

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

			/* FIXME: support 5GHz */

			txgain = b43_ntab_tx_gain_rev3plus_2ghz[txpi[i]];

			if (b43_nphy_ipa(dev)) {

				txgain = *(b43_nphy_get_ipa_gain_table(dev) +

						txpi[i]);

			} else if (b43_current_band(dev->wl) ==

				   IEEE80211_BAND_5GHZ) {

				/* FIXME: use 5GHz tables */

				txgain =

					b43_ntab_tx_gain_rev3plus_2ghz[txpi[i]];

			} else {

				if (dev->phy.rev >= 5 &&

				    sprom->fem.ghz5.extpa_gain == 3)

					; /* FIXME: 5GHz_txgain_HiPwrEPA */

				txgain =

					b43_ntab_tx_gain_rev3plus_2ghz[txpi[i]];

			}

			radio_gain = (txgain >> 16) & 0x1FFFF;

		} else {

			txgain = b43_ntab_tx_gain_rev0_1_2[txpi[i]];

			radio_gain = (txgain >> 16) & 0x1FFF;

		}



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

			dac_gain = (txgain >> 8) & 0x7;

		else

			dac_gain = (txgain >> 8) & 0x3F;

		bbmult = txgain & 0xFF;
@@ -547,7 +568,8 @@ static void b43_nphy_tx_power_fix(struct b43_wldev *dev) 
			u32 tmp32;

			u16 reg = (i == 0) ?

				B43_NPHY_PAPD_EN0 : B43_NPHY_PAPD_EN1;

			tmp32 = b43_ntab_read(dev, B43_NTAB32(26 + i, txpi[i]));

			tmp32 = b43_ntab_read(dev, B43_NTAB32(26 + i,

							      576 + txpi[i]));

			b43_phy_maskset(dev, reg, 0xE00F, (u32) tmp32 << 4);

			b43_phy_set(dev, reg, 0x4);

		}