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

Commit d1cb0bda authored by Nick Kossifidis's avatar Nick Kossifidis Committed by John W. Linville
Browse files

ath5k: Linear PCDAC code fixes 



* Set correct xpd curve indices for high/low gain curves during
   rfbuffer setup on RF5112B with both calibration curves available.

 * Don't return zero min power when we have the same pcdac value
   twice because it breaks interpolation. Instead return the right
   x barrier as we do when we have equal power levels for 2 different
   pcdac values.

Signed-off-by: default avatarNick Kossifidis <mickflemm@gmail.com>
Acked-by: default avatarBob Copeland <me@bobcopeland.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c38e7a93

drivers/net/wireless/ath/ath5k/phy.c

+17 −7
Original line number Diff line number Diff line
@@ -740,13 +740,22 @@ int ath5k_hw_rfregs_init(struct ath5k_hw *ah, struct ieee80211_channel *channel, 
						AR5K_RF_XPD_GAIN, true);



		} else {

			/* TODO: Set high and low gain bits */

			u8 *pdg_curve_to_idx = ee->ee_pdc_to_idx[ee_mode];

			if (ee->ee_pd_gains[ee_mode] > 1) {

				ath5k_hw_rfb_op(ah, rf_regs,

						ee->ee_x_gain[ee_mode],

						pdg_curve_to_idx[0],

						AR5K_RF_PD_GAIN_LO, true);

				ath5k_hw_rfb_op(ah, rf_regs,

						ee->ee_x_gain[ee_mode],

						pdg_curve_to_idx[1],

						AR5K_RF_PD_GAIN_HI, true);

			} else {

				ath5k_hw_rfb_op(ah, rf_regs,

						pdg_curve_to_idx[0],

						AR5K_RF_PD_GAIN_LO, true);

				ath5k_hw_rfb_op(ah, rf_regs,

						pdg_curve_to_idx[0],

						AR5K_RF_PD_GAIN_HI, true);

			}



			/* Lower synth voltage on Rev 2 */

			ath5k_hw_rfb_op(ah, rf_regs, 2,
@@ -1896,8 +1905,9 @@ ath5k_get_linear_pcdac_min(const u8 *stepL, const u8 *stepR, 
	s16 min_pwrL, min_pwrR;

	s16 pwr_i;



	if (WARN_ON(stepL[0] == stepL[1] || stepR[0] == stepR[1]))

		return 0;

	/* Some vendors write the same pcdac value twice !!! */

	if (stepL[0] == stepL[1] || stepR[0] == stepR[1])

		return max(pwrL[0], pwrR[0]);



	if (pwrL[0] == pwrL[1])

		min_pwrL = pwrL[0];