Bump this up to where it used to be.

I need to investigate this a little closer, but it seems that in noisy
environments the NF load takes longer than 5 * DELAY(10) and this is
messing up future NF calibrations. (The background: NF calibrations
begin at the value programmed in after the load has completed, so
if this is never loaded in, the NF calibrations only ever start at
the currently calibrated NF value, rather than starting at something
high (say -50.)

More investigation about the effect on 11n RX and calibration results
are needed.

Sponsored by:	Hobnob, Inc.
This commit is contained in:
adrian 2011-11-09 23:28:47 +00:00
parent e5b49f0c7e
commit 273ff1fe2a

View File

@ -642,15 +642,7 @@ ar5416LoadNF(struct ath_hal *ah, const struct ieee80211_channel *chan)
OS_REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);
/* Wait for load to complete, should be fast, a few 10s of us. */
/*
* XXX For now, don't be so aggressive in waiting for the NF
* XXX load to complete. A very busy 11n RX load will cause this
* XXX to always fail; so just leave it.
* XXX Later on we may wish to split longcal into two parts - one to do
* XXX the initial longcal, and one to load in an updated NF value
* XXX once it's finished - say, by checking it every 500ms.
*/
if (! ar5212WaitNFCalComplete(ah, 5)) {
if (! ar5212WaitNFCalComplete(ah, 1000)) {
/*
* We timed out waiting for the noisefloor to load, probably due to an
* in-progress rx. Simply return here and allow the load plenty of time