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

Commit a7765828 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

ath9k_hw: Fix and complete force bias for AR5416 



Force bias is a fix for usage of AR5416 radios on the 2.4 GHz band
for orientation sensitivity. This was only partially implemented
with the ath9k_hw_decrease_chain_power() but first -- this was being
called for all chipsets which is not correct and second -- it was
missing the actual orientation code.

We now ensure to only enable force bias only for AR5416 and BUG_ON()
on other chipsets. Although ath9k_hw_decrease_chain_power() was enabled
for newer chipsets I suspect that it never ran unless the EEPROM had
ATH9K_ANT_FIXED_A or ATH9K_ANT_FIXED_B for antenna diversity.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 896ff260

drivers/net/wireless/ath/ath9k/hw.c

+3 −1
Original line number Diff line number Diff line
@@ -2055,6 +2055,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, 


	ah->ath9k_hw_spur_mitigate_freq(ah, chan);

	ah->eep_ops->set_board_values(ah, chan);



	if (AR_SREV_5416(ah))

		ath9k_hw_decrease_chain_power(ah, chan);



	REG_WRITE(ah, AR_STA_ID0, get_unaligned_le32(common->macaddr));

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

+70 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ 


#include "hw.h"



static void ath9k_phy_modify_rx_buffer(u32 *rfBuf, u32 reg32,

				       u32 numBits, u32 firstBit,

				       u32 column);



/**

 * ath9k_hw_write_regs - ??

 *
@@ -429,6 +433,67 @@ void ath9k_hw_9280_spur_mitigate(struct ath_hw *ah, struct ath9k_channel *chan) 


/* All code below is for non single-chip solutions */



/*

 * Fix on 2.4 GHz band for orientation sensitivity issue by increasing

 * rf_pwd_icsyndiv.

 *

 * Theoretical Rules:

 *   if 2 GHz band

 *      if forceBiasAuto

 *         if synth_freq < 2412

 *            bias = 0

 *         else if 2412 <= synth_freq <= 2422

 *            bias = 1

 *         else // synth_freq > 2422

 *            bias = 2

 *      else if forceBias > 0

 *         bias = forceBias & 7

 *      else

 *         no change, use value from ini file

 *   else

 *      no change, invalid band

 *

 *  1st Mod:

 *    2422 also uses value of 2

 *    <approved>

 *

 *  2nd Mod:

 *    Less than 2412 uses value of 0, 2412 and above uses value of 2

 */

static void ath9k_hw_force_bias(struct ath_hw *ah, u16 synth_freq)

{

	struct ath_common *common = ath9k_hw_common(ah);

	u32 tmp_reg;

	int reg_writes = 0;

	u32 new_bias = 0;



	if (!AR_SREV_5416(ah) || synth_freq >= 3000) {

		return;

	}



	BUG_ON(AR_SREV_9280_10_OR_LATER(ah));



	if (synth_freq < 2412)

		new_bias = 0;

	else if (synth_freq < 2422)

		new_bias = 1;

	else

		new_bias = 2;



	/* pre-reverse this field */

	tmp_reg = ath9k_hw_reverse_bits(new_bias, 3);



	ath_print(common, ATH_DBG_CONFIG,

		  "Force rf_pwd_icsyndiv to %1d on %4d\n",

		  new_bias, synth_freq);



	/* swizzle rf_pwd_icsyndiv */

	ath9k_phy_modify_rx_buffer(ah->analogBank6Data, tmp_reg, 3, 181, 3);



	/* write Bank 6 with new params */

	REG_WRITE_RF_ARRAY(&ah->iniBank6, ah->analogBank6Data, reg_writes);

}



/**

 * ath9k_hw_set_channel - tune to a channel on the external AR2133/AR5133 radios

 * @ah: atheros hardware stucture
@@ -499,6 +564,9 @@ int ath9k_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan) 
		return -EINVAL;

	}



	ath9k_hw_force_bias(ah, freq);

	ath9k_hw_decrease_chain_power(ah, chan);



	reg32 =

	    (channelSel << 8) | (aModeRefSel << 2) | (bModeSynth << 1) |

	    (1 << 5) | 0x1;
@@ -946,6 +1014,8 @@ ath9k_hw_decrease_chain_power(struct ath_hw *ah, struct ath9k_channel *chan) 
	u32 bank6SelMask;

	u32 *bank6Temp = ah->bank6Temp;



	BUG_ON(AR_SREV_9280_10_OR_LATER(ah));



	switch (ah->config.diversity_control) {

	case ATH9K_ANT_FIXED_A:

		bank6SelMask =