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

Commit a04eb985 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Fix ANI monitoring 



The commit "ath9k_hw: improve ANI processing and rx desensitizing parameters"
changed various ANI operational parameters to address a specific
card/environment. This is not really applicable for other cards
in general usage.

As per internal documentation, lowering the immunity level can be
done only after 5 periods have passed and the CCK/OFDM errors are
below the low watermak threshold - which have been fixed at 300 and
400 respectively by the sytems team.

Raising the immunity level can be done when CCK/OFDM errors exceed
600 and 1000 (per second).

Set these values once during attach.

Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 80b4205b

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

+17 −12
Original line number Diff line number Diff line
@@ -186,14 +186,6 @@ static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel, 
				     ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,

				     entry_ofdm->ofdm_weak_signal_on);

	}



	if (aniState->ofdmNoiseImmunityLevel >= ATH9K_ANI_OFDM_DEF_LEVEL) {

		ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH;

		ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI;

	} else {

		ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI;

		ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW;

	}

}



static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hw *ah)
@@ -439,12 +431,25 @@ void ath9k_hw_ani_monitor(struct ath_hw *ah, struct ath9k_channel *chan) 
		ofdmPhyErrRate, aniState->cckNoiseImmunityLevel,

		cckPhyErrRate, aniState->ofdmsTurn);



	if (aniState->listenTime > ah->aniperiod) {

		if (cckPhyErrRate < ah->config.cck_trig_low &&

		    ofdmPhyErrRate < ah->config.ofdm_trig_low) {

	if (aniState->listenTime > 5 * ah->aniperiod) {

		/*

		 * Check if we need to lower immunity if

		 * 5 ani_periods have passed.

		 */

		if (ofdmPhyErrRate <= ah->config.ofdm_trig_low &&

		    cckPhyErrRate <= ah->config.cck_trig_low) {

			ath9k_hw_ani_lower_immunity(ah);

			aniState->ofdmsTurn = !aniState->ofdmsTurn;

		} else if (ofdmPhyErrRate > ah->config.ofdm_trig_high) {

		}

		ath9k_ani_restart(ah);

	} else if (aniState->listenTime > ah->aniperiod) {

		/*

		 * Check if immunity has to be raised,

		 * (either OFDM or CCK).

		 */

		if (ofdmPhyErrRate > ah->config.ofdm_trig_high &&

		    (cckPhyErrRate <= ah->config.cck_trig_high ||

		     aniState->ofdmsTurn)) {

			ath9k_hw_ani_ofdm_err_trigger(ah);

			aniState->ofdmsTurn = false;

		} else if (cckPhyErrRate > ah->config.cck_trig_high) {

drivers/net/wireless/ath/ath9k/ani.h

+0 −2
Original line number Diff line number Diff line
@@ -21,11 +21,9 @@ 


/* units are errors per second */

#define ATH9K_ANI_OFDM_TRIG_HIGH          3500

#define ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI 1000



/* units are errors per second */

#define ATH9K_ANI_OFDM_TRIG_LOW           400

#define ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI 900



/* units are errors per second */

#define ATH9K_ANI_CCK_TRIG_HIGH           600