svn commit: r227411 - head/sys/dev/ath/ath_hal/ar5416

Adrian Chadd adrian at FreeBSD.org
Wed Nov 9 23:28:47 UTC 2011


Author: adrian
Date: Wed Nov  9 23:28:47 2011
New Revision: 227411
URL: http://svn.freebsd.org/changeset/base/227411

Log:
  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.

Modified:
  head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c	Wed Nov  9 22:39:44 2011	(r227410)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c	Wed Nov  9 23:28:47 2011	(r227411)
@@ -642,15 +642,7 @@ ar5416LoadNF(struct ath_hal *ah, const s
 	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


More information about the svn-src-all mailing list